Merge remote-tracking branch 'origin/guoshengxiong' into guoshengxiong

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")) {
+            } else if (Objects.equals(ability, "")) {
-                log.info("AI识别告警=======" + paramsJo);
+                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<AiAnalyseHardWareAlarmRecord> aiAnalyseHardWareAlarmRecords = new ArrayList<>();
 //                for (int i = 0; i < eventsJa.size(); i++) {

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<XzHoistSafetyWork> 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();
+	}
+
 	/**
 	 * 编辑
 	 *

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()