修复异味

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

@@ -79,9 +79,8 @@ public class CentereventTEventcatalogueController extends BaseController {
     @GetMapping("/listByPc")
     public TableDataInfo listByPc(CentereventTEventcatalogue centereventTEventcatalogue) {
         startPage();
-        if (StringUtils.isEmpty(centereventTEventcatalogue.getEventTypeXls()) && centereventTEventcatalogue.getDefaultTypeXl().contains("1")) {
-            centereventTEventcatalogue.setEventType("1");
-        } else if (StringUtils.isNotEmpty(centereventTEventcatalogue.getEventTypeXls()) && centereventTEventcatalogue.getEventTypeXls().contains("1")) {
+        if ((StringUtils.isEmpty(centereventTEventcatalogue.getEventTypeXls()) && centereventTEventcatalogue.getDefaultTypeXl().contains("1"))
+                || (StringUtils.isNotEmpty(centereventTEventcatalogue.getEventTypeXls()) && centereventTEventcatalogue.getEventTypeXls().contains("1"))) {
             centereventTEventcatalogue.setEventType("1");
         }
         return getDataTable(centereventTEventcatalogueService.listByPc(centereventTEventcatalogue));
@@ -267,8 +266,6 @@ public class CentereventTEventcatalogueController extends BaseController {
                 String message = centereventTEventcatalogue.getAddress() + "发生" + centereventTEventtype.getEventTypeName();
                 message += "1".equals(centereventTEventtype.getId()) ? "" : "事件";
                 message += "，请联系：" + userName + "，联系电话：" + phone;
-                logger.info("phones: {}", phones.toString());
-                logger.info("userIds: {}", userIds.toString());
                 RemoteApiUtil.getInstance().sendMessageAndJg(phones, userIds, message, centereventTEventcatalogue.getEventCode(), centereventTEventcatalogue.getEventName());
             }
         } catch (Exception e) {
@@ -363,11 +360,10 @@ public class CentereventTEventcatalogueController extends BaseController {
         centereventTDownloads.setEventCode(id);
         centereventTDownloads.setFlag("1");
         List<CentereventTDownloads> downloadsList = centereventTDownloadsService.selectCentereventTDownloadsList(centereventTDownloads);
-        if (null != downloadsList && downloadsList.size() > 0) {
+        if (StringUtils.isNotEmpty(downloadsList)) {
             return AjaxResult.error("已下载的视频，不能重复下载!");
         } else {
             return AjaxResult.success(centereventTEventcatalogueService.eventhandleDownload(id));
         }
-
     }
 }

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

@@ -117,13 +117,6 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
     private String[] reportTimeRange;
 
     /**
-     * 创建时间
-     */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @Excel(name = "上报时间", width = 30, dateFormat = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /**
      * 上报具体位置
      */
     private String address;
@@ -329,16 +322,6 @@ public class CentereventTEventcatalogue extends BaseBusinessEntity {
         this.reportTimeRange = reportTimeRange;
     }
 
-    @Override
-    public Date getCreateTime() {
-        return createTime;
-    }
-
-    @Override
-    public void setCreateTime(Date createTime) {
-        this.createTime = createTime;
-    }
-
     public String getAddress() {
         return address;
     }

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

@@ -86,5 +86,5 @@ public interface ICentereventTEventcatalogueService {
 
     CentereventTEventcatalogue mqtest(String start, String end, int limit);
 
-    void downloadsCommon(Map<String, Object> params) throws Exception;
+    void downloadsCommon(Map<String, Object> params) throws InterruptedException;
 }

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

@@ -165,7 +165,6 @@ public class CenterEventViewServiceImpl extends BaseService implements ICenterEv
         resultMap.put("eventdetail", centereventTFireEventService.selectCentereventTFireEventList(new CentereventTFireEvent(visuForestCloudMapVO.getEventCode())));
         Map<String, Object> yuAnMap = centereventTFireEventService.getYuAnByEventCode(visuForestCloudMapVO);
         if (StringUtils.isNotNull(yuAnMap) && StringUtils.isNotBlank(MapUtils.getString(yuAnMap, FILE_PREFIX_LOCAL))) {
-//            yuAnMap.put("fileUrl", keyMap.get(FILE_PREFIX_LOCAL) + yuAnMap.get(FILE_PREFIX_LOCAL));
             StringBuilder newDiles = new StringBuilder();
             String url = MapUtils.getString(yuAnMap, "fileUrl");
             String name = MapUtils.getString(yuAnMap, "fileName");

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

@@ -21,7 +21,7 @@ import java.util.List;
 @Service
 public class CentereventTDownloadsServiceImpl extends BaseService implements ICentereventTDownloadsService {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
+    final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
     private CentereventTDownloadsMapper centereventTDownloadsMapper;

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

@@ -93,14 +93,11 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     private ApplicationContext applicationContext;// 注入应用上下文
     @Autowired
     private EventUrgeService eventUrgeService;
-
     @Autowired
     private EventDownService eventDownService;
-
     @Autowired
     private ICentereventTDownloadsService centereventTDownloadsService;
 
-
     @DataScopeMutiDept(deptAlias = "c")
     @Override
     public List<CentereventTEventcatalogue> listByPc(CentereventTEventcatalogue centereventTEventcatalogue) {
@@ -124,15 +121,15 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         CentereventTEventcatalogue centereventTEventcatalogue = centereventTEventcatalogueMapper.selectCentereventTEventcatalogueByEventCode(eventCode);
         // 签收状态、办结且审核通过时显示后续流程按钮（办结、归档）
         List<Long> deptIds = null;
-        if ("forest_event_status_2".equals(centereventTEventcatalogue.getEventStatusValue()) ||
-                ("forest_event_status_5".equals(centereventTEventcatalogue.getEventStatusValue()) && "1".equals(centereventTEventcatalogue.getIsExamine()))) {
+        if (FOREST_EVENT_STATUS_2.equals(centereventTEventcatalogue.getEventStatusValue()) ||
+                (FOREST_EVENT_STATUS_5.equals(centereventTEventcatalogue.getEventStatusValue()) && "1".equals(centereventTEventcatalogue.getIsExamine()))) {
             deptIds = centereventDeptEventService.selectByEventCode(eventCode).stream().map(CentereventDeptEvent::getDeptId).collect(Collectors.toList());
             if (deptIds.contains(centereventTEventcatalogue.getDeptId())) {
                 centereventTEventcatalogue.setStatusFlag("1");// 可视化是否显示办结、归档按钮
             }
         }
         // 获取审核权限
-        if ("forest_event_status_5".equals(centereventTEventcatalogue.getEventStatusValue()) && "0".equals(centereventTEventcatalogue.getIsExamine())) {
+        if (FOREST_EVENT_STATUS_5.equals(centereventTEventcatalogue.getEventStatusValue()) && "0".equals(centereventTEventcatalogue.getIsExamine())) {
             deptIds = SpringUtils.getBean(RemoteDeptService.class).findParentIdByChildDeptIdAndParentType(centereventTEventcatalogue.getDeptId(), "sys_dept_type_17,sys_dept_type_18").getData();
             if (StringUtils.isNotEmpty(deptIds) && deptIds.contains(SecurityUtils.getLoginUser().getSysUser().getDeptId())) {
                 centereventTEventcatalogue.setStatusFlag("2");// 可视化是否显示审核按钮
@@ -184,7 +181,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         centereventTEventcatalogue.setEventCode(eventCode);
         if (StringUtils.isEmpty(centereventTEventcatalogue.getReportSource())) {
             centereventTEventcatalogue.setReportSource("reporting_source_2");
-            centereventTFireLog.setOperationType("log_oper_type_1");
+            centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
         } else {
             //APP上报图片
             centereventTFireLog.setOperationType("log_oper_type_2");
@@ -212,7 +209,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
 
         centereventTFireLog.setId(IdUtils.fastSimpleUUID());
         centereventTFireLog.setEventCode(eventCode);
-        centereventTFireLog.setOperation("bus_oper_type_1");
+        centereventTFireLog.setOperation(BUS_OPER_TYPE_1);
         centereventTFireLog.setLogContent(centereventTEventcatalogue.getEventName() + " " + centereventTEventcatalogue.getEventTypeXlName() + System.getProperty("line.separator") + centereventTEventcatalogue.getEventDescription());
         centereventTFireLog.setCreateBy(SecurityUtils.getUserId().toString());
         centereventTFireLog.setCreateName(SecurityUtils.getLoginUser().getSysUser().getNickName());
@@ -224,7 +221,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 CenterdataTAttach attach = new CenterdataTAttach();
                 attach.setBusId(centereventTFireLog.getId());
                 attach.setAttachPath(centereventTEventcatalogue.getAttach().get(i).getAttachPath());
-                attach.setBusIndx("bus_indx_forest");
+                attach.setBusIndx(BUS_INDEX_1);
                 attach.setBusSource("reporting_source_2".equals(centereventTEventcatalogue.getReportSource()) ? "PC" : "APP");
                 attach.setFileName(centereventTEventcatalogue.getAttach().get(i).getFileName());
                 attach.setFileType(FilePrefixUtils.getUrlSuffix(centereventTEventcatalogue.getAttach().get(i).getAttachPath()));
@@ -248,7 +245,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
 //            centereventDeptEvent.setId(IdUtils.fastSimpleUUID());
 //            centereventDeptEvent.setDeptId(Long.parseLong(centereventTEventcatalogue.getHgjDeptId()));
 //            centereventDeptEvent.setDeptName(centereventTEventcatalogue.getHgjDeptName());
-//            centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+//            centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
 //            centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
 //        }
         // 市级行管局
@@ -262,7 +259,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventDeptEvent.setId(IdUtils.fastSimpleUUID());
                 centereventDeptEvent.setDeptId(item.getDeptId());
                 centereventDeptEvent.setDeptName(item.getDeptName());
-                centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+                centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
                 centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
             });
         }
@@ -289,7 +286,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventDeptEvent.setId(IdUtils.fastSimpleUUID());
                 centereventDeptEvent.setDeptId(item.getDeptId());
                 centereventDeptEvent.setDeptName(item.getDeptName());
-                centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+                centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
                 centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
             }
         }
@@ -303,10 +300,10 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         return this.insertCentereventTEventcatalogue(centereventTEventcatalogue);
     }
 
+    /*
+     *ImageUpload返回是全路径，数据库保存不要ip和端口号
+     */
     public void attach(CenterdataTAttach centerdataTAttach) {
-        /*
-         *ImageUpload返回是全路径，数据库保存不要ip和端口号
-         */
         if (centerdataTAttach.getAttachPath().startsWith("http")) {
             String attachPath = centerdataTAttach.getAttachPath();
             if (centerdataTAttach.getAttachPath().contains("Download")) {
@@ -354,9 +351,9 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             centereventDeptEvent.setEventCode(centereventtDeptEventBO.getEventCode());
             centereventDeptEvent.setDeptId(item.getDeptId());
             centereventDeptEvent.setDeptName(item.getDeptName());
-            centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+            centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
             centereventDeptEvent.setEventStatus("签收");
-            centereventDeptEvent.setEventStatusValue("forest_event_status_2");
+            centereventDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_2);
             centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
         });
         // 获取市级行管局人员手机号
@@ -384,9 +381,9 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventDeptEvent.setEventCode(centereventtDeptEventBO.getEventCode());
                 centereventDeptEvent.setDeptId(item.getDeptId());
                 centereventDeptEvent.setDeptName(item.getDeptName());
-                centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+                centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
                 centereventDeptEvent.setEventStatus("签收");
-                centereventDeptEvent.setEventStatusValue("forest_event_status_2");
+                centereventDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_2);
                 centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
             }
         }
@@ -505,10 +502,10 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             case "bj":
                 centereventTEventcatalogue.setDataStatus("0");// 办结后恢复统计查询状态
                 centereventTEventcatalogue.setEventStatus("办结");
-                centereventTEventcatalogue.setEventStatusValue("forest_event_status_5");
+                centereventTEventcatalogue.setEventStatusValue(FOREST_EVENT_STATUS_5);
 
                 centereventTDeptEvent.setEventStatus("办结");
-                centereventTDeptEvent.setEventStatusValue("forest_event_status_5");
+                centereventTDeptEvent.setEventStatusValue(FOREST_EVENT_STATUS_5);
                 break;
             case "gd":
                 centereventTEventcatalogue.setEventStatus("归档");
@@ -551,7 +548,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             centereventTLog.setOperation(BUS_OPER_TYPE_2);
         } else if (centereventtDeptEventBO.getEventStatus().equals("qs")) {
             logMessage = "签收该事件";
-            centereventTLog.setOperation("bus_oper_type_1");
+            centereventTLog.setOperation(BUS_OPER_TYPE_1);
         } else if (centereventtDeptEventBO.getEventStatus().equals("wb")) {
             logMessage = "操作该事件误报";
             centereventTLog.setOperation(BUS_OPER_TYPE_2);
@@ -571,7 +568,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         if ("APP".equals(centereventtDeptEventBO.getCzlx())) {
             centereventTLog.setOperationType("log_oper_type_2");
         } else {
-            centereventTLog.setOperationType("log_oper_type_1");
+            centereventTLog.setOperationType(LOG_OPER_TYPE_1);
         }
         centereventTLog.setCreateBy(SecurityUtils.getUserId().toString());
         centereventTLog.setCreateName(user.getNickName());
@@ -629,7 +626,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventDeptEvent.setEventCode(centereventtDeptEventBO.getEventCode());
                 centereventDeptEvent.setDeptId(item.getDeptId());
                 centereventDeptEvent.setDeptName(item.getDeptName());
-                centereventDeptEvent.setDeptHandleType("dept_handleType_3");
+                centereventDeptEvent.setDeptHandleType(DEPT_HANDLE_TYPE_3);
                 centereventDeptEventService.insertCentereventTDeptEvent(centereventDeptEvent);
             });
         }
@@ -644,7 +641,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
         CentereventTEventcatalogue eventcatalogue = centereventTEventcatalogueMapper.selectCentereventTEventcatalogueById(id);
         String busIndex = "bus_indx_other";// 其他
         if ("1".equals(eventcatalogue.getEventType())) {
-            busIndex = "bus_indx_forest";// 火情
+            busIndex = BUS_INDEX_1;// 火情
         }
         String uuid = IdUtils.simpleUUID();
         R result = remoteMonitorService.getPlaybackByTime(uuid, busIndex, eventcatalogue.getCreateBy(),
@@ -655,8 +652,8 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
             centereventTFireLog.setId(uuid);
             centereventTFireLog.setEventCode(eventcatalogue.getEventCode());
             centereventTFireLog.setLogContent(SecurityUtils.getLoginUser().getSysUser().getNickName() + "下载该事件视频。");
-            centereventTFireLog.setOperation("bus_oper_type_1");
-            centereventTFireLog.setOperationType("log_oper_type_1");
+            centereventTFireLog.setOperation(BUS_OPER_TYPE_1);
+            centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
             centereventTFireLogService.insertCentereventTFireLog(centereventTFireLog);
             CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
             centereventTDownloads.setId(IdUtils.simpleUUID());
@@ -686,12 +683,12 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     }
 
     @Override
