优化

event-ui/vue.config.js

@@ -40,8 +40,6 @@ module.exports = {
     proxy: {
       // detail: https://cli.vuejs.org/config/#devserver-proxy
       [process.env.VUE_APP_BASE_API]: {
-        // target: `http://117.78.49.164:3031`,
-        // target: `http://10.0.0.14:3031`,
         target: `http://127.0.0.1:3031`,
         changeOrigin: true,
         pathRewrite: {

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

@@ -23,22 +23,8 @@ 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) {
-        this.eventType = eventType;
-        this.eventTypeXl = eventTypeXl;
-        this.eventName = eventName;
-        this.eventDescription = eventDescription;
-        this.longitude = longitude;
-        this.latitude = latitude;
-        this.reportor = reportor;
-        this.reportTime = reportTime;
-        this.address = address;
-    }
-
-    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) {
+    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) {
         this.eventType = eventType;
         this.eventTypeXl = eventTypeXl;
         this.eventName = eventName;

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

@@ -9,7 +9,6 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.ruoyi.system.api.domain.SysUser;
 import com.ruoyi.system.api.model.LoginUser;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
@@ -97,7 +96,7 @@ 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);
+        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);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -157,7 +156,7 @@ 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);
+        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);
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -176,7 +175,7 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     }
 
     @Override
-    public String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime, List<CenterdataTAidevicedept> listDept){
+    public String getFunction(CentereventTEventcatalogue centereventTEventcatalogue, CenterdataTCamera centerdataTCamera, Date createTime, List<CenterdataTAidevicedept> listDept) {
         CentereventTEventcatalogue eventcatalogue = this.insertEventCatalogue(centereventTEventcatalogue, centerdataTCamera, createTime);
         this.insertEventDept(eventcatalogue, listDept);
         return this.insertEventLog(eventcatalogue);
@@ -188,12 +187,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         String eventCode = IdUtils.simpleUUID();
         eventcatalogue.setId(eventCode);
         eventcatalogue.setEventCode(eventCode);
-        if (null == eventcatalogue.getReportSource()) {
-            eventcatalogue.setReportSource(null == eventcatalogue.getReportSource()?REPORTING_SOURCE_1:eventcatalogue.getReportSource());//reporting_source_1
-        }
-        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.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);
@@ -203,8 +199,6 @@ public class AlarmEventServiceImpl implements AlarmEventService {
 
     // 事件部门
     private void insertEventDept(CentereventTEventcatalogue eventcatalogue, List<CenterdataTAidevicedept> listDept) {
-        String eventStatusValue = (null == eventcatalogue.getEventStatusValue())?FOREST_EVENT_STATUS_1:eventcatalogue.getEventStatusValue();
-        String eventStatus = (null == eventcatalogue.getEventStatus())?"上报":eventcatalogue.getEventStatus();
         listDept.forEach(item -> {
             CentereventDeptEvent deptEvent = new CentereventDeptEvent();
             deptEvent.setId(IdUtils.fastSimpleUUID());
@@ -212,8 +206,8 @@ public class AlarmEventServiceImpl implements AlarmEventService {
             deptEvent.setDeptId(item.getMapDeptId());
             deptEvent.setDeptName(item.getMapDeptName());
             deptEvent.setIsUrged(SYS_ISURGE_2);
-            deptEvent.setEventStatus(eventStatus);
-            deptEvent.setEventStatusValue(eventStatusValue);
+            deptEvent.setEventStatus(eventcatalogue.getEventStatus());
+            deptEvent.setEventStatusValue(eventcatalogue.getEventStatusValue());
             deptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_2);
             LoginUser loginUser = SecurityUtils.getLoginUser();
             deptEvent.setCreateBy(null == loginUser ? null : loginUser.getSysUser().getUserId().toString());
@@ -230,9 +224,10 @@ public class AlarmEventServiceImpl implements AlarmEventService {
         fireLog.setEventCode(eventcatalogue.getEventCode());
         fireLog.setLogContent(eventcatalogue.getEventName() + System.getProperty("line.separator") + eventcatalogue.getEventDescription());
         fireLog.setOperation(BUS_OPER_TYPE_2);
-        fireLog.setOperationType(LOG_OPER_TYPE_3);
-        if(REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())){
+        if (REPORTING_SOURCE_5.equals(eventcatalogue.getReportSource())) {
             fireLog.setOperationType(LOG_OPER_TYPE_4);
+        } else {
+            fireLog.setOperationType(LOG_OPER_TYPE_3);
         }
         fireLog.setCreateName(eventcatalogue.getCreateName());
         fireLog.setCreateTime(eventcatalogue.getCreateTime());
@@ -274,7 +269,7 @@ 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);
+        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());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -368,7 +363,7 @@ 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);
+        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());
         // 事件部门
         this.insertEventDept(centereventTEventcatalogue, listDept);
@@ -401,8 +396,7 @@ 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());
-        centereventTEventcatalogue.setReportSource(REPORTING_SOURCE_4);
+        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);
         // 事件部门

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

