逻辑优化

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

@@ -24,7 +24,9 @@ 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 reportor, Date reportTime, String address, String reportSource, String eventStatus, String eventStatusValue,
+                                      String createBy, String createName, Date createTime) {
+        super(createBy, createName, createTime);
         this.eventType = eventType;
         this.eventTypeXl = eventTypeXl;
         this.eventName = eventName;

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/service/AlarmEventService.java

@@ -9,9 +9,7 @@ import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.EventsV
 import com.sooka.sponest.event.centereventteventcatalogue.domain.haikang.HaiKangEventVo;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.sensor.SensorEventVo;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
-import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
 
-import java.util.Date;
 import java.util.List;
 
 public interface AlarmEventService {
@@ -36,5 +34,5 @@ public interface AlarmEventService {
     // 传感器事件
     String insertSensorEvent(SensorEventVo sensorEventVo);
 
-    String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime, List<CenterdataTAidevicedept> listDept);
+    String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, List<CenterdataTAidevicedept> listDept);
 }

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

@@ -96,8 +96,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = eventsVo.getSrcName();
         Date reportTime = eventsVo.getData().getSendTime();
         String address = eventsVo.getData().getAlarm().getPlaceName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address, REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1);
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
+                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -156,8 +157,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = eventsVo.getSrcName();
         Date reportTime = haiKangEventVo.getSendTime();
         String address = eventsVo.getData().getText()[0].getOrgName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address, REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1);
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
+                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), DateUtils.getNowDate());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -175,14 +177,14 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     }
 
     @Override
-    public String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime, List<CenterdataTAidevicedept> listDept) {
-        CentereventTEventcatalogue eventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, createTime);
+    public String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, List<CenterdataTAidevicedept> listDept) {
+        CentereventTEventcatalogue eventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         this.insertEventDept(eventcatalogue, listDept);
         return this.insertEventLog(eventcatalogue);
     }
 
     // 事件目录
-    private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue eventcatalogue, CenterdataTCamera camera, Date createTime) {
+    private CentereventTEventcatalogue insertEventCatalogue(CentereventTEventcatalogue eventcatalogue) {
         //生成uuid
         String eventCode = IdUtils.simpleUUID();
         eventcatalogue.setId(eventCode);
@@ -190,9 +192,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         eventcatalogue.setIsUrged(SYS_ISURGE_2);// sys_isurge_2
         eventcatalogue.setEventStatus(null == eventcatalogue.getEventStatus() ? "上报" : eventcatalogue.getEventStatus());
         eventcatalogue.setEventStatusValue(null == eventcatalogue.getEventStatusValue() ? FOREST_EVENT_STATUS_1 : eventcatalogue.getEventStatusValue());// forest_event_status_1
-        eventcatalogue.setCreateBy(camera.getId());
-        eventcatalogue.setCreateName(camera.getCameraName());
-        eventcatalogue.setCreateTime(null == createTime ? DateUtils.getNowDate() : createTime);
+        if (null == eventcatalogue.getCreateTime()) {
+            eventcatalogue.setCreateTime(DateUtils.getNowDate());
+        }
         centereventTEventcatalogueService.insertCentereventTEventcatalogue(eventcatalogue);
         return eventcatalogue;
     }
@@ -269,8 +271,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = daHuaFireEventVO.getInfo().getDeviceName();
         Date reportTime = DateUtils.timestampToTime(daHuaFireEventVO.getInfo().getAlarmDate());
         String address = centerdataTCamera.getCameraRegion();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address, REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1);
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaFireEventVO.getCreateTime());
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue("1", null, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
+                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaFireEventVO.getCreateTime());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -363,8 +366,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String reportor = centerdataTCamera.getCameraName();
         Date reportTime = DateUtils.timestampToTime(daHuaOtherEventVO.getAlarmTime());
         String address = daHuaOtherEventVO.getAddress();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address, REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1);
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, daHuaOtherEventVO.getCreateTime());
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(eventType, eventTypeXl, eventName, eventDescription, longitude, latitude, reportor, reportTime, address,
+                REPORTING_SOURCE_1, "上报", FOREST_EVENT_STATUS_1, centerdataTCamera.getId(), centerdataTCamera.getCameraName(), daHuaOtherEventVO.getCreateTime());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志
@@ -396,9 +400,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         // 事件目录
         CentereventTEventtype eventtype = centereventTEventtypeService.selectCentereventTEventtypeById(sensorEventVo.getEventTypeXl());
         String eventName = sensorEventVo.getReportor() + DateUtils.parseDateToStr(YYYY_MM_DD_HH_MM_SS, sensorEventVo.getReportTime()) + eventtype.getEventTypeName();
