优化

pom.xml

@@ -91,11 +91,7 @@
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-starter-stream-rabbit</artifactId>
         </dependency>
-        <dependency>
-            <groupId>com.ruoyi</groupId>
-            <artifactId>sooka-sponest-api-monitor</artifactId>
-            <version>3.4.0</version>
-        </dependency>
+
     </dependencies>
 
     <build>

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

@@ -1,71 +0,0 @@
-package com.sooka.sponest.data.utils;
-
-/**
- * 事件中心常量池
- */
-public class EventConstants {
-
-    private EventConstants() {
-        throw new IllegalStateException("Utility class");
-    }
-
-    // 事件状态
-    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";// 确认
-
-    // 事件来源
-    public static final String REPORTING_SOURCE_1 = "reporting_source_1";// AI
-    public static final String REPORTING_SOURCE_4 = "reporting_source_4";// 传感器
-
-    // 是否催办
-    public static final String SYS_ISURGE_2 = "sys_isurge_2";// 否
-
-    // 部门类型
-    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反馈
-
-    // 附件索引
-    public static final String BUS_INDEX_1 = "bus_indx_forest";// 火情事件
-    public static final String BUS_INDEX_2 = "bus_indx_other";// 其他事件
-    public static final String BUS_INDEX_3 = "bus_indx_sensor";// 传感器事件
-
-    // 文件类型
-    public static final String FILE_TYPE_1 = "image";
-
-    // 文件前缀
-    public static final String FILE_PREFIX_LOCAL = "fileUrl";
-    public static final String FILE_PREFIX_APP = "appUrl";
-    public static final String FILE_PREFIX_HIK1 = "HIK_1";
-    public static final String FILE_PREFIX_HIK2 = "HIK_2";
-    public static final String FILE_PREFIX_DH1 = "DH_1";
-    public static final String FILE_PREFIX_DH2 = "DH_2";
-    public static final String FILE_DOWNLOAD = "downloadUrl";
-
-    // 部门id
-    public static final String SI_PING = "365";// 365_四平市
-    public static final String SI_PING_NAME = SI_PING + "_四平市";
-    public static final String SHUANG_LIAO = "369";// 369_双辽市
-    public static final String SHUANG_LIAO_NAME = SHUANG_LIAO + "_双辽市";
-    public static final String YI_TONG = "370";// 370_伊通县
-    public static final String YI_TONG_NAME = YI_TONG + "_伊通县";
-    public static final String LI_SHU = "371";// 371_梨树县
-    public static final String LI_SHU_NAME = LI_SHU + "_梨树县";
-    public static final String TIE_DONG = "372";// 372_铁东区
-    public static final String TIE_DONG_NAME = TIE_DONG + "_铁东区";
-    public static final String TIE_XI = "373";// 373_铁西区
-    public static final String TIE_XI_NAME = TIE_XI + "_铁西区";
-
-    // redis
-    public static final String SOCKET_PUSH_TOPIC = "socketpushTopic";// 可视化socket推送监听主题
-    public static final String EVENT_URGE_PREFIX = "event:urge:";// 事件催办的key前缀
-}

src/main/java/com/sooka/sponest/data/utils/RemoteApiUtil.java

@@ -1,47 +0,0 @@
-package com.sooka.sponest.data.utils;
-
-import com.ruoyi.common.core.utils.SpringUtils;
-
-import com.sooka.sponest.monitor.api.RemoteMonitorService;
-
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-
-/**
- * @Auther: mjq
- * @Date: 2023/6/29 - 06 - 29 - 8:54
- * @Description: 发送短信和推送工具类
- * @version: 1.0
- */
-@Component
-public class RemoteApiUtil {
-
-    private final Logger logger = LoggerFactory.getLogger(this.getClass());
-
-    private static RemoteApiUtil instance;
-
-    public static RemoteApiUtil getInstance() {
-        if (instance == null) {
-            instance = SpringUtils.getBean(RemoteApiUtil.class);
-        }
-        return instance;
-    }
-    @Value("${sooka.dahuafile:}")
-    private Boolean dahuaFile;
-
-    /**
-     * 获取大华token
-     *
-     * @return
-     */
-    public String getToken() {
-        if (dahuaFile) {
-            return SpringUtils.getBean(RemoteMonitorService.class).getToken();
-        }
-        return "";
-    }
-
-}

src/main/java/com/sooka/sponest/data/utils/ScheduleAtachUtil.java

@@ -1,6 +1,5 @@
 package com.sooka.sponest.data.utils;
 
-import com.alibaba.fastjson.JSON;
 import com.ruoyi.common.core.utils.DateUtils;
 import com.ruoyi.common.core.utils.SpringUtils;
 import com.ruoyi.common.core.utils.file.FilePrefixUtils;
@@ -8,8 +7,6 @@ import com.ruoyi.common.redis.service.RedisService;
 import com.ruoyi.system.api.RemoteConfigService;
 import com.ruoyi.system.api.RemoteFileService;
 import com.ruoyi.system.api.domain.SysFile;
-import com.sooka.sponest.data.system.attach.domain.CenterdataTAttach;
-import com.sooka.sponest.data.system.attach.mapper.CenterdataTAttachMapper;
 import com.sooka.sponest.data.system.attach.service.ICenterdataTAttachService;
 import org.apache.commons.collections4.MapUtils;
 import org.apache.commons.fileupload.FileItem;
