优化人防代码

service-agbox/service-agbox-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/var/log/uskycloud/service-alarm" />
+    <property name="log.path" value="/var/log/uskycloud/service-agbox" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
     <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/controller/api/RemotecdiTaskApi.java

@@ -5,8 +5,6 @@ import com.usky.cdi.service.impl.IotDataTransferService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RestController;
 
-import java.time.LocalDateTime;
-
 /**
  * <p>
  *  数据统一查询 前端控制器

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/impl/IotDataTransferService.java

@@ -20,7 +20,10 @@ import java.time.Instant;
 import java.time.LocalDateTime;
 import java.time.ZoneId;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 /**
@@ -226,7 +229,7 @@ public class IotDataTransferService {
     }
 
     /**
-     * 发送人防用电负荷情况
+     * 发送人防用电负荷情况（704）
      *
      * @return 是否发送成功
      **/
@@ -378,17 +381,27 @@ public class IotDataTransferService {
 
     public void synchronizeDeviceData() {
         LambdaQueryWrapper<DmpDevice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DmpDevice::getTenantId, 1208);
+        queryWrapper.eq(DmpDevice::getTenantId, 1208)
+                .eq(DmpDevice::getDeleteFlag, 0);
         List<DmpDevice> deviceList = dmpDeviceMapper.selectList(queryWrapper);
         List<Integer> deviceTypeList = deviceList.stream().map(DmpDevice::getDeviceType).distinct().collect(Collectors.toList());
-
+        log.info("设备数据同步开始，涉及设备类型数：" + deviceTypeList.size() + "个，类型为：" + deviceTypeList);
+
+        Map<Integer, Consumer<JSONObject>> deviceTypeHandlerMap = new HashMap<>();
+        deviceTypeHandlerMap.put(701, this::sendEnvData);
+        deviceTypeHandlerMap.put(707, this::sendEnvData);
+        deviceTypeHandlerMap.put(708, this::sendEnvData);
+        deviceTypeHandlerMap.put(709, this::sendEnvData);
+        deviceTypeHandlerMap.put(710, this::sendEnvData);
+        deviceTypeHandlerMap.put(711, this::sendEnvData);
+        deviceTypeHandlerMap.put(702, this::sendWaterLeak);
+        deviceTypeHandlerMap.put(703, this::sendPersonPresence);
+        deviceTypeHandlerMap.put(704, this::sendElectricityLoad);
         for (Integer deviceType : deviceTypeList) {
             JSONObject json = new JSONObject();
             json.put("deviceType", deviceType);
-            this.sendWaterLeak(json);
-            this.sendEnvData(json);
-            this.sendPersonPresence(json);
-            this.sendElectricityLoad(json);
+            deviceTypeHandlerMap.get(deviceType).accept(json);
         }
+        log.info("设备数据同步完成，涉及设备类型数：" + deviceTypeList.size() + "个");
     }
 }

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/util/DeviceDataQuery.java

