修复异味

src/main/java/com/sooka/sponest/event/centereventtdeptevent/domain/CentereventDeptEvent.java

@@ -93,12 +93,6 @@ public class CentereventDeptEvent extends BaseBusinessEntity {
     @NotBlank
     private String deptHandleType;
 
-    /**
-     * 创建人名称
-     */
-    @Excel(name = "创建人名称")
-    private String createName;
-
     public void setId(String id) {
         this.id = id;
     }
@@ -186,12 +180,4 @@ public class CentereventDeptEvent extends BaseBusinessEntity {
     public String getDeptHandleType() {
         return deptHandleType;
     }
-
-    public void setCreateName(String createName) {
-        this.createName = createName;
-    }
-
-    public String getCreateName() {
-        return createName;
-    }
 }

src/main/java/com/sooka/sponest/event/centereventtdeptevent/service/impl/CentereventDeptEventServiceImpl.java

@@ -1,9 +1,9 @@
 package com.sooka.sponest.event.centereventtdeptevent.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.domain.SysDept;
-import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.mapper.CentereventDeptEventMapper;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;

src/main/java/com/sooka/sponest/event/centereventtdutysystem/controller/CentereventTDutySystemController.java

@@ -18,8 +18,6 @@ import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTE
 import com.sooka.sponest.event.utils.RemoteApiUtil;
 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.*;

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

@@ -1,13 +1,9 @@
 package com.sooka.sponest.event.centereventteventcatalogue.controller;
 
-import com.ruoyi.common.core.utils.SpringUtils;
-import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.web.controller.BaseController;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.ruoyi.system.api.RemoteUserService;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICenterEventCommandCenterService;
-import com.sooka.sponest.event.utils.WordExport;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,7 +11,6 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
-import javax.servlet.http.HttpServletResponse;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -82,15 +77,4 @@ public class CenterEventCommandController extends BaseController {
     public AjaxResult getEventPoint(CentereventDeptEvent centereventTDeptEvent) {
         return AjaxResult.success(centerEventCommandCenterService.getEventPoint(centereventTDeptEvent));
     }
-
-    @ApiOperation("事件报告")
-    @GetMapping("/getEventReport")
-    public void getEventReport(HttpServletResponse response, CentereventDeptEvent centereventTDeptEvent) {
-        Map<String, String> resultMap = centerEventCommandCenterService.getEventReport(centereventTDeptEvent);
-        Map<String, String> userCount = SpringUtils.getBean(RemoteUserService.class).getUserAndActiveCount().getData();
-        if (StringUtils.isNotEmpty(userCount)) {
-            userCount.forEach((k, v) -> resultMap.merge(k, v, (v1, v2) -> v2));
-        }
-        WordExport.wordExport(resultMap, response);
-    }
 }

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

@@ -35,8 +35,6 @@ import com.sooka.sponest.message.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 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.*;
@@ -59,8 +57,6 @@ import static com.sooka.sponest.event.utils.EventConstants.*;
 @RequestMapping("/eventcatalogue")
 public class CentereventTEventcatalogueController extends BaseController {
 
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
     @Autowired
     private ICentereventTEventcatalogueService centereventTEventcatalogueService;
 
@@ -363,13 +359,13 @@ public class CentereventTEventcatalogueController extends BaseController {
     @GetMapping("/eventhandleDownload/{id}")
     public AjaxResult eventhandleDownload(@PathVariable("id") String id) {
         //校验 已下载不让重复下载
-        CentereventTDownloads centereventTDownloads=new CentereventTDownloads();
+        CentereventTDownloads centereventTDownloads = new CentereventTDownloads();
         centereventTDownloads.setEventCode(id);
         centereventTDownloads.setFlag("1");
         List<CentereventTDownloads> downloadsList = centereventTDownloadsService.selectCentereventTDownloadsList(centereventTDownloads);
-        if(null != downloadsList && downloadsList.size() > 0){
-           return  AjaxResult.error("已下载的视频，不能重复下载!");
-        }else{
+        if (null != downloadsList && downloadsList.size() > 0) {
+            return AjaxResult.error("已下载的视频，不能重复下载!");
+        } else {
             return AjaxResult.success(centereventTEventcatalogueService.eventhandleDownload(id));
         }
 

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

@@ -1,9 +1,9 @@
 package com.sooka.sponest.event.centereventteventcatalogue.domain;
 
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.core.web.domain.BaseEntity;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.apache.commons.lang3.builder.ToStringStyle;
 
 /**
  * 【请填写功能名称】对象 centerevent_t_downloads

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

@@ -95,29 +95,27 @@ public class InfoVO {
         if (StringUtils.isBlank(str)) {
             return "";
         }
-        String outAngle = "";
-        double angle = Double.parseDouble(str);//转成double进行比较
+        double angleStr = Double.parseDouble(str);//转成double进行比较
         DecimalFormat df = new DecimalFormat(".00");
-
         String newangle = df.format(angle);//保留两位小数 转成字符串进行拼接
-        if (67d <= angle && angle <= 111d) {
+        String outAngle = "";
+        if (67d <= angleStr && angleStr <= 111d) {
             outAngle = "东" + newangle + "°";
-        } else if (158d <= angle && angle <= 202d) {
+        } else if (158d <= angleStr && angleStr <= 202d) {
             outAngle = "南" + newangle + "°";
-        } else if (247d <= angle && angle <= 288d) {
+        } else if (247d <= angleStr && angleStr <= 288d) {
             outAngle = "西" + newangle + "°";
-        } else if ((338d <= angle && angle <= 359d) || (0d <= angle && angle <= 21d)) {
+        } else if ((338d <= angleStr && angleStr <= 359d) || (0d <= angleStr && angleStr <= 21d)) {
             outAngle = "北" + newangle + "°";
-        } else if (203d <= angle && angle <= 246d) {
+        } else if (203d <= angleStr && angleStr <= 246d) {
             outAngle = "西南" + newangle + "°";
-        } else if (22d <= angle && angle <= 66d) {
+        } else if (22d <= angleStr && angleStr <= 66d) {
             outAngle = "东北" + newangle + "°";
-        } else if (292d <= angle && angle <= 337d) {
+        } else if (292d <= angleStr && angleStr <= 337d) {
             outAngle = "西北" + newangle + "°";
-        } else if (112d <= angle && angle <= 157d) {
+        } else if (112d <= angleStr && angleStr <= 157d) {
             outAngle = "东南" + newangle + "°";
         }
-
         return outAngle;
     }
 }

src/main/java/com/sooka/sponest/event/centereventteventcatalogue/mapper/CentereventTDownloadsMapper.java

@@ -1,10 +1,8 @@
 package com.sooka.sponest.event.centereventteventcatalogue.mapper;
 
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 【请填写功能名称】Mapper接口
@@ -12,15 +10,15 @@ import java.util.Map;
  * @author ruoyi
  * @date 2023-09-12
  */
-public interface CentereventTDownloadsMapper
-{
+public interface CentereventTDownloadsMapper {
+
     /**
      * 查询【请填写功能名称】
      *
      * @param id 【请填写功能名称】主键
      * @return 【请填写功能名称】
      */
-    public CentereventTDownloads selectCentereventTDownloadsById(String id);
+    CentereventTDownloads selectCentereventTDownloadsById(String id);
 
     /**
      * 查询【请填写功能名称】列表
@@ -28,7 +26,7 @@ public interface CentereventTDownloadsMapper
      * @param centereventTDownloads 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads);
+    List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads);
 
     /**
      * 新增【请填写功能名称】
@@ -36,7 +34,7 @@ public interface CentereventTDownloadsMapper
      * @param centereventTDownloads 【请填写功能名称】
      * @return 结果
      */
-    public int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads);
+    int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads);
 
     /**
      * 修改【请填写功能名称】
@@ -44,15 +42,7 @@ public interface CentereventTDownloadsMapper
      * @param centereventTDownloads 【请填写功能名称】
      * @return 结果
      */
-    public int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads);
-
-    /**
-     * 删除【请填写功能名称】
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    public int deleteCentereventTDownloadsById(String id);
+    int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads);
 
     /**
      * 批量删除【请填写功能名称】
@@ -60,7 +50,7 @@ public interface CentereventTDownloadsMapper
      * @param ids 需要删除的数据主键集合
      * @return 结果
      */
-    public int deleteCentereventTDownloadsByIds(String[] ids);
+    int deleteCentereventTDownloadsByIds(String[] ids);
 
     List<CentereventTDownloads> validDownloadIs();
 

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

@@ -34,6 +34,4 @@ public interface ICenterEventCommandCenterService {
     List<Map<String, Object>> getEventBmCount(CentereventDeptEvent centereventTDeptEvent);
 
     List<Map<String, Object>> getEventPoint(CentereventDeptEvent centereventTDeptEvent);
-
-    Map<String, String> getEventReport(CentereventDeptEvent centereventTDeptEvent);
 }

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

@@ -1,10 +1,8 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service;
 
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 
 import java.util.List;
-import java.util.Map;
 
 /**
  * 【请填写功能名称】Service接口
@@ -12,15 +10,15 @@ import java.util.Map;
  * @author ruoyi
  * @date 2023-09-12
  */
-public interface ICentereventTDownloadsService
-{
+public interface ICentereventTDownloadsService {
+
     /**
      * 查询【请填写功能名称】
      *
      * @param id 【请填写功能名称】主键
      * @return 【请填写功能名称】
      */
-    public CentereventTDownloads selectCentereventTDownloadsById(String id);
+    CentereventTDownloads selectCentereventTDownloadsById(String id);
 
     /**
      * 查询【请填写功能名称】列表
@@ -28,7 +26,7 @@ public interface ICentereventTDownloadsService
      * @param centereventTDownloads 【请填写功能名称】
      * @return 【请填写功能名称】集合
      */
-    public List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads);
+    List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads);
 
     /**
      * 新增【请填写功能名称】
@@ -36,7 +34,7 @@ public interface ICentereventTDownloadsService
      * @param centereventTDownloads 【请填写功能名称】
      * @return 结果
      */
-    public int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads);
+    int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads);
 
     /**
      * 修改【请填写功能名称】
@@ -44,7 +42,7 @@ public interface ICentereventTDownloadsService
      * @param centereventTDownloads 【请填写功能名称】
      * @return 结果
      */
-    public int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads);
+    int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads);
 
     /**
      * 批量删除【请填写功能名称】
@@ -52,15 +50,7 @@ public interface ICentereventTDownloadsService
      * @param ids 需要删除的【请填写功能名称】主键集合
      * @return 结果
      */