-        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(), REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1);
-        CenterdataTCamera centerdataTCamera = new CenterdataTCamera(sensorEventVo.getSensorId(), sensorEventVo.getReportor());
-        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, null);
+        CentereventTEventcatalogue centereventTEventcatalogue = new CentereventTEventcatalogue(sensorEventVo.getEventType(), sensorEventVo.getEventTypeXl(), eventName, sensorEventVo.getEventDescription(), sensorEventVo.getLongitude(), sensorEventVo.getLatitude(), sensorEventVo.getReportor(), sensorEventVo.getReportTime(), sensorEventVo.getAddress(),
+                REPORTING_SOURCE_4, "上报", FOREST_EVENT_STATUS_1, sensorEventVo.getSensorId(), sensorEventVo.getReportor(), DateUtils.getNowDate());
+        centereventTEventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
         // 事件日志

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

@@ -1,6 +1,7 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service.impl;
 
 import com.alibaba.fastjson.JSON;
+import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.model.LoginUser;
@@ -11,7 +12,6 @@ import com.sooka.sponest.event.centereventteventcatalogue.service.IFireIncidentS
 import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
-import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -42,6 +42,14 @@ public class FireInsidentServiceImpl implements IFireIncidentService {
      */
     @Override
     public String insertFireIncident(RemoteFireVO remoteFireVO) {
+        // 增加判断，防止没有token时空指针异常。
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        StringBuilder userId = new StringBuilder();
+        StringBuilder nickName = new StringBuilder();
+        if (null != loginUser) {
+            userId.append(loginUser.getSysUser().getUserId());
+            nickName.append(loginUser.getSysUser().getNickName());
+        }
         // 事件目录
         CentereventTEventcatalogue eventcatalogue = new CentereventTEventcatalogue(
                 remoteFireVO.getEventSubType(),
@@ -53,22 +61,11 @@ public class FireInsidentServiceImpl implements IFireIncidentService {
                 remoteFireVO.getEventReporter(),
                 remoteFireVO.getEventReportTime(),
                 remoteFireVO.getEventLocation(),
-                REPORTING_SOURCE_5,
-                "确认",
-                FOREST_EVENT_STATUS_7);
-        //增加判断，防止没有token时空指针异常。
-        LoginUser loginUser = SecurityUtils.getLoginUser();
-        StringBuilder userId = new StringBuilder();
-        StringBuilder nickName = new StringBuilder();
-        if (null != loginUser) {
-            userId.append(loginUser.getSysUser().getUserId());
-            nickName.append(loginUser.getSysUser().getNickName());
-        }
-        CenterdataTCamera camera = new CenterdataTCamera(userId.toString(), nickName.toString());
+                REPORTING_SOURCE_5, "确认", FOREST_EVENT_STATUS_7, userId.toString(), nickName.toString(), DateUtils.getNowDate());
         //后续应该修改为调用接口获取部门信息
         List<CenterdataTAidevicedept> listDept = new ArrayList();
         listDept.add(new CenterdataTAidevicedept(3777L, "市消防救援支队"));
-        String logId = alarmEventService.getFunction(eventcatalogue, camera, null, listDept);
+        String logId = alarmEventService.getFunction(eventcatalogue, listDept);
         if (StringUtils.isNotBlank(remoteFireVO.getEventPicture())) {
             String[] pictures = remoteFireVO.getEventPicture().split(",");
             // 添加新附件