合并分支

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/domain/CentereventTEventcatalogue.java

@@ -23,10 +23,7 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
 
     }
 
-    public CentereventTEventcatalogue(String eventType, String eventTypeXl, String eventName, String eventDescription, String longitude, String latitude,
-                                      String reportor, Date reportTime, String address, String reportSource, String eventStatus, String eventStatusValue,
-                                      String createBy, String createName, Date createTime) {
-        super(createBy, createName, createTime);
+    public CentereventTEventcatalogue(String eventType, String eventTypeXl, String eventName, String eventDescription, String longitude, String latitude, String reportor, Date reportTime, String address) {
         this.eventType = eventType;
         this.eventTypeXl = eventTypeXl;
         this.eventName = eventName;
@@ -36,9 +33,6 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.reportor = reportor;
         this.reportTime = reportTime;
         this.address = address;
-        this.reportSource = reportSource;
-        this.eventStatus = eventStatus;
-        this.eventStatusValue = eventStatusValue;
     }
 
     private static final long serialVersionUID = 1L;
@@ -198,8 +192,6 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
 
     private String isExamine;// 是否审核
 
-    private String isPush;// 是否推送
-
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date gdTime;// 归档时间
 
@@ -433,14 +425,6 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.isExamine = isExamine;
     }
 
-    public String getIsPush() {
-        return isPush;
-    }
-
-    public void setIsPush(String isPush) {
-        this.isPush = isPush;
-    }
-
     public void setStatusFlag(String statusFlag) {
         this.statusFlag = statusFlag;
     }

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

@@ -314,9 +314,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = centerdataTCamera.getCameraName();
         Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate() * 1000);
         String address = centerdataTCamera.getCameraRegion();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
-                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
-        this.insertEventCatalogue(centereventTEventcatalogue);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address);
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaFireEventVO.getCreateTime());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志

src/main/java/com/sooka/sponest/event/test/TestController.java

@@ -1,10 +1,12 @@
 package com.sooka.sponest.event.test;
 
+import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.DaHuaFireEventVO;
+import com.sooka.sponest.event.centereventteventcatalogue.domain.dahua.InfoVO;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,8 +27,9 @@ public class TestController extends BaseController {
         long start = System.currentTimeMillis();
         try {
             DaHuaFireEventVO daHuaFireEventVO = JSONObject.parseObject(jsonStr, DaHuaFireEventVO.class);
-            String eventName = daHuaFireEventVO.getInfo().getChannelName() + daHuaFireEventVO.getInfo().getAlarmDateStr() + daHuaFireEventVO.getInfo().getAlarmTypeName();
-            Date reportTime = DateUtils.timestampToTime(daHuaFireEventVO.getInfo().getAlarmDate());
+            InfoVO infoVO = JSONObject.parseObject(JSON.toJSONString(daHuaFireEventVO.getInfo()), InfoVO.class);
+            String eventName = infoVO.getChannelName() + infoVO.getAlarmDateStr() + infoVO.getAlarmTypeName();
+            Date reportTime = DateUtils.timestampToTime(infoVO.getAlarmDate());
             double diff = (DateUtils.timestampToTime(start).getTime() - reportTime.getTime()) / 1000;// 计算时间差，单位为秒
             if (180 < diff) {
                 logger.info("===事件名称：" + eventName + "，===超时推送：" + diff);