-    public void downloadsCommon(Map<String, Object> params) throws Exception {
+    public void downloadsCommon(Map<String, Object> params) throws InterruptedException {
         List<CentereventTEventcatalogue> eventcatalogues = centereventTEventcatalogueMapper.getbeforedateDownload(params);
         for (CentereventTEventcatalogue eventcatalogue : eventcatalogues) {
             String busIndex = "bus_indx_other";// 其他
             if ("1".equals(eventcatalogue.getEventType())) {
-                busIndex = "bus_indx_forest";// 火情
+                busIndex = BUS_INDEX_1;// 火情
             }
             String uuid = IdUtils.simpleUUID();
             R result = remoteMonitorService.getPlaybackByTime(uuid, busIndex, eventcatalogue.getCreateBy(),
@@ -703,8 +700,8 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventTFireLog.setId(uuid);
                 centereventTFireLog.setEventCode(eventcatalogue.getEventCode());
                 centereventTFireLog.setLogContent("系统管理员下载该事件视频。");
-                centereventTFireLog.setOperation("bus_oper_type_1");
-                centereventTFireLog.setOperationType("log_oper_type_1");
+                centereventTFireLog.setOperation(BUS_OPER_TYPE_1);
+                centereventTFireLog.setOperationType(LOG_OPER_TYPE_1);
                 centereventTFireLog.setCreateName("系统管理员");
                 centereventTFireLogService.insertCentereventTFireLog(centereventTFireLog);
                 CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
@@ -713,7 +710,7 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
                 centereventTDownloads.setEventName(eventcatalogue.getEventName());
                 centereventTDownloads.setLogId(uuid);
                 centereventTDownloadsService.insertCentereventTDownloads(centereventTDownloads);
-                //TimeUnit.MINUTES.sleep(5);//延时5分钟在调取
+//                TimeUnit.MINUTES.sleep(5);//延时5分钟在调取
                 logger.info("定时任务等待下载=====>{}", DateUtils.dateTimeNow());
                 Thread.sleep(300000);
             } else {

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

@@ -25,6 +25,11 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
     @Autowired
     private CentereventTEventtypeMapper centereventTEventtypeMapper;
 
+    static final String VALUE = "value";
+    static final String LABEL = "label";
+    static final String ID = "id";
+    static final String EVENT_TYPE_NAME = "event_type_name";
+
     /**
      * 查询事件类型列表
      *
@@ -137,8 +142,8 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
         List<Map<String, Object>> mapList = centereventTEventtypeMapper.getCentereventTEventtypeTreeLx(centereventTEventtype);
         for (Map<String, Object> map : mapList) {
             Map<String, Object> bigType = new HashMap<>();
-            bigType.put("value", map.get("id"));
-            bigType.put("label", map.get("event_type_name"));
+            bigType.put(VALUE, map.get(ID));
+            bigType.put(LABEL, map.get(EVENT_TYPE_NAME));
             bigList.add(bigType);
         }
         return bigList;
@@ -158,13 +163,13 @@ public class CentereventTEventtypeServiceImpl implements ICentereventTEventtypeS
             if ("0".equals(map.get("parent_id"))) {
                 Map<String, Object> bigType = new HashMap<>();
                 List<Map<String, Object>> smallList = new ArrayList<>();
-                bigType.put("value", map.get("id"));
-                bigType.put("label", map.get("event_type_name"));
+                bigType.put(VALUE, map.get(ID));
+                bigType.put(LABEL, map.get(EVENT_TYPE_NAME));
                 for (Map<String, Object> map1 : mapList) {
-                    if (map1.get("parent_id").equals(map.get("id").toString())) {
+                    if (map1.get("parent_id").equals(map.get(ID).toString())) {
                         Map<String, Object> smallType = new HashMap<>();
-                        smallType.put("value", map1.get("id"));
-                        smallType.put("label", map1.get("event_type_name"));
+                        smallType.put(VALUE, map1.get(ID));
+                        smallType.put(LABEL, map1.get(EVENT_TYPE_NAME));
                         smallList.add(smallType);
                     }
                 }

src/main/java/com/sooka/sponest/event/centereventteventtypemonitor/service/impl/CentereventTEventtypemonitorServiceImpl.java

@@ -33,6 +33,10 @@ public class CentereventTEventtypemonitorServiceImpl extends BaseService impleme
     @Autowired
     private CentereventTEventtypeMapper centereventTEventtypeMapper;
 
+    static final String ID = "id";
+    static final String PARENT_ID = "parent_id";
+    static final String EVENT_TYPE_NAME = "event_type_name";
+
     /**
      * 查询事件模版类型列表
      *
@@ -93,16 +97,16 @@ public class CentereventTEventtypemonitorServiceImpl extends BaseService impleme
         List<Map<String, Object>> bigList = new ArrayList<>();
         List<Map<String, Object>> mapList = centereventTEventtypeMonitorMapper.getCentereventTEventtypemonitorTree(templateType);
         for (Map<String, Object> map : mapList) {
-            if ("0".equals(map.get("parent_id"))) {
+            if ("0".equals(map.get(PARENT_ID))) {
                 Map<String, Object> bigType = new HashMap<>();
                 List<Map<String, Object>> smallList = new ArrayList<>();
-                bigType.put("value", map.get("id"));
-                bigType.put("label", map.get("event_type_name"));
+                bigType.put("value", map.get(ID));
+                bigType.put("label", map.get(EVENT_TYPE_NAME));
                 for (Map<String, Object> map1 : mapList) {
-                    if (map1.get("parent_id").equals(map.get("id").toString())) {
+                    if (map1.get(PARENT_ID).equals(map.get(ID).toString())) {
                         Map<String, Object> smallType = new HashMap<>();
-                        smallType.put("value", map1.get("id"));
-                        smallType.put("label", map1.get("event_type_name"));
+                        smallType.put("value", map1.get(ID));
+                        smallType.put("label", map1.get(EVENT_TYPE_NAME));
                         smallList.add(smallType);
                     }
                 }
@@ -121,19 +125,19 @@ public class CentereventTEventtypemonitorServiceImpl extends BaseService impleme
         List<Map<String, Object>> bigList = new ArrayList<>();
         List<Map<String, Object>> mapList = centereventTEventtypeMonitorMapper.getEventByEventType(visuForestCloudMapVO);
         for (Map<String, Object> map : mapList) {
-            if (0 == MapUtils.getLong(map, "parent_id")) {
+            if (0 == MapUtils.getLong(map, PARENT_ID)) {
                 Map<String, Object> bigType = new HashMap<>();
                 List<Map<String, Object>> smallList = new ArrayList<>();
-                bigType.put("id", map.get("id"));
-                bigType.put("event_type_name", map.get("event_type_name"));
+                bigType.put(ID, map.get(ID));
+                bigType.put(EVENT_TYPE_NAME, map.get(EVENT_TYPE_NAME));
                 Long sum = 0L;
                 for (Map<String, Object> map1 : mapList) {
-                    if (MapUtils.getString(map1, "parent_id").equals(MapUtils.getString(map, "id"))) {
+                    if (MapUtils.getString(map1, PARENT_ID).equals(MapUtils.getString(map, ID))) {
                         Map<String, Object> smallType = new HashMap<>();
-                        smallType.put("id", map1.get("id"));
-                        smallType.put("parent_id", map1.get("parent_id"));
+                        smallType.put(ID, map1.get(ID));
+                        smallType.put(PARENT_ID, map1.get(PARENT_ID));
                         smallType.put("nums", map1.get("nums"));
-                        smallType.put("event_type_name", map1.get("event_type_name"));
+                        smallType.put(EVENT_TYPE_NAME, map1.get(EVENT_TYPE_NAME));
                         smallType.put("typeXlId", map1.get("typeXlId"));
                         smallType.put("typeDlId", map1.get("typeDlId"));
                         smallType.put("typeDlName", map1.get("typeDlName"));

src/main/java/com/sooka/sponest/event/centereventtfireevent/controller/CentereventTFireEventController.java

@@ -14,8 +14,6 @@ import com.sooka.sponest.event.centereventtfireevent.domain.CentereventTFireEven
 import com.sooka.sponest.event.centereventtfireevent.service.ICentereventTFireEventService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
@@ -33,8 +31,6 @@ import java.util.List;
 @RequestMapping("/centereventtfireevent")
 public class CentereventTFireEventController extends BaseController {
 
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     private ICentereventTFireEventService centereventTFireEventService;
 

src/main/java/com/sooka/sponest/event/centereventtfirelog/controller/CentereventTFireLogController.java

@@ -19,8 +19,6 @@ import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.utils.ExcelUtil;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
@@ -39,8 +37,6 @@ import java.util.List;
 @RequestMapping("/centereventtfirelog")
 public class CentereventTFireLogController extends BaseController {
 
-    protected final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     private ICentereventTFireLogService centereventTFireLogService;
 

src/main/java/com/sooka/sponest/event/centereventtfirespread/domain/CentereventTFireSpread.java

@@ -63,12 +63,6 @@ public class CentereventTFireSpread extends BaseEntity {
     private String atmos;
 
     /**
-     * 备注
-     */
-    @Excel(name = "备注")
-    private String remark;
-
-    /**
      * 部门ID
      */
     @Excel(name = "部门ID")
@@ -144,14 +138,6 @@ public class CentereventTFireSpread extends BaseEntity {
         return atmos;
     }
 
-    public void setRemark(String remark) {
-        this.remark = remark;
-    }
-
-    public String getRemark() {
-        return remark;
-    }
-
     public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }

src/main/java/com/sooka/sponest/event/centereventtlog/domain/CentereventTLog.java

@@ -80,12 +80,6 @@ public class CentereventTLog extends BaseBusinessEntity {
     @Excel(name = "数据状态(1-可用 2-不可用 ) - 字典")
     private String dataStatus;
 
-    /**
-     * 数据所属部门(政或党的id)
-     */
-    @Excel(name = "数据所属部门(政或党的id)")
-    private Long dataDeptId;
-
     public String getFileUrl() {
         return fileUrl;
     }
@@ -178,14 +172,6 @@ public class CentereventTLog extends BaseBusinessEntity {
         return dataStatus;
     }
 
-    public void setDataDeptId(Long dataDeptId) {
-        this.dataDeptId = dataDeptId;
-    }
-
-    public Long getDataDeptId() {
-        return dataDeptId;
-    }
-
     @Override
     public String toString() {
         return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)

src/main/java/com/sooka/sponest/event/emergency/dangerdeptmap/controller/CentereventTEmergencyDangerdeptmapController.java

@@ -47,7 +47,7 @@ public class CentereventTEmergencyDangerdeptmapController extends BaseController
     @PostMapping("/export")
     public void export(HttpServletResponse response, CentereventTEmergencyDangerdeptmap centereventTEmergencyDangerdeptmap) {
         List<CentereventTEmergencyDangerdeptmap> list = centereventTEmergencyDangerdeptmapService.selectCentereventTEmergencyDangerdeptmapList(centereventTEmergencyDangerdeptmap);
-        ExcelUtil<CentereventTEmergencyDangerdeptmap> util = new ExcelUtil<CentereventTEmergencyDangerdeptmap>(CentereventTEmergencyDangerdeptmap.class);
+        ExcelUtil<CentereventTEmergencyDangerdeptmap> util = new ExcelUtil<>(CentereventTEmergencyDangerdeptmap.class);
         util.exportExcel(response, list, "隐患对应部门数据");
     }
 

src/main/java/com/sooka/sponest/event/remoteapi/domain/CenterdataTEmergencyInspectiontype.java

@@ -29,7 +29,7 @@ public class CenterdataTEmergencyInspectiontype extends BaseEntity {
     /**
      * 子部门
      */
-    private List<CenterdataTEmergencyInspectiontype> children = new ArrayList<CenterdataTEmergencyInspectiontype>();
+    private List<CenterdataTEmergencyInspectiontype> children = new ArrayList<>();
     private static final long serialVersionUID = 1L;
 
     /**

src/main/java/com/sooka/sponest/event/urge/service/impl/EventUrgeServiceImpl.java

@@ -24,6 +24,8 @@ import java.util.List;
 import java.util.Observable;
 import java.util.concurrent.TimeUnit;
 
+import static com.sooka.sponest.event.utils.EventConstants.FOREST_EVENT_STATUS_1;
+
 @Service
 @EnableAsync
 public class EventUrgeServiceImpl implements EventUrgeService, ApplicationRunner {
@@ -44,7 +46,7 @@ public class EventUrgeServiceImpl implements EventUrgeService, ApplicationRunner
     @Override
     public void run(ApplicationArguments args) {
         // 找到所有未催办事件
-        List<EventReminder> eventUrges = centereventTEventcatalogueService.getReminderTime("sys_isurge_2", "forest_event_status_1");
+        List<EventReminder> eventUrges = centereventTEventcatalogueService.getReminderTime("sys_isurge_2", FOREST_EVENT_STATUS_1);
         if (StringUtils.isNotEmpty(eventUrges)) {
             long currTime = new Date().getTime();
             RedisService redisServer = SpringUtils.getBean(RedisService.class);
@@ -78,7 +80,7 @@ public class EventUrgeServiceImpl implements EventUrgeService, ApplicationRunner
             return;
         }
         // 上报时，放入催办任务
-        if ("forest_event_status_1".equals(centereventTEventcatalogue.getEventStatusValue())) {
+        if (FOREST_EVENT_STATUS_1.equals(centereventTEventcatalogue.getEventStatusValue())) {
             long currTime = new Date().getTime();
             long reminderTime = centereventTEventtypeService.getReminderTimeById(centereventTEventcatalogue);
             long createTime = centereventTEventcatalogue.getCreateTime().getTime();
@@ -86,7 +88,7 @@ public class EventUrgeServiceImpl implements EventUrgeService, ApplicationRunner
             SpringUtils.getBean(RedisService.class).setCacheObject(EventConstants.EVENT_URGE_PREFIX + centereventTEventcatalogue.getEventCode(), centereventTEventcatalogue, createTime + reminderTime - currTime, TimeUnit.MILLISECONDS);
         }
         // 上报、确认、签收时，推送至可视化
-        if ("forest_event_status_1".equals(centereventTEventcatalogue.getEventStatusValue()) || "forest_event_status_7".equals(centereventTEventcatalogue.getEventStatusValue())
+        if (FOREST_EVENT_STATUS_1.equals(centereventTEventcatalogue.getEventStatusValue()) || "forest_event_status_7".equals(centereventTEventcatalogue.getEventStatusValue())
                 || "forest_event_status_2".equals(centereventTEventcatalogue.getEventStatusValue()) || "forest_event_status_5".equals(centereventTEventcatalogue.getEventStatusValue())) {
             SpringUtils.getBean(RedisService.class).convertAndSend(EventConstants.SOCKET_PUSH_TOPIC, centereventTEventcatalogue);
         }

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

@@ -12,6 +12,7 @@ public class EventConstants {
     // 事件状态
     public static final String FOREST_EVENT_STATUS_1 = "forest_event_status_1";// 上报
     public static final String FOREST_EVENT_STATUS_2 = "forest_event_status_2";// 签收
+    public static final String FOREST_EVENT_STATUS_5 = "forest_event_status_5";// 办结
     public static final String FOREST_EVENT_STATUS_7 = "forest_event_status_7";// 确认
 
     // 事件来源
@@ -23,11 +24,14 @@ public class EventConstants {
 
     // 部门类型
     public static final String DEPT_HANDLE_TYPE_2 = "dept_handleType_2";// 配合单位
+    public static final String DEPT_HANDLE_TYPE_3 = "dept_handleType_3";// 行管局
 
     // 业务操作类型
+    public static final String BUS_OPER_TYPE_1 = "bus_oper_type_1";
     public static final String BUS_OPER_TYPE_2 = "bus_oper_type_2";// 反馈
 
     // 日志操作类型
+    public static final String LOG_OPER_TYPE_1 = "log_oper_type_1";
     public static final String LOG_OPER_TYPE_3 = "log_oper_type_3";// AI反馈
 
     // 附件索引

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

@@ -5,7 +5,6 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.redis.service.RedisService;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
-import org.apache.commons.lang3.time.FastDateFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -28,8 +27,8 @@ import java.util.concurrent.TimeUnit;
 //@RestController
 //@RequestMapping("/testload")
 public class ScheduleTaskUtil {
+
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    private static FastDateFormat simpleDateFormat = FastDateFormat.getInstance("yyyy-MM-dd HH:mm:ss");
 
     @Autowired
     private ICentereventTEventcatalogueService centereventTEventcatalogueService;