5300报文字段变更

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/dahua/DaHuaOtherEventVO.java

@@ -9,15 +9,17 @@ import java.util.Date;
 @Data
 public class DaHuaOtherEventVO {
 
+    String districtName;// 行政区
+
     String address;// 点位地址
 
-    Long alarmTime;// 告警时间, 毫秒数
+    Long occurrenceTime;// 告警时间, 毫秒数
 
     String alarmName;// 告警规则名称
 
     String deviceId;// 设备编号，不一定存在
 
-    String picture;// 图片信息JSON 串，包含目标框objectRect信息
+    String imgList;// 图片信息JSON 串，包含目标框objectRect信息
 
     String point;// 告警画框坐标信息JSON 串
 
@@ -42,7 +44,7 @@ public class DaHuaOtherEventVO {
     @Override
     public String toString() {
         String toString = new ToStringBuilder(this, ToStringStyle.NO_CLASS_NAME_STYLE)
-                .append("行政区：", getAddress())
+                .append("行政区：", getDistrictName())
                 .append("瞭望塔：", getAddress())
 //                .append("方向：", getDirection())
 //                .append("距离：", getDistance())

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

@@ -344,12 +344,12 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 事件目录
         String eventType = centereventTEventtype.getParentId();
         String eventTypeXl = centereventTEventtype.getId();
-        String eventName = centerdataTCamera.getCameraName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, DateUtils.timestampToTime(daHuaOtherEventVO.getAlarmTime())) + daHuaOtherEventVO.getAlarmName();
+        String eventName = centerdataTCamera.getCameraName() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, DateUtils.timestampToTime(daHuaOtherEventVO.getOccurrenceTime())) + daHuaOtherEventVO.getAlarmName();
         String eventDescription = daHuaOtherEventVO.toString();
         String longitude = daHuaOtherEventVO.getLongitude();
         String latitude = daHuaOtherEventVO.getLatitude();
         String reportor = centerdataTCamera.getCameraName();
-        Date reportTime = DateUtils.timestampToTime(daHuaOtherEventVO.getAlarmTime());
+        Date reportTime = DateUtils.timestampToTime(daHuaOtherEventVO.getOccurrenceTime());
         String address = daHuaOtherEventVO.getAddress();
         CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
         centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaOtherEventVO.getCreateTime());
@@ -357,12 +357,12 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
         String logId = this.insertEventLog(centereventTEventcatalogue);
-        if (StringUtils.isNotBlank(daHuaOtherEventVO.getPicture())) {
-            List<PictureVO> pictures = JSON.parseArray(daHuaOtherEventVO.getPicture(), PictureVO.class);
+        if (StringUtils.isNotBlank(daHuaOtherEventVO.getImgList())) {
+            List<PictureVO> pictures = JSON.parseArray(daHuaOtherEventVO.getImgList(), PictureVO.class);
             for (PictureVO picture : pictures) {
                 CenterdataTAttach tAttach = new CenterdataTAttach();
                 tAttach.setBusId(logId);
-                tAttach.setAttachPath(picture.getImgUrl());
+                tAttach.setAttachPath(picture.getImgUrl().substring(picture.getImgUrl().indexOf("/image")));
                 tAttach.setBusIndx(BUS_INDEX_2);
                 tAttach.setBusSource("DH_2");
                 tAttach.setFileType(FILE_TYPE_1);