-    public int deleteCentereventTDownloadsByIds(String[] ids);
-
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    public int deleteCentereventTDownloadsById(String id);
+    int deleteCentereventTDownloadsByIds(String[] ids);
 
     List<CentereventTDownloads> validDownloadIs();
 

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

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

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

@@ -5,8 +5,6 @@ import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
@@ -22,6 +20,8 @@ import com.sooka.sponest.event.centereventteventtype.domain.CentereventTEventtyp
 import com.sooka.sponest.event.centereventteventtype.service.ICentereventTEventtypeService;
 import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
 import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.message.api.RemoteMonitorService;
 import com.sooka.sponest.monitor.api.domain.CenterdataTAidevicedept;
 import com.sooka.sponest.monitor.api.domain.CenterdataTCamera;
@@ -57,9 +57,9 @@ public class AlarmEventServiceImpl implements AlarmEventService {
     @Autowired
     private ICentereventTEventtypeService centereventTEventtypeService;
 
-    final String ERROR_MSG_CHANNEL = "无法匹配相关设备！通道编号为：{}";
+    static final String ERROR_MSG_CHANNEL = "无法匹配相关设备！通道编号为：{}";
 
-    final String ERROR_MSG_DEPT = "无法匹配相关部门！摄像头编号为：{}";
+    static final String ERROR_MSG_DEPT = "无法匹配相关部门！摄像头编号为：{}";
 
     @Transactional
     @Override

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

@@ -4,13 +4,11 @@ import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.StringUtils;
 import com.ruoyi.common.core.utils.file.FilePrefixUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteDeptService;
 import com.ruoyi.system.api.domain.SysDept;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent;
 import com.sooka.sponest.event.centereventtdeptevent.service.ICentereventDeptEventService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.AppEventSalBO;
@@ -21,6 +19,8 @@ import com.sooka.sponest.event.centereventteventcatalogue.service.ICenterEventAp
 import com.sooka.sponest.event.centereventtfireevent.service.ICentereventTFireEventService;
 import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
 import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.utils.RemoteApiUtil;
 import com.sooka.sponest.message.api.RemoteMonitorService;
 import org.apache.commons.collections4.MapUtils;
@@ -112,13 +112,13 @@ public class CenterEventAppServiceImpl extends BaseService implements ICenterEve
         VisuForestCloudMapVO sal = new VisuForestCloudMapVO();
         sal.setEventCode(appEventSalBO.getEventCode());
         Map<String, Object> asl = centereventTFireEventService.getYuAnByEventCode(sal);
-        if (StringUtils.isNotNull(asl) && StringUtils.isNotBlank(MapUtils.getString(asl, "fileUrl"))) {
-//            asl.put("fileUrl", keyMap.get(FILE_PREFIX_APP) + MapUtils.getString(asl, "fileUrl"));
+        if (StringUtils.isNotNull(asl) && StringUtils.isNotBlank(MapUtils.getString(asl, FILE_PREFIX_LOCAL))) {
+//            asl.put(FILE_PREFIX_LOCAL, keyMap.get(FILE_PREFIX_APP) + MapUtils.getString(asl, FILE_PREFIX_LOCAL));
             StringBuilder newDiles = new StringBuilder();
-            String url = MapUtils.getString(asl, "fileUrl");
+            String url = MapUtils.getString(asl, FILE_PREFIX_LOCAL);
             String name = MapUtils.getString(asl, "fileName");
             newDiles.append(keyMap.get(FILE_DOWNLOAD) + "Download?fileName=" + name + "&&group=" + url.substring(0, url.indexOf('/')) + "&&path=" + url.substring(url.indexOf('/') + 1));
-            asl.put("fileUrl", newDiles);
+            asl.put(FILE_PREFIX_LOCAL, newDiles);
             bo.setAppAttachSal(asl);
         }
         if (bo.getReportSource().equals("AI")) {

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

@@ -6,7 +6,6 @@ import com.sooka.sponest.event.centereventtdeptevent.domain.CentereventDeptEvent
 import com.sooka.sponest.event.centereventteventcatalogue.mapper.CenterEventCommandCenterMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICenterEventCommandCenterService;
 import org.apache.commons.collections4.MapUtils;
-import org.apache.http.client.utils.DateUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -28,19 +27,20 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
     @Autowired
     private CenterEventCommandCenterMapper centerEventCommandCenterMapper;
 
-    protected final String NUMBER = "num";
-    protected final String UNPROCESSED = "unprocessed";
-    protected final String PROCESSING = "processing";
-    protected final String PROCESSED = "processed";
-    private final static Map<String, List> hgjMap = new HashMap();
+    private static final String NUMBER = "num";
+    private static final String UNPROCESSED = "unprocessed";
+    private static final String PROCESSING = "processing";
+    private static final String PROCESSED = "processed";
+    private static final String MONTH = "month";
+    private static final Map<String, List> HGJ_MAP = new HashMap();
 
     static {
-        hgjMap.put(SI_PING, Arrays.asList(367, 3772, 3773, 3774, 3775, 3776, 3777, 3778));// 四平市行管局
-        hgjMap.put(SHUANG_LIAO, Arrays.asList(377, 378, 379, 380, 381, 382, 3809, 384));// 双辽市行管局
-        hgjMap.put(YI_TONG, Arrays.asList(386, 387, 388, 389, 390, 391, 3807, 393));// 伊通县行管局
-        hgjMap.put(LI_SHU, Arrays.asList(401, 402, 403, 404, 405, 406, 3804, 408));// 梨树县行管局
-        hgjMap.put(TIE_DONG, Arrays.asList(416, 417, 418, 419, 420, 421, 3800, 423));// 铁东区行管局
-        hgjMap.put(TIE_XI, Arrays.asList(425, 426, 427, 428, 429, 430, 3796, 432));// 铁西区行管局
+        HGJ_MAP.put(SI_PING, Arrays.asList(367, 3772, 3773, 3774, 3775, 3776, 3777, 3778));// 四平市行管局
+        HGJ_MAP.put(SHUANG_LIAO, Arrays.asList(377, 378, 379, 380, 381, 382, 3809, 384));// 双辽市行管局
+        HGJ_MAP.put(YI_TONG, Arrays.asList(386, 387, 388, 389, 390, 391, 3807, 393));// 伊通县行管局
+        HGJ_MAP.put(LI_SHU, Arrays.asList(401, 402, 403, 404, 405, 406, 3804, 408));// 梨树县行管局
+        HGJ_MAP.put(TIE_DONG, Arrays.asList(416, 417, 418, 419, 420, 421, 3800, 423));// 铁东区行管局
+        HGJ_MAP.put(TIE_XI, Arrays.asList(425, 426, 427, 428, 429, 430, 3796, 432));// 铁西区行管局
     }
 
     public List<Map<String, Object>> dataFilter(List<Map<String, Object>> list) {
@@ -91,55 +91,49 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
                 unprocessedMap.put(SHUANG_LIAO_NAME, unprocessedMap.get(SHUANG_LIAO_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(SHUANG_LIAO_NAME, processingMap.get(SHUANG_LIAO_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(SHUANG_LIAO_NAME, processedMap.get(SHUANG_LIAO_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
             if (ancestors.contains(YI_TONG)) {
                 defaultMap.put(YI_TONG_NAME, defaultMap.get(YI_TONG_NAME) + MapUtils.getLong(map, NUMBER));
                 unprocessedMap.put(YI_TONG_NAME, unprocessedMap.get(YI_TONG_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(YI_TONG_NAME, processingMap.get(YI_TONG_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(YI_TONG_NAME, processedMap.get(YI_TONG_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
             if (ancestors.contains(LI_SHU)) {
                 defaultMap.put(LI_SHU_NAME, defaultMap.get(LI_SHU_NAME) + MapUtils.getLong(map, NUMBER));
                 unprocessedMap.put(LI_SHU_NAME, unprocessedMap.get(LI_SHU_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(LI_SHU_NAME, processingMap.get(LI_SHU_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(LI_SHU_NAME, processedMap.get(LI_SHU_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
             if (ancestors.contains(TIE_DONG)) {
                 defaultMap.put(TIE_DONG_NAME, defaultMap.get(TIE_DONG_NAME) + MapUtils.getLong(map, NUMBER));
                 unprocessedMap.put(TIE_DONG_NAME, unprocessedMap.get(TIE_DONG_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(TIE_DONG_NAME, processingMap.get(TIE_DONG_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(TIE_DONG_NAME, processedMap.get(TIE_DONG_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
             if (ancestors.contains(TIE_XI)) {
                 defaultMap.put(TIE_XI_NAME, defaultMap.get(TIE_XI_NAME) + MapUtils.getLong(map, NUMBER));
                 unprocessedMap.put(TIE_XI_NAME, unprocessedMap.get(TIE_XI_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(TIE_XI_NAME, processingMap.get(TIE_XI_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(TIE_XI_NAME, processedMap.get(TIE_XI_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
             if (ancestors.contains(SI_PING)) {
                 defaultMap.put(SI_PING_NAME, defaultMap.get(SI_PING_NAME) + MapUtils.getLong(map, NUMBER));
                 unprocessedMap.put(SI_PING_NAME, unprocessedMap.get(SI_PING_NAME) + MapUtils.getLong(map, UNPROCESSED));
                 processingMap.put(SI_PING_NAME, processingMap.get(SI_PING_NAME) + MapUtils.getLong(map, PROCESSING));
                 processedMap.put(SI_PING_NAME, processedMap.get(SI_PING_NAME) + MapUtils.getLong(map, PROCESSED));
-                continue;
             }
         }
         List<Map<String, Object>> result = new ArrayList<>();
-        for (String key : defaultMap.keySet()) {
-            String[] keys = key.split("_");
+        for (Map.Entry<String, Long> entry : defaultMap.entrySet()) {
+            String[] keys = entry.getKey().split("_");
             // 不要四平市
             if (!SI_PING.equals(keys[0])) {
                 map = new HashMap<>();
                 map.put("name", keys[1]);
-                map.put(NUMBER, defaultMap.get(key));
-                map.put(UNPROCESSED, unprocessedMap.get(key));
-                map.put(PROCESSING, processingMap.get(key));
-                map.put(PROCESSED, processedMap.get(key));
+                map.put(NUMBER, entry.getValue());
+                map.put(UNPROCESSED, unprocessedMap.get(entry.getKey()));
+                map.put(PROCESSING, processingMap.get(entry.getKey()));
+                map.put(PROCESSED, processedMap.get(entry.getKey()));
                 result.add(map);
             }
         }
@@ -174,20 +168,20 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
         setSookaDataBase(centereventTDeptEvent);
         List<Map<String, Object>> result = centerEventCommandCenterMapper.getFireLoss(centereventTDeptEvent);
         // 提取已存在的年-月
-        List<String> originDate = result.stream().map(item -> MapUtils.getString(item, "month")).collect(Collectors.toList());
+        List<String> originDate = result.stream().map(item -> MapUtils.getString(item, MONTH)).collect(Collectors.toList());
         // 获取不存在的年-月
         int year = LocalDate.now().getYear();
         List<String> newDate = Arrays.asList(year + "-01", year + "-02", year + "-03", year + "-04", year + "-05", year + "-06", year + "-07", year + "-08", year + "-09", year + "-10", year + "-11", year + "-12");
         newDate = newDate.stream().filter(o -> !originDate.contains(o)).collect(Collectors.toList());
         newDate.forEach(date -> {
             Map<String, Object> map = new HashMap<>();
-            map.put("month", date);
+            map.put(MONTH, date);
             map.put("loss", 0L);
             map.put("blazes", 0L);
             result.add(map);
         });
         // 排序
-        Collections.sort(result, (o1, o2) -> MapUtils.getString(o1, "month").compareTo(MapUtils.getString(o2, "month")));
+        Collections.sort(result, (o1, o2) -> MapUtils.getString(o1, MONTH).compareTo(MapUtils.getString(o2, MONTH)));
         return result;
     }
 
@@ -212,9 +206,9 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
     @Override
     public List<Map<String, Object>> getEventHgjCount(CentereventDeptEvent centereventTDeptEvent) {
         setSookaDataBase(centereventTDeptEvent);
-        List hgjList = hgjMap.get(String.valueOf(centereventTDeptEvent.getDeptId()));
+        List hgjList = HGJ_MAP.get(String.valueOf(centereventTDeptEvent.getDeptId()));
         if (StringUtils.isEmpty(hgjList)) {// 非三县两区用户，默认返四平市
-            hgjList = hgjMap.get(SI_PING);
+            hgjList = HGJ_MAP.get(SI_PING);
         }
         centereventTDeptEvent.getParams().put("hgj", hgjList);
         return centerEventCommandCenterMapper.getEventHgjCount(centereventTDeptEvent);
@@ -256,73 +250,4 @@ public class CenterEventCommandCenterServiceImpl extends BaseService implements
         setSookaDataBase(centereventTDeptEvent);
         return centerEventCommandCenterMapper.getEventPoint(centereventTDeptEvent);
     }
-
-    @Override
-    public Map<String, String> getEventReport(CentereventDeptEvent centereventTDeptEvent) {
-        setSookaDataBase(centereventTDeptEvent);
-        // 类型
-        List<Map<String, Object>> typeList = centerEventCommandCenterMapper.getEventReportType(centereventTDeptEvent);
-        // 市级行管局
-        centereventTDeptEvent.getParams().put("deptIds", Arrays.asList(367, 3772, 3773, 3774, 3775, 3776, 3777, 3778));
-        List<Map<String, Object>> hgjList = centerEventCommandCenterMapper.getEventReportHgj(centereventTDeptEvent);
-        // 三县两区
-        List<Map<String, Object>> bmList = centerEventCommandCenterMapper.getEventReportBm(centereventTDeptEvent);
-        bmList = dataFilter(bmList);
-        // 返回值
-        Map<String, String> resultMap = new HashMap<>();
-        resultMap.put("start", DateUtils.formatDate(DateUtils.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "start")), "yyyy年MM月dd日 HH时mm分ss秒"));
-        resultMap.put("end", DateUtils.formatDate(DateUtils.parseDate(MapUtils.getString(centereventTDeptEvent.getParams(), "end")), "yyyy年MM月dd日 HH时mm分ss秒"));
-        Long num = 0L;
-        Long processed = 0L;
-        Long processing = 0L;
-        StringBuilder typeBuilder = new StringBuilder();
-        for (Map<String, Object> map : typeList) {
-            num += MapUtils.getLong(map, "num");
-            processed += MapUtils.getLong(map, "processed");
-            processing += MapUtils.getLong(map, "processing");
-            typeBuilder.append("   ");
-            typeBuilder.append(MapUtils.getString(map, "name"));
-            typeBuilder.append("事件总数：");
-            typeBuilder.append(MapUtils.getString(map, "num"));
-            typeBuilder.append("，已处理：");
-            typeBuilder.append(MapUtils.getString(map, "processed"));
-            typeBuilder.append("，处理中：");
-            typeBuilder.append(MapUtils.getString(map, "processing"));
-            typeBuilder.append("。");
-            typeBuilder.append(System.getProperty("line.separator"));
-        }
-        resultMap.put("num", String.valueOf(num));
-        resultMap.put("processed", String.valueOf(processed));
-        resultMap.put("processing", String.valueOf(processing));
-        resultMap.put("type", typeBuilder.toString());
-        StringBuilder hgjBuilder = new StringBuilder();
-        for (Map<String, Object> map : hgjList) {
-            hgjBuilder.append("   ");
-            hgjBuilder.append(MapUtils.getString(map, "name"));
-            hgjBuilder.append("事件总数：");
-            hgjBuilder.append(MapUtils.getString(map, "num"));
-            hgjBuilder.append("，已处理：");
-            hgjBuilder.append(MapUtils.getString(map, "processed"));
-            hgjBuilder.append("，处理中：");
-            hgjBuilder.append(MapUtils.getString(map, "processing"));
-            hgjBuilder.append("。");
-            hgjBuilder.append(System.getProperty("line.separator"));
-        }
-        resultMap.put("hgj", hgjBuilder.toString());
-        StringBuilder bmBuilder = new StringBuilder();
-        for (Map<String, Object> map : bmList) {
-            bmBuilder.append("   ");
-            bmBuilder.append(MapUtils.getString(map, "name"));
-            bmBuilder.append("事件总数：");
-            bmBuilder.append(MapUtils.getString(map, "num"));
-            bmBuilder.append("，已处理：");
-            bmBuilder.append(MapUtils.getString(map, "processed"));
-            bmBuilder.append("，处理中：");
-            bmBuilder.append(MapUtils.getString(map, "processing"));
-            bmBuilder.append("。");
-            bmBuilder.append(System.getProperty("line.separator"));
-        }
-        resultMap.put("bm", bmBuilder.toString());
-        return resultMap;
-    }
 }

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

@@ -1,27 +1,17 @@
 package com.sooka.sponest.event.centereventteventcatalogue.service.impl;
 
-import java.util.List;
-import java.util.Map;
-
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.core.utils.StringUtils;
-import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTDownloadsMapper;
-import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTEventcatalogueMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
-import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
-import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.sooka.sponest.message.api.RemoteMonitorService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 /**
  * 【请填写功能名称】Service业务层处理
  *
@@ -29,17 +19,12 @@ import org.springframework.stereotype.Service;
  * @date 2023-09-12
  */
 @Service
-public class CentereventTDownloadsServiceImpl extends BaseService implements ICentereventTDownloadsService
-{
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-    @Autowired
-    private CentereventTDownloadsMapper centereventTDownloadsMapper;
-    @Autowired
-    private CentereventTEventcatalogueMapper centereventTEventcatalogueMapper;
+public class CentereventTDownloadsServiceImpl extends BaseService implements ICentereventTDownloadsService {
 
+    private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
-    private ICentereventTFireLogService centereventTFireLogService;
+    private CentereventTDownloadsMapper centereventTDownloadsMapper;
 
     /**
      * 查询【请填写功能名称】
@@ -48,8 +33,7 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
      * @return 【请填写功能名称】
      */
     @Override
-    public CentereventTDownloads selectCentereventTDownloadsById(String id)
-    {
+    public CentereventTDownloads selectCentereventTDownloadsById(String id) {
         return centereventTDownloadsMapper.selectCentereventTDownloadsById(id);
     }
 
@@ -60,8 +44,7 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
      * @return 【请填写功能名称】
      */
     @Override
-    public List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads)
-    {
+    public List<CentereventTDownloads> selectCentereventTDownloadsList(CentereventTDownloads centereventTDownloads) {
         return centereventTDownloadsMapper.selectCentereventTDownloadsList(centereventTDownloads);
     }
 
@@ -72,10 +55,9 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
      * @return 结果
      */
     @Override
-    public int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads)
-    {
-                centereventTDownloads.setCreateTime(DateUtils.getNowDate());
-            return centereventTDownloadsMapper.insertCentereventTDownloads(centereventTDownloads);
+    public int insertCentereventTDownloads(CentereventTDownloads centereventTDownloads) {
+        centereventTDownloads.setCreateTime(DateUtils.getNowDate());
+        return centereventTDownloadsMapper.insertCentereventTDownloads(centereventTDownloads);
     }
 
     /**
@@ -85,10 +67,8 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
      * @return 结果
      */
     @Override
-    public int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads)
-    {
-                centereventTDownloads.setUpdateTime(DateUtils.getNowDate());
-
+    public int updateCentereventTDownloads(CentereventTDownloads centereventTDownloads) {
+        centereventTDownloads.setUpdateTime(DateUtils.getNowDate());
         return centereventTDownloadsMapper.updateCentereventTDownloads(centereventTDownloads);
     }
 
@@ -99,23 +79,10 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
      * @return 结果
      */
     @Override
-    public int deleteCentereventTDownloadsByIds(String[] ids)
-    {
+    public int deleteCentereventTDownloadsByIds(String[] ids) {
         return centereventTDownloadsMapper.deleteCentereventTDownloadsByIds(ids);
     }
 
-    /**
-     * 删除【请填写功能名称】信息
-     *
-     * @param id 【请填写功能名称】主键
-     * @return 结果
-     */
-    @Override
-    public int deleteCentereventTDownloadsById(String id)
-    {
-        return centereventTDownloadsMapper.deleteCentereventTDownloadsById(id);
-    }
-
     @Override
     public List<CentereventTDownloads> validDownloadIs() {
         return centereventTDownloadsMapper.validDownloadIs();
@@ -125,5 +92,4 @@ public class CentereventTDownloadsServiceImpl extends BaseService implements ICe
     public CentereventTDownloads validDownloadIsOne(String logId) {
         return centereventTDownloadsMapper.validDownloadIsOne(logId);
     }
-
 }

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

@@ -20,7 +20,6 @@ import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDow
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.CentereventtDeptEventBO;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.bo.LatLng;
-import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTDownloadsMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTEventcatalogueMapper;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
@@ -102,7 +101,6 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     private ICentereventTDownloadsService centereventTDownloadsService;
 
 
-
     @DataScopeMutiDept(deptAlias = "c")
     @Override
     public List<CentereventTEventcatalogue> listByPc(CentereventTEventcatalogue centereventTEventcatalogue) {
@@ -686,8 +684,9 @@ public class CentereventTEventcatalogueServiceImpl extends BaseService implement
     public CentereventTEventcatalogue mqtest(String start, String end, int limit) {
         return centereventTEventcatalogueMapper.mqtest(start, end, limit);
     }
+
     @Override
-    public void downloadsCommon(Map<String,Object> params) throws Exception{
+    public void downloadsCommon(Map<String, Object> params) throws Exception {
         List<CentereventTEventcatalogue> eventcatalogues = centereventTEventcatalogueMapper.getbeforedateDownload(params);
         for (CentereventTEventcatalogue eventcatalogue : eventcatalogues) {
             String busIndex = "bus_indx_other";// 其他

src/main/java/com/sooka/sponest/event/centereventtfireevent/service/impl/CentereventTFireEventServiceImpl.java

@@ -1,8 +1,8 @@
 package com.sooka.sponest.event.centereventtfireevent.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.common.datascope.base.service.BaseService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.vo.VisuForestCloudMapVO;
 import com.sooka.sponest.event.centereventtfireevent.domain.CentereventTFireEvent;
 import com.sooka.sponest.event.centereventtfireevent.mapper.CentereventTFireEventMapper;

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

@@ -12,10 +12,10 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
 import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+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;

src/main/java/com/sooka/sponest/event/centereventtfirespread/controller/CentereventTFireSpreadController.java

@@ -47,7 +47,7 @@ public class CentereventTFireSpreadController extends BaseController {
     @PostMapping("/export")
     public void export(HttpServletResponse response, CentereventTFireSpread centereventTFireSpread) {
         List<CentereventTFireSpread> list = centereventTFireSpreadService.selectCentereventTFireSpreadList(centereventTFireSpread);
-        ExcelUtil<CentereventTFireSpread> util = new ExcelUtil<CentereventTFireSpread>(CentereventTFireSpread.class);
+        ExcelUtil<CentereventTFireSpread> util = new ExcelUtil<>(CentereventTFireSpread.class);
         util.exportExcel(response, list, "火灾蔓延数据");
     }
 

src/main/java/com/sooka/sponest/event/centereventtlog/controller/CentereventTLogController.java

@@ -85,7 +85,7 @@ public class CentereventTLogController extends BaseController
     public void export(HttpServletResponse response, CentereventTLog centereventTLog)
     {
         List<CentereventTLog> list = centereventTLogService.selectCentereventTLogList(centereventTLog);
-        ExcelUtil<CentereventTLog> util = new ExcelUtil<CentereventTLog>(CentereventTLog.class);
+        ExcelUtil<CentereventTLog> util = new ExcelUtil<>(CentereventTLog.class);
         util.exportExcel(response, list, "事件操作日志数据");
     }
 

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

@@ -13,49 +13,57 @@ import java.util.List;
  * @author ruoyi
  * @date 2022-05-24
  */
-public class CentereventTLog extends BaseBusinessEntity
-{
+public class CentereventTLog extends BaseBusinessEntity {
+
     private static final long serialVersionUID = 1L;
 
-    /** 主键id */
+    /**
+     * 主键id
+     */
     private String id;
 
-    /** 部门名称（当前操作人） */
+    /**
+     * 部门名称（当前操作人）
+     */
     @Excel(name = "部门名称", readConverterExp = "当=前操作人")
     private String deptName;
 
-    /** 部门id(操作人本部门) */
+    /**
+     * 部门id(操作人本部门)
+     */
     @Excel(name = "部门id(操作人本部门)")
     private Long deptId;
 
-    /** 内容 */
+    /**
+     * 内容
+     */
     @Excel(name = "内容")
     private String logContent;
 
-    /** 维度 */
+    /**
+     * 维度
+     */
     @Excel(name = "维度")
     private String latitude;
 
-    /** 经度 */
+    /**
+     * 经度
+     */
     @Excel(name = "经度")
     private String longitude;
 
-    /** 事件编码 */
+    /**
+     * 事件编码
+     */
     @Excel(name = "事件编码")
     private String eventCode;
 
-    /** 操作类型（1-机器反馈 2-人为操作） */
+    /**
+     * 操作类型（1-机器反馈 2-人为操作）
+     */
     @Excel(name = "操作类型", readConverterExp = "1=-机器反馈,2=-人为操作")
     private String operationType;
 
-    /** 创建人姓名 */
-    @Excel(name = "创建人姓名")
-    private String createName;
-
-    /** 更新人姓名 */
-    @Excel(name = "更新人姓名")
-    private String updateName;
-
     public String getMessageType() {
         return messageType;
     }
@@ -66,11 +74,15 @@ public class CentereventTLog extends BaseBusinessEntity
 
     private String messageType;
 
-    /** 数据状态(1-可用 2-不可用 ) - 字典 */
+    /**
+     * 数据状态(1-可用 2-不可用 ) - 字典
+     */
     @Excel(name = "数据状态(1-可用 2-不可用 ) - 字典")
     private String dataStatus;
 
-    /** 数据所属部门(政或党的id) */
+    /**
+     * 数据所属部门(政或党的id)
+     */
     @Excel(name = "数据所属部门(政或党的id)")
     private Long dataDeptId;
 
@@ -94,134 +106,105 @@ public class CentereventTLog extends BaseBusinessEntity
 
     private List<String> fileUrls;
 
-    public void setId(String id)
-    {
+    public void setId(String id) {
         this.id = id;
     }
 
-    public String getId()
-    {
+    public String getId() {
         return id;
     }
-    public void setDeptName(String deptName)
-    {
+
+    public void setDeptName(String deptName) {
         this.deptName = deptName;
     }
 
-    public String getDeptName()
-    {
+    public String getDeptName() {
         return deptName;
     }
-    public void setDeptId(Long deptId)
-    {
+
+    public void setDeptId(Long deptId) {
         this.deptId = deptId;
     }
 
-    public Long getDeptId()
-    {
+    public Long getDeptId() {
         return deptId;
     }
-    public void setLogContent(String logContent)
-    {
+
+    public void setLogContent(String logContent) {
         this.logContent = logContent;
     }
 
-    public String getLogContent()
-    {
+    public String getLogContent() {
         return logContent;
     }
-    public void setLatitude(String latitude)
-    {
+
+    public void setLatitude(String latitude) {
         this.latitude = latitude;
     }
 
-    public String getLatitude()
-    {
+    public String getLatitude() {
         return latitude;
     }
-    public void setLongitude(String longitude)
-    {
+
+    public void setLongitude(String longitude) {
         this.longitude = longitude;
     }
 
-    public String getLongitude()
-    {
+    public String getLongitude() {
         return longitude;
     }
-    public void setEventCode(String eventCode)
-    {
+
+    public void setEventCode(String eventCode) {
         this.eventCode = eventCode;
     }
 
-    public String getEventCode()
-    {
+    public String getEventCode() {
         return eventCode;
     }
-    public void setOperationType(String operationType)
-    {
+
+    public void setOperationType(String operationType) {
         this.operationType = operationType;
     }
 
-    public String getOperationType()
-    {
+    public String getOperationType() {
         return operationType;
     }
-    public void setCreateName(String createName)
-    {
-        this.createName = createName;
-    }
-
-    public String getCreateName()
-    {
-        return createName;
-    }
-    public void setUpdateName(String updateName)
-    {
-        this.updateName = updateName;
-    }
 
-    public String getUpdateName()
-    {
-        return updateName;
-    }
-    public void setDataStatus(String dataStatus)
-    {
+    public void setDataStatus(String dataStatus) {
         this.dataStatus = dataStatus;
     }
 
-    public String getDataStatus()
-    {
+    public String getDataStatus() {
         return dataStatus;
     }
-    public void setDataDeptId(Long dataDeptId)
-    {
+
+    public void setDataDeptId(Long dataDeptId) {
         this.dataDeptId = dataDeptId;
     }
 
-    public Long getDataDeptId()
-    {
+    public Long getDataDeptId() {
         return dataDeptId;
     }
 
     @Override
     public String toString() {
-        return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
-            .append("id", getId())
-            .append("deptName", getDeptName())
-            .append("deptId", getDeptId())
-            .append("logContent", getLogContent())
-            .append("latitude", getLatitude())
-            .append("longitude", getLongitude())
-            .append("eventCode", getEventCode())
-            .append("operationType", getOperationType())
-            .append("createBy", getCreateBy())
-            .append("createName", getCreateName())
-            .append("createTime", getCreateTime())
-            .append("updateBy", getUpdateBy())
-            .append("updateName", getUpdateName())
-            .append("updateTime", getUpdateTime())
-            .append("dataStatus", getDataStatus())
-            .append("dataDeptId", getDataDeptId())
-            .toString();
+        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
+                .append("id", getId())
+                .append("deptName", getDeptName())
+                .append("deptId", getDeptId())
+                .append("logContent", getLogContent())
+                .append("latitude", getLatitude())
+                .append("longitude", getLongitude())
+                .append("eventCode", getEventCode())
+                .append("operationType", getOperationType())
+                .append("createBy", getCreateBy())
+                .append("createName", getCreateName())
+                .append("createTime", getCreateTime())
+                .append("updateBy", getUpdateBy())
+                .append("updateName", getUpdateName())
+                .append("updateTime", getUpdateTime())
+                .append("dataStatus", getDataStatus())
+                .append("dataDeptId", getDataDeptId())
+                .toString();
     }
 }

src/main/java/com/sooka/sponest/event/centereventtlog/service/impl/CentereventTLogServiceImpl.java

@@ -4,8 +4,8 @@ import com.ruoyi.common.core.utils.DateUtils;
 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.system.api.RemoteConfigService;
 import com.ruoyi.common.datascope.base.service.BaseService;
+import com.ruoyi.system.api.RemoteConfigService;
 import com.sooka.sponest.event.centereventtlog.domain.CentereventTLog;
 import com.sooka.sponest.event.centereventtlog.mapper.CentereventTLogMapper;
 import com.sooka.sponest.event.centereventtlog.service.ICentereventTLogService;
@@ -46,9 +46,7 @@ public class CentereventTLogServiceImpl extends BaseService implements ICenterev
         for (CentereventTLog centereventTLog1 : centereventTLogList) {
             if (StringUtils.isNotEmpty(centereventTLog1.getFileUrl())) {
                 List<String> fileUtrlList = new ArrayList<>();
-                String fileUrls[] = centereventTLog1.getFileUrl().split(",");
-
-                String fileUrlNew = "";
+                String[] fileUrls = centereventTLog1.getFileUrl().split(",");
                 for (String str : fileUrls) {
                     fileUtrlList.add(fileurl + str);
                 }

src/main/java/com/sooka/sponest/event/emergency/danger/controller/CentereventTEmergencyDangerController.java

@@ -9,8 +9,6 @@ import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
 import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
 import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
 import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
@@ -19,6 +17,8 @@ import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmerge
 import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
 import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
 import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.utils.ExcelUtil;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/sooka/sponest/event/emergency/danger/domain/CentereventTEmergencyDanger.java

@@ -2,8 +2,8 @@ package com.sooka.sponest.event.emergency.danger.domain;
 
 import com.ruoyi.common.core.annotation.Excel;
 import com.ruoyi.common.datascope.base.domain.BaseBusinessEntity;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import com.sooka.sponest.event.emergency.dangerdeptmap.domain.CentereventTEmergencyDangerdeptmap;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 

src/main/java/com/sooka/sponest/event/emergency/danger/service/impl/CentereventTEmergencyDangerServiceImpl.java

@@ -5,14 +5,14 @@ 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.datascope.annotation.DataScopeMutiDept;
+import com.ruoyi.common.datascope.base.service.BaseService;
 import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.system.api.RemoteConfigService;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.ruoyi.common.datascope.base.service.BaseService;
 import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
 import com.sooka.sponest.event.emergency.danger.mapper.CentereventTEmergencyDangerMapper;
 import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -63,9 +63,7 @@ public class CentereventTEmergencyDangerServiceImpl extends BaseService implemen
         List<CenterdataTAttach> attachs = remoteDataService.remoteattachlist(centerdataTAttach).getData();
         if (StringUtils.isNotEmpty(attachs)) {
             String prefix = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigKey(FILE_PREFIX_LOCAL).getData();
-            attachs.forEach(item -> {
-                item.setAttachPath(prefix + item.getAttachPath());
-            });
+            attachs.forEach(item -> item.setAttachPath(prefix + item.getAttachPath()));
         }
         centereventTEmergencyDanger.setAttachs(attachs);
         return centereventTEmergencyDanger;

src/main/java/com/sooka/sponest/event/emergency/dangerprocess/controller/CentereventTEmergencyDangerprocessController.java

@@ -8,11 +8,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import com.sooka.sponest.event.emergency.danger.service.ICentereventTEmergencyDangerService;
 import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
 import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;
 import com.sooka.sponest.event.emergency.dangerprocess.service.ICentereventTEmergencyDangerprocessService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

src/main/java/com/sooka/sponest/event/emergency/dangerprocess/service/impl/CentereventTEmergencyDangerprocessServiceImpl.java

@@ -3,8 +3,8 @@ package com.sooka.sponest.event.emergency.dangerprocess.service.impl;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.security.utils.SecurityUtils;
 import com.ruoyi.common.datascope.base.service.BaseService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.event.emergency.danger.domain.CentereventTEmergencyDanger;
 import com.sooka.sponest.event.emergency.dangerprocess.domain.CentereventTEmergencyDangerprocess;
 import com.sooka.sponest.event.emergency.dangerprocess.domain.DayBody;

src/main/java/com/sooka/sponest/event/emergency/emergencyevents/controller/CentereventTEmergencyEmergencyeventsController.java

@@ -26,6 +26,7 @@ import java.util.List;
 @RestController
 @RequestMapping("/emergencyevents")
 public class CentereventTEmergencyEmergencyeventsController extends BaseController {
+
     @Autowired
     private ICentereventTEmergencyEmergencyeventsService centereventTEmergencyEmergencyeventsService;
 
@@ -56,7 +57,7 @@ public class CentereventTEmergencyEmergencyeventsController extends BaseControll
      * 查询应急事件列表
      */
     @PostMapping("/feignSelectByIds/{Ids}")
-    public R<List<CentereventTEmergencyEmergencyevents>> feignSelectByIds(@PathVariable String Ids[]) {
+    public R<List<CentereventTEmergencyEmergencyevents>> feignSelectByIds(@PathVariable String[] Ids) {
         List<CentereventTEmergencyEmergencyevents> list = centereventTEmergencyEmergencyeventsService.selectByIds(Ids);
         return R.ok(list);
     }
@@ -65,7 +66,7 @@ public class CentereventTEmergencyEmergencyeventsController extends BaseControll
      * 查询应急事件列表
      */
     @PostMapping("/feignSelectByMeetingCode/{meetingCodes}")
-    public R<List<CentereventTEmergencyEmergencyevents>> feignSelectByMeetingCode(@PathVariable String meetingCodes[]) {
+    public R<List<CentereventTEmergencyEmergencyevents>> feignSelectByMeetingCode(@PathVariable String[] meetingCodes) {
         List<CentereventTEmergencyEmergencyevents> list = centereventTEmergencyEmergencyeventsService.selectByMeetingCode(meetingCodes);
         return R.ok(list);
     }
@@ -78,7 +79,7 @@ public class CentereventTEmergencyEmergencyeventsController extends BaseControll
     @PostMapping("/export")
     public void export(HttpServletResponse response, CentereventTEmergencyEmergencyevents centereventTEmergencyEmergencyevents) {
         List<CentereventTEmergencyEmergencyevents> list = centereventTEmergencyEmergencyeventsService.selectCentereventTEmergencyEmergencyeventsList(centereventTEmergencyEmergencyevents);
-        ExcelUtil<CentereventTEmergencyEmergencyevents> util = new ExcelUtil<CentereventTEmergencyEmergencyevents>(CentereventTEmergencyEmergencyevents.class);
+        ExcelUtil<CentereventTEmergencyEmergencyevents> util = new ExcelUtil<>(CentereventTEmergencyEmergencyevents.class);
         util.exportExcel(response, list, "应急事件数据");
     }
 

src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/controller/CentereventTEmergencyInspectionrecordController.java

@@ -51,8 +51,7 @@ public class CentereventTEmergencyInspectionrecordController extends BaseControl
      * 查询巡检记录列表(手机端)
      */
     @PostMapping("/appSelectRecord")
-    public R<List<CentereventTEmergencyInspectionrecord>> selectRecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord)
-    {
+    public R<List<CentereventTEmergencyInspectionrecord>> selectRecord(@RequestBody CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord) {
         return R.ok(centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordList(centereventTEmergencyInspectionrecord));
     }
 
@@ -125,37 +124,32 @@ public class CentereventTEmergencyInspectionrecordController extends BaseControl
 
     @PostMapping("/insertCentereventTEmergencyInspectionrecordMessage")
     public R insertCentereventTEmergencyInspectionrecordMessage(@RequestBody CentereventTEmergencyInspectionrecordBody list) {
-
-        CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord= centereventTEmergencyInspectionrecordService.insertCentereventTEmergencyInspectionrecordMessage(list.getList());
-
-
+        CentereventTEmergencyInspectionrecord centereventTEmergencyInspectionrecord = centereventTEmergencyInspectionrecordService.insertCentereventTEmergencyInspectionrecordMessage(list.getList());
         return R.ok(centereventTEmergencyInspectionrecord.getId());
-
     }
 
     /**
      * 手机端巡查记录查询
+     *
      * @param id
      * @return
      */
     @PostMapping("/selectCentereventTEmergencyInspectionrecordMessageList")
     public R selectCentereventTEmergencyInspectionrecordMessageList(@RequestBody CentereventTEmergencyInspectionrecordBdody id) {
-        EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody=new EmergencyInspectionrecordSelectBody();
+        EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody = new EmergencyInspectionrecordSelectBody();
         emergencyInspectionrecordSelectBody.setId(id.getId());
-        List <CentereventTEmergencyInspectionrecordBdody>centereventTEmergencyInspectionrecord= centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordMessageList2(emergencyInspectionrecordSelectBody);
-
+        List<CentereventTEmergencyInspectionrecordBdody> centereventTEmergencyInspectionrecord = centereventTEmergencyInspectionrecordService.selectCentereventTEmergencyInspectionrecordMessageList2(emergencyInspectionrecordSelectBody);
         return R.ok(centereventTEmergencyInspectionrecord);
-
     }
 
     /**
      * 获取应急工作情况
+     *
      * @param emergencyInspectionrecordSelectBody
      * @return
      */
     @GetMapping("/selectEmergencyList")
-    public AjaxResult  selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody)
-    {
+    public AjaxResult selectEmergencyList(EmergencyInspectionrecordSelectBody emergencyInspectionrecordSelectBody) {
         return AjaxResult.success(centereventTEmergencyInspectionrecordService.selectEmergencyList(emergencyInspectionrecordSelectBody));
-    };
+    }
 }

src/main/java/com/sooka/sponest/event/emergency/inspectionrecord/service/impl/CentereventTEmergencyInspectionrecordServiceImpl.java

@@ -4,12 +4,8 @@ import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.uuid.IdUtils;
 import com.ruoyi.common.datascope.annotation.DataScopeMutiDept;
-import com.ruoyi.common.security.utils.SecurityUtils;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectionitem;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectiontype;
 import com.ruoyi.common.datascope.base.service.BaseService;
+import com.ruoyi.common.security.utils.SecurityUtils;
 import com.sooka.sponest.event.emergency.inspectionrecord.domain.AttachBean;
 import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecord;
 import com.sooka.sponest.event.emergency.inspectionrecord.domain.CentereventTEmergencyInspectionrecordBdody;
@@ -18,6 +14,10 @@ import com.sooka.sponest.event.emergency.inspectionrecord.mapper.CentereventTEme
 import com.sooka.sponest.event.emergency.inspectionrecord.service.ICentereventTEmergencyInspectionrecordService;
 import com.sooka.sponest.event.emergency.inspectionrecorddetail.domain.CentereventTEmergencyInspectionrecorddetail;
 import com.sooka.sponest.event.emergency.inspectionrecorddetail.mapper.CentereventTEmergencyInspectionrecorddetailMapper;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTAttach;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectionitem;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyInspectiontype;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;

src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/controller/CentereventTEmergencyInspectionrecorddetailController.java

@@ -58,7 +58,7 @@ public class CentereventTEmergencyInspectionrecorddetailController extends BaseC
     @PostMapping("/export")
     public void export(HttpServletResponse response, CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
         List<CentereventTEmergencyInspectionrecorddetail> list = centereventTEmergencyInspectionrecorddetailService.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
-        ExcelUtil<CentereventTEmergencyInspectionrecorddetail> util = new ExcelUtil<CentereventTEmergencyInspectionrecorddetail>(CentereventTEmergencyInspectionrecorddetail.class);
+        ExcelUtil<CentereventTEmergencyInspectionrecorddetail> util = new ExcelUtil<>(CentereventTEmergencyInspectionrecorddetail.class);
         util.exportExcel(response, list, "巡检记录明细数据");
     }
 

src/main/java/com/sooka/sponest/event/emergency/inspectionrecorddetail/service/impl/CentereventTEmergencyInspectionrecorddetailServiceImpl.java

@@ -19,8 +19,8 @@ import java.util.List;
  * @date 2022-07-20
  */
 @Service
-public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends BaseService implements ICentereventTEmergencyInspectionrecorddetailService
-{
+public class CentereventTEmergencyInspectionrecorddetailServiceImpl extends BaseService implements ICentereventTEmergencyInspectionrecorddetailService {
+
     @Autowired
     private CentereventTEmergencyInspectionrecorddetailMapper centereventTEmergencyInspectionrecorddetailMapper;
 
@@ -31,8 +31,7 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 巡检记录明细
      */
     @Override
-    public CentereventTEmergencyInspectionrecorddetail selectCentereventTEmergencyInspectionrecorddetailById(String id)
-    {
+    public CentereventTEmergencyInspectionrecorddetail selectCentereventTEmergencyInspectionrecorddetailById(String id) {
         return centereventTEmergencyInspectionrecorddetailMapper.selectCentereventTEmergencyInspectionrecorddetailById(id);
     }
 
@@ -43,8 +42,7 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 巡检记录明细
      */
     @Override
-    public List<CentereventTEmergencyInspectionrecorddetail> selectCentereventTEmergencyInspectionrecorddetailList(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail)
-    {
+    public List<CentereventTEmergencyInspectionrecorddetail> selectCentereventTEmergencyInspectionrecorddetailList(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
         return centereventTEmergencyInspectionrecorddetailMapper.selectCentereventTEmergencyInspectionrecorddetailList(centereventTEmergencyInspectionrecorddetail);
     }
 
@@ -55,8 +53,7 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 结果
      */
     @Override
-    public int insertCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail)
-    {
+    public int insertCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
         centereventTEmergencyInspectionrecorddetail.setCreateTime(DateUtils.getNowDate());
         return centereventTEmergencyInspectionrecorddetailMapper.insertCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
     }
@@ -68,8 +65,7 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 结果
      */
     @Override
-    public int updateCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail)
-    {
+    public int updateCentereventTEmergencyInspectionrecorddetail(CentereventTEmergencyInspectionrecorddetail centereventTEmergencyInspectionrecorddetail) {
         centereventTEmergencyInspectionrecorddetail.setUpdateTime(DateUtils.getNowDate());
         return centereventTEmergencyInspectionrecorddetailMapper.updateCentereventTEmergencyInspectionrecorddetail(centereventTEmergencyInspectionrecorddetail);
     }
@@ -81,8 +77,7 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 结果
      */
     @Override
-    public int deleteCentereventTEmergencyInspectionrecorddetailByIds(String[] ids)
-    {
+    public int deleteCentereventTEmergencyInspectionrecorddetailByIds(String[] ids) {
         return centereventTEmergencyInspectionrecorddetailMapper.deleteCentereventTEmergencyInspectionrecorddetailByIds(ids);
     }
 
@@ -93,28 +88,27 @@ public class CentereventTEmergencyInspectionrecorddetailServiceImpl  extends Bas
      * @return 结果
      */
     @Override
-    public int deleteCentereventTEmergencyInspectionrecorddetailById(String id)
-    {
+    public int deleteCentereventTEmergencyInspectionrecorddetailById(String id) {
         return centereventTEmergencyInspectionrecorddetailMapper.deleteCentereventTEmergencyInspectionrecorddetailById(id);
     }
 
     /**
      * 获取行业巡检通不通过详情
+     *
      * @param centereventTEmergencyInspectionrecorddetailBody
      * @return
      */
-    @DataScopeMutiDept(deptAlias = "z",userAlias = "u")
+    @DataScopeMutiDept(deptAlias = "z", userAlias = "u")
     @Override
     public List selectAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
         setSookaDataBase(centereventTEmergencyInspectionrecorddetailBody);
-        List list=centereventTEmergencyInspectionrecorddetailMapper.selectAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
-        return list;
+        return centereventTEmergencyInspectionrecorddetailMapper.selectAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
     }
-    @DataScopeMutiDept(deptAlias = "z",userAlias = "u")
+
+    @DataScopeMutiDept(deptAlias = "z", userAlias = "u")
     @Override
     public List selectHightAdoptionList(CentereventTEmergencyInspectionrecorddetailBody centereventTEmergencyInspectionrecorddetailBody) {
         setSookaDataBase(centereventTEmergencyInspectionrecorddetailBody);
-        List list=centereventTEmergencyInspectionrecorddetailMapper.selectHightAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
-        return list;
+        return centereventTEmergencyInspectionrecorddetailMapper.selectHightAdoptionList(centereventTEmergencyInspectionrecorddetailBody);
     }
 }

src/main/java/com/sooka/sponest/event/emergency/patroloverdue/controller/CentereventTEmergencyPatroloverdueController.java

@@ -49,7 +49,7 @@ public class CentereventTEmergencyPatroloverdueController extends BaseController
     public void export(HttpServletResponse response, CentereventTEmergencyPatroloverdue centereventTEmergencyPatroloverdue)
     {
         List<CentereventTEmergencyPatroloverdue> list = centereventTEmergencyPatroloverdueService.selectCentereventTEmergencyPatroloverdueList(centereventTEmergencyPatroloverdue);
-        ExcelUtil<CentereventTEmergencyPatroloverdue> util = new ExcelUtil<CentereventTEmergencyPatroloverdue>(CentereventTEmergencyPatroloverdue.class);
+        ExcelUtil<CentereventTEmergencyPatroloverdue> util = new ExcelUtil<>(CentereventTEmergencyPatroloverdue.class);
         util.exportExcel(response, list, "巡更逾期数据");
     }
 

src/main/java/com/sooka/sponest/event/emergency/patrolrecord/controller/CentereventTEmergencyPatrolrecordController.java

@@ -7,11 +7,11 @@ import com.ruoyi.common.core.web.page.TableDataInfo;
 import com.ruoyi.common.log.annotation.Log;
 import com.ruoyi.common.log.enums.BusinessType;
 import com.ruoyi.common.security.annotation.RequiresPermissions;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
 import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
 import com.sooka.sponest.event.emergency.patrolrecord.mapper.CentereventTEmergencyPatrolrecordMapper;
 import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
 import com.sooka.sponest.event.utils.ExcelUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;

src/main/java/com/sooka/sponest/event/emergency/patrolrecord/service/impl/CentereventTEmergencyPatrolrecordServiceImpl.java

@@ -2,11 +2,11 @@ package com.sooka.sponest.event.emergency.patrolrecord.service.impl;
 
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.web.domain.AjaxResult;
-import com.sooka.sponest.event.remoteapi.RemoteDataService;
-import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
 import com.sooka.sponest.event.emergency.patrolrecord.domain.CentereventTEmergencyPatrolrecord;
 import com.sooka.sponest.event.emergency.patrolrecord.mapper.CentereventTEmergencyPatrolrecordMapper;
 import com.sooka.sponest.event.emergency.patrolrecord.service.ICentereventTEmergencyPatrolrecordService;
+import com.sooka.sponest.event.remoteapi.RemoteDataService;
+import com.sooka.sponest.event.remoteapi.domain.CenterdataTEmergencyPatrolpoint;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 

src/main/java/com/sooka/sponest/event/urge/domain/EventDown.java

@@ -1,8 +1,6 @@
 package com.sooka.sponest.event.urge.domain;
 
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
 import com.sooka.sponest.event.urge.service.EventDownService;
-import com.sooka.sponest.event.urge.service.EventUrgeService;
 import lombok.Data;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.stereotype.Component;
@@ -20,23 +18,25 @@ import java.util.Observable;
 @Data
 @Component
 public class EventDown extends ApplicationEvent {
+
     public EventDown() {
         super(new EventDownService() {
-
             @Override
             public void update(Observable o, Object arg) {
                 throw new UnsupportedOperationException();
             }
 
             @Override
-            public void toVoidDownLoad(Map<String,Object> map) {
+            public void toVoidDownLoad(Map<String, Object> map) {
                 throw new UnsupportedOperationException();
             }
         });
     }
+
     private EventDownService eventDownService;
-    private Map<String,Object> map =new HashMap();
-    public EventDown(EventDownService source, Map<String,Object> maps) {
+    private Map<String, Object> map = new HashMap();
+
+    public EventDown(EventDownService source, Map<String, Object> maps) {
         super(source);
         this.eventDownService = source;
         this.map = maps;

src/main/java/com/sooka/sponest/event/urge/domain/EventUrge.java

@@ -1,7 +1,7 @@
 package com.sooka.sponest.event.urge.domain;
 
-import com.sooka.sponest.event.urge.service.EventUrgeService;
 import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
+import com.sooka.sponest.event.urge.service.EventUrgeService;
 import lombok.Data;
 import org.springframework.context.ApplicationEvent;
 import org.springframework.stereotype.Component;

src/main/java/com/sooka/sponest/event/urge/listener/EventDownListener.java

@@ -1,9 +1,7 @@
 package com.sooka.sponest.event.urge.listener;
 
 import com.sooka.sponest.event.urge.domain.EventDown;
-import com.sooka.sponest.event.urge.domain.EventUrge;
 import com.sooka.sponest.event.urge.service.EventDownService;
-import com.sooka.sponest.event.urge.service.EventUrgeService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;

src/main/java/com/sooka/sponest/event/urge/service/EventDownService.java

@@ -10,5 +10,6 @@ import java.util.Observer;
  * @version: 1.0
  */
 public interface EventDownService extends Observer {
-    void toVoidDownLoad(Map<String,Object> maps);
+
+    void toVoidDownLoad(Map<String, Object> maps);
 }

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

@@ -14,7 +14,6 @@ import org.springframework.boot.ApplicationRunner;
 import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
 import java.util.Map;
 import java.util.Observable;
 
@@ -29,15 +28,17 @@ import java.util.Observable;
 public class EventDownServiceImpl implements EventDownService, ApplicationRunner {
 
     private final Logger logger = LoggerFactory.getLogger(EventDownServiceImpl.class);
+
     @Autowired
     private ICentereventTDownloadsService centereventTDownloadsService;
+
     @Override
     public void run(ApplicationArguments args) throws Exception {
 
     }
 
     @Override
-    public void toVoidDownLoad(Map<String,Object> maps) {
+    public void toVoidDownLoad(Map<String, Object> maps) {
         logger.info("===========================>");
         try {
             Thread.sleep(300000);
@@ -45,11 +46,11 @@ public class EventDownServiceImpl implements EventDownService, ApplicationRunner
             logger.info("Exception!", e);
         }
         //视频下载日志表 视频下载成功  定时任务结束回调，检验是否真的成功
-        CentereventTDownloads down= centereventTDownloadsService.validDownloadIsOne(MapUtils.getString(maps,"LogId"));
-        if(StringUtils.isNotEmpty(down.getAttachPath())){
+        CentereventTDownloads down = centereventTDownloadsService.validDownloadIsOne(MapUtils.getString(maps, "LogId"));
+        if (StringUtils.isNotEmpty(down.getAttachPath())) {
             down.setFlag("1");
             down.setPath(down.getAttachPath());
-        }else{
+        } else {
             down.setFlag("0");
             down.setReason("视频在下载过程中失败!");
         }

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

@@ -1,19 +1,10 @@
 package com.sooka.sponest.event.utils;
 
-import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.utils.DateUtils;
 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.redis.service.RedisService;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTDownloads;
-import com.sooka.sponest.event.centereventteventcatalogue.domain.CentereventTEventcatalogue;
-import com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTEventcatalogueMapper;
-import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTDownloadsService;
 import com.sooka.sponest.event.centereventteventcatalogue.service.ICentereventTEventcatalogueService;
-import com.sooka.sponest.event.centereventtfirelog.domain.CentereventTFireLog;
-import com.sooka.sponest.event.centereventtfirelog.service.ICentereventTFireLogService;
-import com.sooka.sponest.message.api.RemoteMonitorService;
 import org.apache.commons.lang3.time.FastDateFormat;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -21,13 +12,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableScheduling;
 import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
 
-import javax.annotation.Resource;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -61,8 +47,8 @@ public class ScheduleTaskUtil {
         String lock = redis.getCacheObject(DOWN_LOCK);
         if (StringUtils.isBlank(lock)) {
             redis.setCacheObject(DOWN_LOCK, VALUE_LOCK);
-            Map<String,Object> params=new HashMap<>();
-            params.put("taskValue","1");
+            Map<String, Object> params = new HashMap<>();
+            params.put("taskValue", "1");
             centereventTEventcatalogueService.downloadsCommon(params);
         }
         //redis.deleteObject(DOWN_LOCK);

src/main/resources/mapper/download/CentereventTDownloadsMapper.xml

@@ -1,47 +1,50 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <!DOCTYPE mapper
-PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
-"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+        PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
+        "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.sooka.sponest.event.centereventteventcatalogue.mapper.CentereventTDownloadsMapper">
-    
+
     <resultMap type="CentereventTDownloads" id="CentereventTDownloadsResult">
-        <result property="id"    column="id"    />
-        <result property="eventCode"    column="event_code"    />
-        <result property="eventName"    column="event_name"    />
-        <result property="path"    column="path"    />
-        <result property="flag"    column="flag"    />
-        <result property="reason"    column="reason"    />
-        <result property="createBy"    column="create_by"    />
-        <result property="createName"    column="create_name"    />
-        <result property="createTime"    column="create_time"    />
-        <result property="updateBy"    column="update_by"    />
-        <result property="updateName"    column="update_name"    />
-        <result property="updateTime"    column="update_time"    />
-        <result property="attachPath"    column="attachPath"    />
+        <result property="id" column="id"/>
+        <result property="eventCode" column="event_code"/>
+        <result property="eventName" column="event_name"/>
+        <result property="path" column="path"/>
+        <result property="flag" column="flag"/>
+        <result property="reason" column="reason"/>
+        <result property="createBy" column="create_by"/>
+        <result property="createName" column="create_name"/>
+        <result property="createTime" column="create_time"/>
+        <result property="updateBy" column="update_by"/>
+        <result property="updateName" column="update_name"/>
+        <result property="updateTime" column="update_time"/>
+        <result property="attachPath" column="attachPath"/>
     </resultMap>
 
     <sql id="selectCentereventTDownloadsVo">
         select id, event_code, event_name, path, flag, reason, create_by, create_name, create_time, update_by, update_name, update_time from centerevent_t_downloads
     </sql>
 
-    <select id="selectCentereventTDownloadsList" parameterType="CentereventTDownloads" resultMap="CentereventTDownloadsResult">
+    <select id="selectCentereventTDownloadsList" parameterType="CentereventTDownloads"
+            resultMap="CentereventTDownloadsResult">
         <include refid="selectCentereventTDownloadsVo"/>
-        <where>  
-            <if test="eventCode != null  and eventCode != ''"> and event_code = #{eventCode}</if>
-            <if test="eventName != null  and eventName != ''"> and event_name like concat('%', #{eventName}, '%')</if>
-            <if test="path != null  and path != ''"> and path = #{path}</if>
-            <if test="flag != null  and flag != ''"> and flag = #{flag}</if>
-            <if test="reason != null  and reason != ''"> and reason = #{reason}</if>
-            <if test="createName != null  and createName != ''"> and create_name like concat('%', #{createName}, '%')</if>
-            <if test="updateName != null  and updateName != ''"> and update_name like concat('%', #{updateName}, '%')</if>
+        <where>
+            <if test="eventCode != null  and eventCode != ''">and event_code = #{eventCode}</if>
+            <if test="eventName != null  and eventName != ''">and event_name like concat('%', #{eventName}, '%')</if>
+            <if test="path != null  and path != ''">and path = #{path}</if>
+            <if test="flag != null  and flag != ''">and flag = #{flag}</if>
+            <if test="reason != null  and reason != ''">and reason = #{reason}</if>
+            <if test="createName != null  and createName != ''">and create_name like concat('%', #{createName}, '%')
+            </if>
+            <if test="updateName != null  and updateName != ''">and update_name like concat('%', #{updateName}, '%')
+            </if>
         </where>
     </select>
-    
+
     <select id="selectCentereventTDownloadsById" parameterType="String" resultMap="CentereventTDownloadsResult">
         <include refid="selectCentereventTDownloadsVo"/>
         where id = #{id}
     </select>
-        
+
     <insert id="insertCentereventTDownloads" parameterType="CentereventTDownloads">
         insert into centerevent_t_downloads
         <trim prefix="(" suffix=")" suffixOverrides=",">
@@ -58,7 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateName != null">update_name,</if>
             <if test="updateTime != null">update_time,</if>
             <if test="logId != null">log_id,</if>
-         </trim>
+        </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="id != null">#{id},</if>
             <if test="eventCode != null">#{eventCode},</if>
@@ -73,7 +76,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="updateName != null">#{updateName},</if>
             <if test="updateTime != null">#{updateTime},</if>
             <if test="logId != null">#{logId},</if>
-         </trim>
+        </trim>
     </insert>
 
     <update id="updateCentereventTDownloads" parameterType="CentereventTDownloads">
@@ -94,18 +97,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where id = #{id}
     </update>
 
-    <delete id="deleteCentereventTDownloadsById" parameterType="String">
-        delete from centerevent_t_downloads where id = #{id}
-    </delete>
-
     <delete id="deleteCentereventTDownloadsByIds" parameterType="String">
-        delete from centerevent_t_downloads where id in 
+        delete from centerevent_t_downloads where id in
         <foreach item="id" collection="array" open="(" separator="," close=")">
             #{id}
         </foreach>
     </delete>
-    <select id="validDownloadIs"  resultMap="CentereventTDownloadsResult">
 
+    <select id="validDownloadIs" resultMap="CentereventTDownloadsResult">
         SELECT
             id,
             event_code,
@@ -118,14 +117,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             centerevent_t_downloads
             LEFT JOIN onest_data.centerdata_t_attach ch ON log_id = ch.bus_id
         WHERE
-            flag IS NULL
-                AND DATEDIFF( create_time, now( ) ) = 0
-
-
-
+            flag IS NULL AND DATEDIFF( create_time, now( ) ) = 0
     </select>
+
     <select id="validDownloadIsOne" parameterType="string" resultMap="CentereventTDownloadsResult">
-            SELECT
+        SELECT
             id,
             event_code,
             event_name,