@@ -184,7 +184,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
         } else {
             //APP上报图片
-            centereventTFireLog.setOperationType("log_oper_type_2");
+            centereventTFireLog.setOperationType(LOG_OPER_TYPE_2);
         }
         centereventTEventcatalogue.setReportor(SecurityUtils.getLoginUser().getSysUser().getNickName());
         centereventTEventcatalogue.setReportTime(new Date());
@@ -568,7 +568,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         centereventTLog.setLatitude(centereventTEventcatalogue.getLatitude());
         centereventTLog.setLongitude(centereventTEventcatalogue.getLongitude());
         if ("APP".equals(centereventtDeptEventBO.getCzlx())) {
-            centereventTLog.setOperationType("log_oper_type_2");
+            centereventTLog.setOperationType(LOG_OPER_TYPE_2);
         } else {
             centereventTLog.setOperationType(LOG_OPER_TYPE_1);
         }

src/main/java/com/sooka/sponest/event/centereventteventtype/controller/CentereventTEventtypeController.java

@@ -40,9 +40,30 @@ public class CentereventTEventtypeController extends BaseController {
     public TableDataInfo list(CentereventTEventtype centereventTEventtype) {
         startPage();
         List<CentereventTEventtype> list = centereventTEventtypeService.selectCentereventTEventtypeList(centereventTEventtype);
+        for (CentereventTEventtype type : list) {
+            dateChange(type);
+        }
         return getDataTable(list);
     }
 
+    private void dateChange(CentereventTEventtype type) {
+        long reminderTimeDay = Long.parseLong(type.getReminderTime()) / 1440;
+        long reminderTimeHour = (Long.parseLong(type.getReminderTime()) % 1440) / 60;
+        long reminderTimeMinute = (Long.parseLong(type.getReminderTime()) % 1440) % 60;
+        type.setReminderTimeDay(String.valueOf(reminderTimeDay));
+        type.setReminderTimeHour(String.valueOf(reminderTimeHour));
+        type.setReminderTimeMinute(String.valueOf(reminderTimeMinute));
+        String reminderTime;
+        if (reminderTimeDay != 0) {
+            reminderTime = reminderTimeDay + "天" + reminderTimeHour + "时" + reminderTimeMinute + "分";
+        } else if (reminderTimeHour != 0) {
+            reminderTime = reminderTimeHour + "时" + reminderTimeMinute + "分";
+        } else {
+            reminderTime = reminderTimeMinute + "分";
+        }
+        type.setReminderTime(reminderTime);
+    }
+
     /**
      * 查询事件类型列表
      */
@@ -70,7 +91,9 @@ public class CentereventTEventtypeController extends BaseController {
     @RequiresPermissions("eventtype:eventtype:query")
     @GetMapping(value = "/{id}")
     public AjaxResult getInfo(@PathVariable("id") String id) {
-        return AjaxResult.success(centereventTEventtypeService.selectCentereventTEventtypeById(id));
+        CentereventTEventtype type = centereventTEventtypeService.selectCentereventTEventtypeById(id);
+        dateChange(type);
+        return AjaxResult.success(type);
     }
 
     /**
@@ -81,7 +104,7 @@ public class CentereventTEventtypeController extends BaseController {
     @PostMapping
     public AjaxResult add(@RequestBody CentereventTEventtype centereventTEventtype) {
         int num = centereventTEventtypeService.insertCentereventTEventtype(centereventTEventtype);
-        if (num == 0){
+        if (num == 0) {
             return AjaxResult.error("催办时间不能为0!");
         }
         return AjaxResult.success();
@@ -95,7 +118,7 @@ public class CentereventTEventtypeController extends BaseController {
     @PutMapping
     public AjaxResult edit(@RequestBody CentereventTEventtype centereventTEventtype) {
         int num = centereventTEventtypeService.updateCentereventTEventtype(centereventTEventtype);
-        if (num == 0){
+        if (num == 0) {
             return AjaxResult.error("催办时间不能为0!");
         }
         return AjaxResult.success();

src/main/java/com/sooka/sponest/event/centereventteventtype/service/impl/CentereventTEventtypeServiceImpl.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.event.centereventteventtype.service.impl;
 
-import com.ruoyi.common.core.utils.StringUtils;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventtype.domain.CentereventTEventtype;
 import com.sooka.sponest.event.centereventteventtype.mapper.CentereventTEventtypeMapper;
@@ -39,29 +38,7 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
      */
     @Override
     public List<CentereventTEventtype> selectCentereventTEventtypeList(CentereventTEventtype centereventTEventtype) {
-        List<CentereventTEventtype> list = centereventTEventtypeMapper.selectCentereventTEventtypeList(centereventTEventtype);
-        for (CentereventTEventtype type : list) {
-            dateChange(type);
-        }
-        return list;
-    }
-
-    private void dateChange(CentereventTEventtype type) {
-        long reminderTimeDay = Long.parseLong(type.getReminderTime()) / 1440;
-        long reminderTimeHour = (Long.parseLong(type.getReminderTime()) % 1440) / 60;
-        long reminderTimeMinute = (Long.parseLong(type.getReminderTime()) % 1440) % 60;
-        type.setReminderTimeDay(String.valueOf(reminderTimeDay));
-        type.setReminderTimeHour(String.valueOf(reminderTimeHour));
-        type.setReminderTimeMinute(String.valueOf(reminderTimeMinute));
-        String reminderTime;
-        if (reminderTimeDay != 0) {
-            reminderTime = reminderTimeDay + "天" + reminderTimeHour + "时" + reminderTimeMinute + "分";
-        } else if (reminderTimeHour != 0) {
-            reminderTime = reminderTimeHour + "时" + reminderTimeMinute + "分";
-        } else {
-            reminderTime = reminderTimeMinute + "分";
-        }
-        type.setReminderTime(reminderTime);
+        return centereventTEventtypeMapper.selectCentereventTEventtypeList(centereventTEventtype);
     }
 
     /**
@@ -72,11 +49,7 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
      */
     @Override
     public CentereventTEventtype selectCentereventTEventtypeById(String id) {
-        CentereventTEventtype type = centereventTEventtypeMapper.selectCentereventTEventtypeById(id);
-        if (StringUtils.isNotNull(type)) {
-            dateChange(type);
-        }
-        return type;
+        return centereventTEventtypeMapper.selectCentereventTEventtypeById(id);
     }
 
     /**

src/main/java/com/sooka/sponest/event/utils/EventConstants.java

@@ -33,8 +33,9 @@ public class EventConstants {
 
     // 日志操作类型
     public static final String LOG_OPER_TYPE_1 = "log_oper_type_1";
+    public static final String LOG_OPER_TYPE_2 = "log_oper_type_2";
     public static final String LOG_OPER_TYPE_3 = "log_oper_type_3";// AI反馈
-    public static final String LOG_OPER_TYPE_4 = "log_oper_type_4";//第三方协查
+    public static final String LOG_OPER_TYPE_4 = "log_oper_type_4";// 第三方协查
 
     // 附件索引
     public static final String BUS_INDEX_1 = "bus_indx_forest";// 火情事件