海康-城管事件

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/controller/AlarmEventController.java

@@ -69,7 +69,7 @@ public class AlarmEventController {
         String eventCode = null;
         JSONObject jsonObject = JSONObject.parseObject(JSON.toJSONString(jsonArray.get(0)));
         try {
-            HaiKangEventVo haiKangEventVo = JSONObject.toJavaObject(jsonObject.getJSONObject("sys_exclusive_original_data_message").getJSONObject("params"), HaiKangEventVo.class);
+            HaiKangEventVo haiKangEventVo = JSONObject.toJavaObject(jsonObject.getJSONObject("params"), HaiKangEventVo.class);
             eventCode = alarmEventService.insertHaiKangCityEvent(haiKangEventVo);
         } catch (Exception e) {
             logger.error(e.getMessage());

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/haikang/AlarmVo.java

@@ -1,81 +0,0 @@
-package com.sooka.sponest.event.centereventteventcatalogue.domain.haikang;
-
-import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
-
-@Data
-public class AlarmVo {
-
-    private String cameraId;
-
-    private String cameraName;
-
-    private String cameraType;
-
-    private String confirmStatus;
-
-    private String dataClass;
-
-    private String direction;
-
-    private String distance;
-
-    private String eventName;
-
-    private String eventType;
-
-    private String height;
-
-    private String horizontalAngle;
-
-    private String id;
-
-    private String latitude;
-
-    private String longitude;
-
-    private String originPanpos;
-
-    private String originTiltpos;
-
-    private String picUrls;
-
-    private String pitchAngel;
-
-    private String placeCode;
-
-    private String placeName;
-
-    private String remark1;
-
-    private String remark5;
-
-    private String startTime;
-
-    private String status;
-
-    private String towerId;
-
-    private String towerLatitude;
-
-    private String towerLongitude;
-
-    private String towerName;
-
-    private String zoom;
-
-    @Override
-    public String toString() {
-        String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
-                .append("行政区：", getPlaceName())
-                .append("瞭望塔：", getTowerName())
-                .append("方向：", getDirection())
-                .append("距离：", getDistance())
-                .append("高程：", getHeight())
-                .append("经度：", getLongitude())
-                .append("纬度：", getLatitude())
-                .toString().replaceAll("=", "");
-        return toString.substring(1, toString.length() - 1);
-    }
-}

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/haikang/DataVo.java

@@ -1,23 +0,0 @@
-package com.sooka.sponest.event.centereventteventcatalogue.domain.haikang;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Data;
-
-import java.util.Date;
-
-@Data
-public class DataVo {
-
-    private AlarmVo alarm;
-
-    private String imageServerCode;
-
-    private String imageUrl;
-
-    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss", timezone = "GMT+8")
-    private Date sendTime;
-
-    private String visiblePicUrl;
-
-    private TextVo[] text;
-}

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/haikang/EventsVo.java

@@ -5,32 +5,44 @@ import lombok.Data;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
+import java.util.Map;
+
 @Data
 public class EventsVo {
 
-    private DataVo data;
-
-    private String eventId;
+    private String snappedPicUrl;
 
-    private String eventType;
+    private Integer eventConfirmStatus;
 
-    private String happenTime;
+    private String eventId;
 
-    private String srcIndex;
+    private String tenants;
 
     private String srcName;
 
-    private String srcParentIndex;
+    private String componentId;
 
-    private String srcType;
+    private String eventTypeCode;
 
-    private String status;
+    private Map<String, Object> data;
 
     private String timeout;
 
+    private String eventName;
+
+    private String stopTime;
+
+    private String srcIndex;
+
+    private String happenTime;
+
+    private String externalIndexCode;
+
+    private String status;
+
     public String toString(CenterdataTCamera centerdataTCamera) {
         String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
-                .append("行政区：", getData().getText()[0].getOrgName())
+                .append("行政区：", centerdataTCamera.getCameraRegion())
                 .append("瞭望塔：", getSrcName())
 //                .append("方向：", getDirection())
 //                .append("距离：", getDistance())

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/haikang/TextVo.java

@@ -1,59 +0,0 @@
-package com.sooka.sponest.event.centereventteventcatalogue.domain.haikang;
-
-import lombok.Data;
-
-@Data
-public class TextVo {
-
-    private String alarmEventCode;
-
-    private String alarmId;
-
-    private String alarmOriginalPic;
-
-    private String alarmPicUrl;
-
-    private String alarmTime;
-
-    private String alarmType;
-
-    private String alarmTypeName;
-
-    private String auditedUser;
-
-    private String cameraExternalIndexCode;
-
-    private String cameraIndexCode;
-
-    private String cameraName;
-
-    private String caseStatus;
-
-    private String confidence;
-
-    private String deviceCode;
-
-    private String finishedTime;
-
-    private String imgHeight;
-
-    private String imgWidth;
-
-    private String orgIndexCode;
-
-    private String orgName;
-
-    private String orgPath;
-
-    private String presetCode;
-
-    private String repeatStatus;
-
-    private String shopCode;
-
-    private String shopName;
-
-    private String treeCode;
-
-    private String violationAreas;
-}

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/impl/AlarmEventServiceImpl.java

@@ -88,13 +88,13 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             return "";
         }
         // 事件目录
-        String eventName = eventsVo.getData().getAlarm().getEventName();
-        String eventDescription = eventsVo.getData().getAlarm().toString();
-        String longitude = eventsVo.getData().getAlarm().getLongitude();
-        String latitude = eventsVo.getData().getAlarm().getLatitude();
+        String eventName = eventsVo.getEventName();
+        String eventDescription = eventsVo.getData().toString();
+        String longitude = eventsVo.getData().toString();
+        String latitude = eventsVo.getData().toString();
         String reportor = eventsVo.getSrcName();
-        Date reportTime = eventsVo.getData().getSendTime();
-        String address = eventsVo.getData().getAlarm().getPlaceName();
+        Date reportTime = new Date();
+        String address = eventsVo.getData().toString();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
         centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
         // 事件部门
@@ -102,24 +102,24 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 事件日志
         String logId = this.insertEventLog(centereventTEventcatalogue);
         // 附件
-        if (StringUtils.isNotBlank(eventsVo.getData().getImageUrl())) {
-            CenterdataTAttach tAttach = new CenterdataTAttach();
-            tAttach.setBusId(logId);
-            tAttach.setAttachPath(eventsVo.getData().getImageUrl());
-            tAttach.setBusIndx(BUS_INDEX_1);
-            tAttach.setBusSource("HIK_1");
-            tAttach.setFileType(FILE_TYPE_1);
-            remoteDataService.insertAttach(tAttach);
-        }
-        if (StringUtils.isNotBlank(eventsVo.getData().getVisiblePicUrl())) {
-            CenterdataTAttach tAttach = new CenterdataTAttach();
-            tAttach.setBusId(logId);
-            tAttach.setAttachPath(eventsVo.getData().getVisiblePicUrl());
-            tAttach.setBusIndx(BUS_INDEX_1);
-            tAttach.setBusSource("HIK_1");
-            tAttach.setFileType(FILE_TYPE_1);
-            remoteDataService.insertAttach(tAttach);
-        }
+//        if (StringUtils.isNotBlank(eventsVo.getData().getImageUrl())) {
+//            CenterdataTAttach tAttach = new CenterdataTAttach();
+//            tAttach.setBusId(logId);
+//            tAttach.setAttachPath(eventsVo.getData().getImageUrl());
+//            tAttach.setBusIndx(BUS_INDEX_1);
+//            tAttach.setBusSource("HIK_1");
+//            tAttach.setFileType(FILE_TYPE_1);
+//            remoteDataService.insertAttach(tAttach);
+//        }
+//        if (StringUtils.isNotBlank(eventsVo.getData().getVisiblePicUrl())) {
+//            CenterdataTAttach tAttach = new CenterdataTAttach();
+//            tAttach.setBusId(logId);
+//            tAttach.setAttachPath(eventsVo.getData().getVisiblePicUrl());
+//            tAttach.setBusIndx(BUS_INDEX_1);
+//            tAttach.setBusSource("HIK_1");
+//            tAttach.setFileType(FILE_TYPE_1);
+//            remoteDataService.insertAttach(tAttach);
+//        }
         return centereventTEventcatalogue.getEventCode();
     }
 
@@ -140,31 +140,31 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             return "";
         }
         // 验证事件类型是否配置对应报文码值--只能从数据库配
-        CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeByCode(haiKangEventVo.getEvents()[0].getData().getText()[0].getAlarmType());
+        CentereventTEventtype centereventTEventtype = centereventTEventtypeService.selectCentereventTEventtypeByCode(eventsVo.getEventTypeCode());
         if (StringUtils.isNull(centereventTEventtype)) {
-            logger.info("无法匹配相关事件！报文码值为：{}", haiKangEventVo.getEvents()[0].getData().getText()[0].getAlarmType());
+            logger.info("无法匹配相关事件！报文码值为：{}", eventsVo.getEventTypeCode());
             return "";
         }
         // 事件目录
         String eventType = centereventTEventtype.getParentId();
         String eventTypeXl = centereventTEventtype.getId();
-        String eventName = centerdataTCamera.getCameraName() + haiKangEventVo.getSendTime() + eventsVo.getData().getText()[0].getAlarmTypeName();
+        String eventName = centerdataTCamera.getCameraName() + haiKangEventVo.getSendTime() + eventsVo.getEventName();
         String eventDescription = eventsVo.toString(centerdataTCamera);
         String longitude = centerdataTCamera.getLongitude();
         String latitude = centerdataTCamera.getLatitude();
-        String reportor = eventsVo.getSrcName();
+        String reportor = centerdataTCamera.getCameraName();
         Date reportTime = haiKangEventVo.getSendTime();
-        String address = eventsVo.getData().getText()[0].getOrgName();
+        String address = eventsVo.getSrcName();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
         centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
         String logId = this.insertEventLog(centereventTEventcatalogue);
-        if (StringUtils.isNotBlank(eventsVo.getData().getText()[0].getAlarmPicUrl())) {
+        if (StringUtils.isNotBlank(eventsVo.getSnappedPicUrl())) {
             CenterdataTAttach tAttach = new CenterdataTAttach();
             tAttach.setBusId(logId);
-            tAttach.setAttachPath(eventsVo.getData().getText()[0].getAlarmPicUrl());
+            tAttach.setAttachPath(eventsVo.getSnappedPicUrl());
             tAttach.setBusIndx("bus_indx_city");
             tAttach.setBusSource("HIK_2");
             tAttach.setFileType(FILE_TYPE_1);