@@ -21,8 +18,6 @@ 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 org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.multipart.commons.CommonsMultipartFile;
 
@@ -39,6 +34,7 @@ import java.util.Map;
 //@RestController
 //@RequestMapping("/testattach")
 public class ScheduleAtachUtil {
+
     private final Logger logger = LoggerFactory.getLogger(this.getClass());
 
     @Autowired
@@ -46,40 +42,47 @@ public class ScheduleAtachUtil {
     @Resource
     private RedisService redisService;
 
-
+    // 文件前缀
+    public static final String FILE_PREFIX_LOCAL = "fileUrl";
+    public static final String FILE_PREFIX_APP = "appUrl";
+    public static final String FILE_PREFIX_HIK1 = "HIK_1";
+    public static final String FILE_PREFIX_HIK2 = "HIK_2";
+    public static final String FILE_PREFIX_DH1 = "DH_1";
+    public static final String FILE_PREFIX_DH2 = "DH_2";
+    public static final String FILE_DOWNLOAD = "downloadUrl";
 
     @GetMapping("/attach")
     public void runAtach() throws Exception {
         logger.info("执行定时任务大华图片本地上传开始=>{}", DateUtils.dateTimeNow());
-        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(EventConstants.FILE_PREFIX_LOCAL, EventConstants.FILE_PREFIX_HIK1, EventConstants.FILE_PREFIX_HIK2, EventConstants.FILE_PREFIX_DH1, EventConstants.FILE_PREFIX_DH2)).getData();
+        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
         //paramMap.put("token",  redisService.getCacheObject("DH_TOKEN"));// 大华token
         List<Map<String, Object>> list = centerdataTAttachService.selectFailUpattah();
         int i = 0;
         for (Map map : list) {
             paramMap.put("czlx", "AI");
             paramMap.put("busId", MapUtils.getString(map, "busId"));
-            logger.info("event_name-------------->"+MapUtils.getString(map, "event_name"));
-            logger.info("create_time-------------->"+MapUtils.getString(map, "create_time"));
+            logger.info("event_name-------------->" + MapUtils.getString(map, "event_name"));
+            logger.info("create_time-------------->" + MapUtils.getString(map, "create_time"));
             logger.info("==================>大华图片远程接口之前" + MapUtils.getString(map, "busId") + "当前序号" + i);
             centerdataTAttachService.updateEventAttach(paramMap);
             logger.info("延时1分钟");
             i++;
-
         }
         logger.info("执行定时任务大华图片本地上传结束=====>{}", DateUtils.dateTimeNow());
     }
+
     //每周的周日晚上8点开始运行
     @Scheduled(cron = "* * 20 ? * 1")
     @GetMapping("/urlToMultipartFile")
-    public void urlToMultipartFile() throws Exception{
+    public void urlToMultipartFile() throws Exception {
         logger.info("执行定时任务大华图片本地上传开始=>{}", DateUtils.dateTimeNow());
-        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(EventConstants.FILE_PREFIX_LOCAL, EventConstants.FILE_PREFIX_HIK1, EventConstants.FILE_PREFIX_HIK2, EventConstants.FILE_PREFIX_DH1, EventConstants.FILE_PREFIX_DH2)).getData();
+        Map<String, String> paramMap = SpringUtils.getBean(RemoteConfigService.class).remotegetConfigMap(Arrays.asList(FILE_PREFIX_LOCAL, FILE_PREFIX_HIK1, FILE_PREFIX_HIK2, FILE_PREFIX_DH1, FILE_PREFIX_DH2)).getData();
         List<Map<String, Object>> attaches = centerdataTAttachService.selectFailUpattah();
         logger.info("此次需要更新的图片的总数==================>" + attaches.size());
         int i = 0;
         for (Map<String, Object> item : attaches) {
-            logger.info("event_name-------------->"+MapUtils.getString(item, "event_name"));
-            logger.info("create_time-------------->"+MapUtils.getString(item, "create_time"));
+            logger.info("event_name-------------->" + MapUtils.getString(item, "event_name"));
+            logger.info("create_time-------------->" + MapUtils.getString(item, "create_time"));
             logger.info("busId==================>" + MapUtils.getString(item, "busId") + "当前序号" + i);
             paramMap.put("token", redisService.getCacheObject("DH_TOKEN"));// 大华token
             File file = null;
@@ -127,9 +130,8 @@ public class ScheduleAtachUtil {
                 centerdataTAttachService.updateEventAttachSchedule(item, sysFile);
             }
         }
-
-
     }
+
     public static File inputStreamToFile(InputStream ins, String name) {
         File file = new File(System.getProperty("java.io.tmpdir") + File.separator + name);
         int len = 8192;
@@ -153,6 +155,7 @@ public class ScheduleAtachUtil {
         }
         return file;
     }
+
     public static MultipartFile fileToMultipartFile(File file) {
         DiskFileItemFactory diskFileItemFactory = new DiskFileItemFactory(16, null);
         FileItem item = diskFileItemFactory.createItem(file.getName(), "text/plain", true, file.getName());
@@ -179,5 +182,4 @@ public class ScheduleAtachUtil {
         }
         return new CommonsMultipartFile(item);
     }
-
 }