@@ -81,8 +81,10 @@ public class DeviceDataQuery {
     private List<DmpDevice> getDeviceUuids(Integer deviceType, List<String> deviceUuid) {
         LambdaQueryWrapper<DmpDevice> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(DmpDevice::getTenantId, 1208)
+                .eq(DmpDevice::getDeleteFlag, 0)
                 .eq(deviceType != null, DmpDevice::getDeviceType, deviceType)
-                .in(deviceUuid != null && !deviceUuid.isEmpty(), DmpDevice::getDeviceUuid, deviceUuid);
+                .in(deviceUuid != null && !deviceUuid.isEmpty(), DmpDevice::getDeviceUuid, deviceUuid)
+                .orderByAsc(DmpDevice::getId);
         return dmpDeviceMapper.selectList(queryWrapper);
     }
 

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/util/DeviceDataSyncService.java

@@ -3,15 +3,12 @@ package com.usky.cdi.service.util;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.usky.cdi.domain.DmpDevice;
 import com.usky.cdi.mapper.DmpDeviceMapper;
-import com.usky.cdi.service.config.mqtt.MqttGateway;
 import com.usky.cdi.service.impl.IotDataTransferService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.ApplicationRunner;
 import org.springframework.scheduling.annotation.Scheduled;
 import org.springframework.stereotype.Component;
 
-import javax.annotation.PostConstruct;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -46,31 +43,10 @@ public class DeviceDataSyncService {
     // @Scheduled(cron = "*/30 * * * * ?")
     public void scheduledDeviceDataSync() {
         try {
-            this.synchronizeDeviceData();
+            iotDataTransferService.synchronizeDeviceData();
         } catch (Exception e) {
             log.error("定时任务执行设备数据同步失败", e);
             System.err.println("定时任务执行设备数据同步失败：" + e.getMessage());
         }
     }
-
-    /**
-     * 核心：设备数据同步逻辑（原有方法）
-     */
-    public void synchronizeDeviceData() {
-        LambdaQueryWrapper<DmpDevice> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(DmpDevice::getTenantId, 1208);
-        List<DmpDevice> deviceList = dmpDeviceMapper.selectList(queryWrapper);
-        List<Integer> deviceTypeList = deviceList.stream()
-                .map(DmpDevice::getDeviceType)
-                .distinct()
-                .collect(Collectors.toList());
-
-        for (Integer deviceType : deviceTypeList) {
-            com.alibaba.fastjson.JSONObject json = new com.alibaba.fastjson.JSONObject();
-            json.put("deviceType", deviceType);
-            iotDataTransferService.synchronizeDeviceData();
-        }
-        System.out.println("设备数据同步完成，涉及设备类型数：" + deviceTypeList.size());
-    }
-
 }

service-cdi/service-cdi-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/var/log/uskycloud/service-offline" />
+    <property name="log.path" value="/var/log/uskycloud/service-cdi" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
     <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->

service-eg/service-eg-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/data-transfer" />
+	<property name="log.path" value="/var/log/uskycloud/data-eg" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 

service-issue/service-issue-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-    <property name="log.path" value="/var/log/uskycloud/service-offline" />
+    <property name="log.path" value="/var/log/uskycloud/service-issue" />
     <!-- 日志输出格式 -->
     <property name="log.pattern" value="%d{MM-dd HH:mm:ss.SSS} [%thread] %-5level %logger{26}:%line: %msg%n" />
     <!--    	<property name="log.pattern" value="%gray(%d{MM-dd HH:mm:ss.SSS}) %highlight(%-5level) &#45;&#45; [%gray(%thread)] %cyan(%logger{26}:%line): %msg%n" />-->

service-job/src/main/java/com/ruoyi/job/RuoYiJobApplication.java

@@ -25,7 +25,7 @@ import java.net.UnknownHostException;
 @EnableCustomSwagger2
 @EnableFeignClients(basePackages = {"com.usky"})
 @MapperScan(value = "com.ruoyi.job.mapper")
-@ComponentScan(basePackages = {"com.usky","com.ruoyi"})
+@ComponentScan(basePackages = {"com.ruoyi"})
 @SpringBootApplication
 public class RuoYiJobApplication
 {

service-job/src/main/java/com/ruoyi/job/task/RyTask.java

@@ -7,6 +7,7 @@ import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.iot.RemotePmService;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Component;
 
 /**
@@ -28,6 +29,7 @@ public class RyTask {
     @Autowired
     private RemoteMeetingService remoteMeetingService;
 
+    @Qualifier("com.usky.cdi.RemotecdiTaskService")
     @Autowired
     private RemotecdiTaskService remoteCdiTaskService;
 

service-meeting/service-meeting-biz/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration scan="true" scanPeriod="60 seconds" debug="false">
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/var/log/uskycloud/usky-demo" />
+	<property name="log.path" value="/var/log/uskycloud/usky-meeting" />
    <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />