From bda7f2b59430f3351bb74b33e1e8707433625c4a Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Fri, 17 May 2024 14:34:20 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=90=8A=E8=A3=85=E5=AE=89=E5=85=A8?= =?UTF-8?q?=E4=BD=9C=E4=B8=9A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../XzHoistSafetyWorkController.java | 71 +++++++++++++++++++ .../zhgd/xmgl/security/WebSecurityConfig.java | 1 + 2 files changed, 72 insertions(+) diff --git a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java index efb8a501a..4111d0e10 100644 --- a/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java +++ b/src/main/java/com/zhgd/xmgl/modules/xz/special/controller/XzHoistSafetyWorkController.java @@ -1,12 +1,20 @@ package com.zhgd.xmgl.modules.xz.special.controller; +import cn.hutool.core.date.DatePattern; +import cn.hutool.core.date.DateUtil; +import com.alibaba.fastjson.JSON; +import com.alibaba.fastjson.JSONArray; +import com.alibaba.fastjson.JSONObject; +import com.zhgd.xmgl.modules.xz.special.entity.XzGasAnalyze; import com.zhgd.xmgl.modules.xz.special.entity.XzHoistSafetyWork; +import com.zhgd.xmgl.modules.xz.special.entity.XzSpecialOperationFireSafety; import com.zhgd.xmgl.modules.xz.special.service.IXzHoistSafetyWorkService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiImplicitParams; +import java.util.ArrayList; import java.util.HashMap; import springfox.documentation.annotations.ApiIgnore; @@ -78,6 +86,69 @@ public class XzHoistSafetyWorkController { return Result.ok(); } + /** + * 添加 + * + * @param paramMap + * @return + */ + @ApiOperation(value = "添加星纵-吊装安全作业票信息", notes = "添加星纵-吊装安全作业票信息", httpMethod = "POST") + @PostMapping(value = "/save") + public Result save(@RequestBody @Validate JSONObject paramMap) { + log.info("吊装安全作业票信息同步" + paramMap); + JSONArray hotWorkExecutionBeginTime = paramMap.getJSONArray("hotWorkExecutionBeginTime"); + if (hotWorkExecutionBeginTime != null) { + String begin = hotWorkExecutionBeginTime.getString(0); + String end = hotWorkExecutionBeginTime.getString(0); + paramMap.put("workExecutionBeginTime", DateUtil.parse(begin + ":00", DatePattern.NORM_DATETIME_FORMAT)); + paramMap.put("workExecutionEndTime", DateUtil.parse(end + ":00", DatePattern.NORM_DATETIME_FORMAT)); + } + JSONArray operatingUnit = paramMap.getJSONArray("operatingUnit"); + if (operatingUnit != null) { + paramMap.put("operatingUnit", operatingUnit.get(0)); + } + JSONArray jobApplicationUnit = paramMap.getJSONArray("jobApplicationUnit"); + if (jobApplicationUnit != null) { + paramMap.put("jobApplicationUnit", jobApplicationUnit.get(0)); + } + + String [] param1 = {"name", "flag"}; + JSONArray safeMeasures = paramMap.getJSONArray("safeMeasure"); + JSONArray safeMeasure = new JSONArray(); + if (safeMeasures != null) { + for (int i = 0; i < safeMeasures.size(); i++) { + JSONObject detailObj = new JSONObject(); + JSONObject j = safeMeasures.getJSONObject(i); + int k = 0; + for (String s : j.keySet()) { + detailObj.put(param1[k], j.get(s)); + k++; + } + safeMeasure.add(detailObj); + } + } + paramMap.put("safeMeasure", JSON.toJSONString(safeMeasure)); + String [] param2 = {"content", "person"}; + JSONArray otherSafeMeasures = paramMap.getJSONArray("otherSafeMeasure"); + JSONArray otherSafeMeasure = new JSONArray(); + if (otherSafeMeasures != null) { + for (int i = 0; i < otherSafeMeasures.size(); i++) { + JSONObject detailObj = new JSONObject(); + JSONObject j = otherSafeMeasures.getJSONObject(i); + int k = 0; + for (String s : j.keySet()) { + detailObj.put(param2[k], j.get(s)); + k++; + } + otherSafeMeasure.add(detailObj); + } + } + paramMap.put("otherSafeMeasure", JSON.toJSONString(otherSafeMeasure)); + XzHoistSafetyWork xzHoistSafetyWork = JSONObject.parseObject(JSON.toJSONString(paramMap), XzHoistSafetyWork.class); + xzHoistSafetyWorkService.add(xzHoistSafetyWork); + return Result.ok(); + } + /** * 编辑 * diff --git a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java index 5a4c260cd..cf6090979 100644 --- a/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java +++ b/src/main/java/com/zhgd/xmgl/security/WebSecurityConfig.java @@ -372,6 +372,7 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { .antMatchers("/xmgl/workerCertificate/queryByType").permitAll() .antMatchers("/xmgl/xzBlindPlatePlugSafe/save").permitAll() .antMatchers("/xmgl/xzHighJobSafe/save").permitAll() + .antMatchers("/xmgl/xzHoistSafetyWork/save").permitAll() .antMatchers(HttpMethod.OPTIONS, "/**").anonymous() .anyRequest().authenticated() // 剩下所有的验证都需要验证. .and() From f5d3847a113f74c62471f8070fbf0e2ab089801d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=85=89=E5=A4=B4=E5=BC=BA?= <5661595+jxjzh@user.noreply.gitee.com> Date: Fri, 17 May 2024 14:46:22 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E8=A7=A3=E6=9E=90=E6=B5=B7=E5=BA=B7AI?= =?UTF-8?q?=E5=9B=9E=E8=B0=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/zhgd/xmgl/call/HikvisionCall.java | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java index 45117e809..6a0239620 100644 --- a/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java +++ b/src/main/java/com/zhgd/xmgl/call/HikvisionCall.java @@ -335,8 +335,23 @@ public class HikvisionCall { // } // frontierProtectionDevAlarmService.saveBatch(frontierProtectionDevAlarmList); - } else if (Objects.equals(ability, "event_vss")) { - log.info("AI识别告警=======" + paramsJo); + } else if (Objects.equals(ability, "")) { + JSONArray eventsArray = paramsJo.getJSONArray("events"); + if (eventsArray.size()>0 ){ + JSONObject dataEvent = (JSONObject) eventsArray.get(0); + JSONArray eventDetails = dataEvent.getJSONArray("eventDetails"); + JSONObject eventDetail = (JSONObject) eventDetails.get(0); + ability = eventDetail.getString("ability"); + if (Objects.equals(ability, "event_vss")){ + log.info("AI识别告警=======" + paramsJo); + String srcName = eventDetail.getString("srcName");//摄像机名称 + String eventType = eventDetail.getString("eventType");//422000003 + JSONObject data = eventDetail.getJSONObject("data"); + String imageUrl = data.getString("url"); //海康AI图片地址 + } + } + + // JSONArray eventsJa = paramsJo.getJSONArray("events"); // List aiAnalyseHardWareAlarmRecords = new ArrayList<>(); // for (int i = 0; i < eventsJa.size(); i++) {