Merge branch 'server-165' of http://47.111.81.118:3000/uskycloud/usky-modules into server-165

pom.xml

@@ -97,9 +97,14 @@
 
     <module>service-ids</module>
 
-
     <module>service-cdi</module>
 
+    <module>service-ems</module>
+
+    <module>service-transfer</module>
+
+    <module>service-tsdb</module>
+
   </modules>
           
   

service-cdi/service-cdi-api/src/main/java/com/usky/cdi/AlarmDataSyncTaskService.java

@@ -2,6 +2,8 @@ package com.usky.cdi;
 
 import com.usky.cdi.factory.AlarmDataSyncTaskFactory;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 
 /**
  *
@@ -11,5 +13,19 @@ import org.springframework.cloud.openfeign.FeignClient;
  */
 @FeignClient(contextId = "AlarmDataSyncTaskService", value = "service-cdi", fallbackFactory = AlarmDataSyncTaskFactory.class)
 public interface AlarmDataSyncTaskService {
-    void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status);
+    /**
+     * 同步告警数据
+     *
+     * @param tenantId      租户ID
+     * @param engineeringId 工程ID
+     * @param username      mqtt用户名
+     * @param password      mqtt密码
+     * @param status        peacetime:平时 wartime:战时
+     */
+    @GetMapping("/synchronizeAlarmData")
+    void synchronizeAlarmData(@RequestParam(value = "tenantId") Integer tenantId,
+                              @RequestParam(value = "engineeringId") Long engineeringId,
+                              @RequestParam(value = "username") String username,
+                              @RequestParam(value = "password") String password,
+                              @RequestParam(value = "status") String status);
 }

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

@@ -25,7 +25,7 @@ public class AlarmDataSyncTaskApi implements AlarmDataSyncTaskService {
      * engineeringId: 工程ID
      * username: mqtt用户名
      * password: mqtt密码
-     * status: 状态 0:平时 1:战时
+     * status: peacetime:平时 wartime:战时
      */
     @Override
     public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {

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

@@ -25,6 +25,7 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Objects;
+import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 /**
@@ -48,6 +49,8 @@ public class AlarmDataSyncService {
     private static final String WARTIME = "wartime";
     private static final String MQTT_TOPIC = "alarm/message";
     private static final String ALARM_DELIVERY_KEY_PREFIX = "alarm:delivery:";
+    private static final String ALARM_LOCK_KEY_PREFIX = "alarm:lock:";
+    private static final long LOCK_EXPIRE_TIME = 1 * 60 * 1000; // 锁过期时间1分钟
     private final MqttConnectionTool mqttConnectionTool;
 
     @Autowired
@@ -80,36 +83,69 @@ public class AlarmDataSyncService {
         return idGenerator.nextPacketId();
     }
 
+    /**
+     * 尝试获取分布式锁
+     * 使用Redis的setIfAbsent原子操作，确保线程安全
+     *
+     * @param lockKey 锁的Key
+     * @return 是否获取到锁
+     */
+    private boolean tryLock(String lockKey) {
+        // 使用setIfAbsent原子操作设置锁，同时设置过期时间，避免死锁
+        Boolean result = stringRedisTemplate.opsForValue().setIfAbsent(lockKey, "1", LOCK_EXPIRE_TIME, TimeUnit.MILLISECONDS);
+        return Boolean.TRUE.equals(result);
+    }
+
+    /**
+     * 释放分布式锁
+     *
+     * @param lockKey 锁的Key
+     */
+    private void releaseLock(String lockKey) {
+        // 直接删除锁Key
+        stringRedisTemplate.delete(lockKey);
+    }
+
     @Async
     public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {
-        log.info("租户：{}的人防告警数据推送定时任务开始执行，平战时状态：{}", tenantId, PEACETIME.equals(status) ? "平时" : "战时");
-
+        // 生成锁key，基于租户ID，确保同一租户同一时间只能执行一个任务
+        String lockKey = ALARM_LOCK_KEY_PREFIX + tenantId;
+        
+        // 尝试获取锁
+        if (!tryLock(lockKey)) {
+            log.info("租户：{}的告警数据推送任务正在执行中，本次请求跳过", tenantId);
+            return;
+        }
+        
         Long startTime = System.currentTimeMillis();
-        log.info("开始时间:{}", getCurrentTime());
+        
+        try {
+            log.info("租户：{}的人防告警数据推送定时任务开始执行，平战时状态：{}", tenantId, PEACETIME.equals(status) ? "平时" : "战时");
 
-        // 1.查询 base_alarm 表中的告警数据，筛选条件为 tenant_id = tenantId
-        LambdaQueryWrapper<BaseAlarm> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(BaseAlarm::getTenantId, tenantId)
-                .eq(BaseAlarm::getAlarmGrade, 1);
-        List<BaseAlarm> alarmList = baseAlarmMapper.selectList(queryWrapper);
+            log.info("开始时间:{}", getCurrentTime());
 
-        if (alarmList.isEmpty()) {
-            log.warn("租户{}没有新的告警数据，任务结束", tenantId);
-            return;
-        }
-        log.info("查询到租户{}的告警数据总数：{}", tenantId, alarmList.size());
+            // 1.查询 base_alarm 表中的告警数据，筛选条件为 tenant_id = tenantId
+            LambdaQueryWrapper<BaseAlarm> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.eq(BaseAlarm::getTenantId, tenantId)
+                    .eq(BaseAlarm::getAlarmGrade, 1);
+            List<BaseAlarm> alarmList = baseAlarmMapper.selectList(queryWrapper);
+
+            if (alarmList.isEmpty()) {
+                log.warn("租户{}没有新的告警数据，任务结束", tenantId);
+                return;
+            }
+            log.info("查询到租户{}的告警数据总数：{}", tenantId, alarmList.size());
 
-        // 批量查询建筑设施数据，构建设备ID到设施的映射
-        Map<String, BaseBuildFacility> facilityMap = buildFacilityMap(alarmList, tenantId);
+            // 批量查询建筑设施数据，构建设备ID到设施的映射
+            Map<String, BaseBuildFacility> facilityMap = buildFacilityMap(alarmList, tenantId);
 
-        // 记录每一条告警数据
-        for (BaseAlarm alarm : alarmList) {
-            log.info("告警数据：ID={}, 设备ID={}, 告警类型={}, 告警时间={}, 处理状态={}, 是否误报={}",
-                    alarm.getId(), alarm.getDeviceId(), alarm.getAlarmType(),
-                    alarm.getAlarmTime(), alarm.getHandleStatus(), alarm.getAlarmFalse());
-        }
+            // 记录每一条告警数据
+            for (BaseAlarm alarm : alarmList) {
+                log.info("告警数据：ID={}, 设备ID={}, 告警类型={}, 告警时间={}, 处理状态={}, 是否误报={}",
+                        alarm.getId(), alarm.getDeviceId(), alarm.getAlarmType(),
+                        alarm.getAlarmTime(), alarm.getHandleStatus(), alarm.getAlarmFalse());
+            }
 
-        try {
             // 2.创建MQTT连接
             mqttConnectionTool.connectOrRefresh(username, password);
 
@@ -194,6 +230,9 @@ public class AlarmDataSyncService {
         } catch (Exception e) {
             log.error("租户{}的告警数据推送定时任务执行失败：{}", tenantId, e.getMessage(), e);
         } finally {
+            // 释放锁
+            releaseLock(lockKey);
+            
             Long endTime = System.currentTimeMillis();
             log.info("结束时间:{}, 耗时:{}ms", getCurrentTime(), endTime - startTime);
         }

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

@@ -15,18 +15,10 @@ import com.usky.cdi.service.util.SnowflakeIdGenerator;
 import com.usky.cdi.service.vo.IotDataTransferVO;
 import com.usky.cdi.service.vo.base.*;
 import lombok.extern.slf4j.Slf4j;
-import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
-import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.context.ApplicationContext;
-import org.springframework.context.ConfigurableApplicationContext;
-import org.springframework.context.support.GenericApplicationContext;
-import org.springframework.integration.dsl.IntegrationFlow;
-import org.springframework.integration.dsl.IntegrationFlows;
 import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
-import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
-import org.springframework.messaging.MessageChannel;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.PostConstruct;

service-eg/service-eg-biz/pom.xml

@@ -49,7 +49,7 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>

service-ems/README.md

@@ -0,0 +1,122 @@
+# 能耗数据上传服务
+
+## 功能说明
+
+本服务用于实现能耗数据上传功能，通过TCP协议与能耗监管系统进行通信，按照XML数据通讯协议规范进行数据传输。
+
+## 主要功能
+
+1. **TCP连接管理**：建立和维护与能耗监管系统的TCP连接
+2. **身份认证**：使用MD5算法进行身份验证
+3. **数据加密**：使用AES加密算法对能耗数据进行加密传输
+4. **定时推送**：每10分钟自动生成并推送能耗数据XML报文
+5. **心跳机制**：定期发送心跳包保持连接
+
+## 配置说明
+
+### 应用配置（application-dev.yml）
+
+在Nacos配置中心或本地配置文件中添加以下配置：
+
+```yaml
+# 能耗服务配置
+energy:
+  # 服务端配置
+  server:
+    host: 183.192.66.5
+    port: 9006
+  # 认证配置
+  auth:
+    key: 529f3d2bf15d4d5d  # 128bit密钥
+  # 建筑信息
+  building:
+    id: PT310107BZ4054
+  # 网关配置（多个网关用逗号分隔）
+  gateway:
+    ids: gateway1,gateway2
+  # 定时任务配置
+  push:
+    cron: "0 */10 * * * ?"  # 每10分钟执行一次
+  # TDengine配置
+  tdengine:
+    enabled: true
+    url: jdbc:TAOS://localhost:6030/
+    user: root
+    password: taosdata
+    super-table: super_715_332
+```
+
+### 数据库配置
+
+服务需要访问MySQL数据库查询设备信息，配置在Nacos配置中心的共享配置中。
+
+## 使用说明
+
+### 1. 网关配置
+
+在配置文件中设置要推送数据的网关ID列表，多个网关用逗号分隔：
+
+```yaml
+energy:
+  gateway:
+    ids: gateway1,gateway2
+```
+
+### 2. 启动服务
+
+启动服务后，定时任务会自动执行，每10分钟为每个配置的网关生成并推送XML报文。
+
+### 3. 手动推送
+
+也可以通过API接口手动触发推送：
+
+```java
+@Autowired
+private EnergyDataService energyDataService;
+
+// 推送指定网关的数据
+energyDataService.generateAndPushEnergyData("gatewayId");
+```
+
+## 数据流程
+
+1. 根据网关ID查询网关设备信息（`dmp_device`表，`category_type=2`）
+2. 根据网关UUID查询所有子设备（`dmp_device`表，`gateway_uuid`匹配，`category_type=3`）
+3. 从TDengine时序数据库查询每个设备的最新数据（`super_715_332`超级表）
+4. 构建XML报文（包含分项数据和仪表数据）
+5. 建立TCP连接并进行身份认证
+6. 使用AES加密XML数据
+7. 发送加密后的数据包
+8. 接收服务端响应
+
+## 协议说明
+
+### 网络层数据包格式
+
+- Head: 2字节，固定值0x1F1F
+- Type: 1字节，消息类型（0x01=身份认证，0x02=心跳，0x03=能耗数据）
+- Length: 4字节，Data长度（网络字节序）
+- Data: 变长，XML数据（UTF-8编码，能耗数据需AES加密）
+
+### 身份认证流程
+
+1. 客户端发送身份认证请求
+2. 服务端返回随机序列
+3. 客户端计算MD5（密钥+随机序列）并发送
+4. 服务端验证MD5并返回认证结果
+
+### 数据加密
+
+- 算法：AES
+- 模式：CBC
+- 填充：PKCS7/PKCS5
+- 密钥：128bit，与认证密钥相同
+- 向量：与密钥相同
+
+## 注意事项
+
+1. 确保TDengine数据源配置正确
+2. 确保网关ID在数据库中存在且为网关设备（`category_type=2`）
+3. 确保网关下有电表子设备（`category_type=3`）
+4. 确保TDengine超级表中存在对应设备的数据
+5. 网络连接异常时会自动重连

service-ems/pom.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>usky-modules</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-ems</artifactId>
+
+    <packaging>pom</packaging>
+    <version>0.0.1</version>
+
+    <modules>
+        <module>service-ems-biz</module>
+        <module>service-ems-api</module>
+    </modules>
+</project>

service-ems/service-ems-api/pom.xml

@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-ems</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-ems-api</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

service-ems/service-ems-api/src/main/java/com/usky/ems/RemoteEmsTaskService.java

@@ -0,0 +1,17 @@
+package com.usky.ems;
+
+
+import com.usky.ems.factory.RemoteEmsTaskFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+
+@FeignClient(contextId = "remoteEmsTaskService", value = "service-ems" , fallbackFactory = RemoteEmsTaskFactory.class)
+public interface RemoteEmsTaskService {
+
+    @GetMapping("/sendEnergyData")
+    void sendEnergyData();
+
+    @GetMapping("/sendEnergyHeartbeat")
+    void sendEnergyHeartbeat();
+}

service-ems/service-ems-api/src/main/java/com/usky/ems/factory/RemoteEmsTaskFactory.java

@@ -0,0 +1,39 @@
+package com.usky.ems.factory;
+
+import com.usky.common.core.exception.FeignBadRequestException;
+import com.usky.ems.RemoteEmsTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteEmsTaskFactory implements FallbackFactory<RemoteEmsTaskService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteEmsTaskFactory.class);
+
+    @Override
+    public RemoteEmsTaskService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteEmsTaskService()
+        {
+            @Override
+            public void sendEnergyData() {
+                throw new FeignBadRequestException(500,"定时推送能耗数据到能耗平台"+throwable.getMessage());
+            }
+
+            @Override
+            public void sendEnergyHeartbeat() {
+                throw new FeignBadRequestException(500,"定时推送能耗心跳到能耗平台"+throwable.getMessage());
+            }
+
+        };
+    }
+}

service-ems/service-ems-biz/pom.xml

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-ems</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-ems-biz</artifactId>
+    <dependencies>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>common-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-ems-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-iot-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-tsdb-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-core</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-mybatis</artifactId>
+        </dependency>
+
+        <!-- XML处理 -->
+        <dependency>
+            <groupId>org.dom4j</groupId>
+            <artifactId>dom4j</artifactId>
+            <version>2.1.3</version>
+        </dependency>
+
+        <!-- AES加密 -->
+        <dependency>
+            <groupId>org.bouncycastle</groupId>
+            <artifactId>bcprov-jdk15on</artifactId>
+            <version>1.70</version>
+        </dependency>
+        <!-- Hutool 加密解密工具类（5.8.41 版本） -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-crypto</artifactId>
+            <version>5.8.41</version>
+        </dependency>
+
+        <!-- TDengine JDBC -->
+        <dependency>
+            <groupId>com.taosdata.jdbc</groupId>
+            <artifactId>taos-jdbcdriver</artifactId>
+            <version>3.6.3</version>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

service-ems/service-ems-biz/src/main/java/com/usky/ems/EnergyApplication.java

@@ -0,0 +1,46 @@
+package com.usky.ems;
+
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+import org.springframework.scheduling.annotation.EnableScheduling;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * 能耗数据上传服务
+ *
+ * @author system
+ */
+@EnableCustomSwagger2
+@EnableFeignClients(basePackages = "com.usky")
+@MapperScan(value = "com.usky.ems.mapper")
+@ComponentScan("com.usky")
+@SpringBootApplication
+@EnableScheduling
+public class EnergyApplication {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(EnergyApplication.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(EnergyApplication.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null == path ? "" : path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null == path ? "" : path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null == path ? "" : path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/MybatisGenerator.java

@@ -0,0 +1,107 @@
+package com.usky.ems;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ */
+public class MybatisGenerator {
+    public static void main(String[] args) {
+
+            shell("service-ems","service-ems-biz");
+    }
+
+    private static void shell(String parentName,String model) {
+
+        AutoGenerator mpg = new AutoGenerator();
+        //1、全局配置
+        GlobalConfig gc = new GlobalConfig();
+//        File file = new File(model);
+//        String path = file.getAbsolutePath();
+        String projectPath = System.getProperty("user.dir");
+        projectPath+="/"+parentName;
+        projectPath+="/"+model;
+        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
+        //修改为自己的名字
+        gc.setAuthor("ya"); //设置作者
+        gc.setOpen(false);
+        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
+        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
+        gc.setBaseResultMap(true); //生成resultMap
+        mpg.setGlobalConfig(gc);
+
+        //2、数据源配置
+        //修改数据源
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("yt123456");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.ems");
+        pc.setController("controller.web");
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+//        pc.setXml("mapper.demo");
+        //pc.setModuleName("test");
+        mpg.setPackageInfo(pc);
+
+        // 4、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperMapperClass("com.usky.common.mybatis.core.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mybatis.core.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mybatis.core.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude("ems_cons_platform_config");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        mpg.setStrategy(strategy);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+        //修改对应的模块名称
+        TemplateConfig tc = new TemplateConfig();
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        //如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        String finalProjectPath = projectPath;
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return finalProjectPath + "/src/main/resources/mapper/ems" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/config/TdengineConfig.java

@@ -0,0 +1,110 @@
+//package com.usky.energy.config;
+//
+//import com.taosdata.jdbc.TSDBDriver;
+//import org.slf4j.Logger;
+//import org.slf4j.LoggerFactory;
+//import org.springframework.beans.factory.annotation.Value;
+//import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+//import org.springframework.context.annotation.Bean;
+//import org.springframework.context.annotation.Configuration;
+//
+//import javax.sql.DataSource;
+//import java.sql.Connection;
+//import java.sql.DriverManager;
+//import java.sql.SQLException;
+//import java.util.Properties;
+//
+///**
+// * TDengine数据源配置
+// *
+// * @author system
+// * @since 2024-01-01
+// */
+//@Configuration
+//@ConditionalOnProperty(prefix = "energy.tdengine", name = "enabled", havingValue = "true", matchIfMissing = false)
+//public class TdengineConfig {
+//
+//    private static final Logger logger = LoggerFactory.getLogger(TdengineConfig.class);
+//
+//    @Value("${energy.tdengine.url: jdbc:TAOS-RS://47.110.48.75:6041/}")
+//    private String url;
+//
+//    @Value("${energy.tdengine.user:root}")
+//    private String user;
+//
+//    @Value("${energy.tdengine.password:taosdata}")
+//    private String password;
+//
+//    @Bean(name = "tdengineDataSource")
+//    public DataSource tdengineDataSource() {
+//        return new TdengineDataSource(url, user, password);
+//    }
+//
+//    /**
+//     * 简单的TDengine数据源实现
+//     */
+//    private static class TdengineDataSource implements DataSource {
+//        private final String url;
+//        private final String user;
+//        private final String password;
+//
+//        public TdengineDataSource(String url, String user, String password) {
+//            this.url = url;
+//            this.user = user;
+//            this.password = password;
+//        }
+//
+//        @Override
+//        public Connection getConnection() throws SQLException {
+//            try {
+//                Class.forName("com.taosdata.jdbc.TSDBDriver");
+//            } catch (ClassNotFoundException e) {
+//                throw new SQLException("TDengine驱动未找到", e);
+//            }
+//
+//            Properties props = new Properties();
+//            props.setProperty("user", user);
+//            props.setProperty("password", password);
+//
+//            return DriverManager.getConnection(url, props);
+//        }
+//
+//        @Override
+//        public Connection getConnection(String username, String password) throws SQLException {
+//            return getConnection();
+//        }
+//
+//        @Override
+//        public <T> T unwrap(Class<T> iface) throws SQLException {
+//            throw new SQLException("不支持的操作");
+//        }
+//
+//        @Override
+//        public boolean isWrapperFor(Class<?> iface) throws SQLException {
+//            return false;
+//        }
+//
+//        @Override
+//        public java.io.PrintWriter getLogWriter() throws SQLException {
+//            return null;
+//        }
+//
+//        @Override
+//        public void setLogWriter(java.io.PrintWriter out) throws SQLException {
+//        }
+//
+//        @Override
+//        public void setLoginTimeout(int seconds) throws SQLException {
+//        }
+//
+//        @Override
+//        public int getLoginTimeout() throws SQLException {
+//            return 0;
+//        }
+//
+//        @Override
+//        public java.util.logging.Logger getParentLogger() {
+//            return null;
+//        }
+//    }
+//}

service-ems/service-ems-biz/src/main/java/com/usky/ems/controller/api/ServiceEmsTaskApi.java

@@ -0,0 +1,23 @@
+package com.usky.ems.controller.api;
+
+import com.usky.ems.RemoteEmsTaskService;
+import com.usky.ems.service.EnergyDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ServiceEmsTaskApi implements RemoteEmsTaskService {
+    @Autowired
+    private EnergyDataService energyDatabaseService;
+
+    @Override
+    public void sendEnergyData(){
+        energyDatabaseService.sendEnergyData();
+    }
+
+    @Override
+    public void sendEnergyHeartbeat(){
+        energyDatabaseService.sendEnergyHeartbeat();
+    }
+
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/controller/web/EmsConsPlatformConfigController.java

@@ -0,0 +1,21 @@
+package com.usky.ems.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+
+/**
+ * <p>
+ * 能耗_集成平台配置表 前端控制器
+ * </p>
+ *
+ * @author ya
+ * @since 2026-01-29
+ */
+@Controller
+@RequestMapping("/emsConsPlatformConfig")
+public class EmsConsPlatformConfigController {
+
+}
+

service-ems/service-ems-biz/src/main/java/com/usky/ems/controller/web/EnergyDataController.java

@@ -0,0 +1,23 @@
+package com.usky.ems.controller.web;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.ems.service.EnergyDataService;
+import com.usky.ems.service.vo.EnergyDataRequestVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/energy-data")
+public class EnergyDataController {
+
+    @Autowired
+    private EnergyDataService energyDataService;
+
+
+    @GetMapping("sendEnergyData")
+    public ApiResult<Void> sendData() {
+        energyDataService.sendEnergyData();
+        return ApiResult.success();
+
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/domain/DmpDevice.java

@@ -0,0 +1,86 @@
+package com.usky.ems.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 设备信息表
+ * </p>
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@TableName("dmp_device")
+public class DmpDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型
+     */
+    private Integer deviceType;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备uuid
+     */
+    private String deviceUuid;
+
+    /**
+     * 设备所属类型（1、普通设备  2、网关设备  3、网关子设备）
+     */
+    private Integer categoryType;
+
+    /**
+     * 所属网关
+     */
+    private String gatewayUuid;
+
+    /**
+     * 建筑ID
+     */
+    private Integer buildId;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/domain/EmsConsPlatformConfig.java

@@ -0,0 +1,101 @@
+package com.usky.ems.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 能耗_集成平台配置表
+ * </p>
+ *
+ * @author ya
+ * @since 2026-01-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class EmsConsPlatformConfig implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 平台名称
+     */
+    private String platformName;
+
+    /**
+     * 建筑Id
+     */
+    private String buildId;
+
+    /**
+     * 建筑名称
+     */
+    private String buildName;
+
+    /**
+     * 平台IP
+     */
+    private String platformIp;
+
+    /**
+     * 平台端口
+     */
+    private Integer platformPort;
+
+    /**
+     * 用户名
+     */
+    private String username;
+
+    /**
+     * 密钥
+     */
+    private String passwd;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 关联产品编码
+     */
+    private String productCode;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/domain/TdengineData.java

@@ -0,0 +1,103 @@
+package com.usky.ems.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.sql.Timestamp;
+
+/**
+ * TDengine数据实体
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Data
+public class TdengineData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 时间戳
+     */
+    private Timestamp ts;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * A相电压
+     */
+    private Double voltageA;
+
+    /**
+     * B相电压
+     */
+    private Double voltageB;
+
+    /**
+     * C相电压
+     */
+    private Double voltageC;
+
+    /**
+     * A相电流
+     */
+    private Double currentA;
+
+    /**
+     * B相电流
+     */
+    private Double currentB;
+
+    /**
+     * C相电流
+     */
+    private Double currentC;
+
+    /**
+     * A相有功功率
+     */
+    private Double activepowera;
+
+    /**
+     * B相有功功率
+     */
+    private Double activepowerb;
+
+    /**
+     * C相有功功率
+     */
+    private Double activepowerc;
+
+    /**
+     * 总有功功率
+     */
+    private Double totalActivePower;
+
+    /**
+     * 总功率因数
+     */
+    private Double totalPowerFactor;
+
+    /**
+     * 累计正向有功电量
+     */
+    private Double totalActiveEnergyF;
+
+    /**
+     * 累计反向有功电量
+     */
+    private Double totalActiveEnergyR;
+
+    /**
+     * 累计正向无功电量
+     */
+    private Double totalReactiveEnergyF;
+
+    /**
+     * 累计反向无功电量
+     */
+    private Double totalReactiveEnergyR;
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/mapper/DmpDeviceMapper.java

@@ -0,0 +1,35 @@
+package com.usky.ems.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.usky.ems.domain.DmpDevice;
+import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 设备信息表 Mapper 接口
+ * </p>
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Mapper
+public interface DmpDeviceMapper extends BaseMapper<DmpDevice> {
+
+    /**
+     * 根据网关ID查询网关设备
+     * @param tenantId 租户ID
+     * @param productCode 产品编码
+     * @return 网关设备信息
+     */
+    List<DmpDevice> selectGatewayByDeviceId(@Param("tenantId") Integer tenantId ,@Param("productCode") String productCode);
+
+    /**
+     * 根据网关UUID查询所有子设备
+     * @param gatewayUuid 网关UUID
+     * @return 子设备列表
+     */
+    List<DmpDevice> selectDevicesByGatewayUuid(@Param("gatewayUuid") String gatewayUuid);
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/mapper/EmsConsPlatformConfigMapper.java

@@ -0,0 +1,19 @@
+package com.usky.ems.mapper;
+
+import com.usky.ems.domain.EmsConsPlatformConfig;
+import com.usky.common.mybatis.core.CrudMapper;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 能耗_集成平台配置表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2026-01-29
+ */
+public interface EmsConsPlatformConfigMapper extends CrudMapper<EmsConsPlatformConfig> {
+
+    List<EmsConsPlatformConfig> getPlatformConfig();
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/protocol/NetworkPacket.java

@@ -0,0 +1,119 @@
+package com.usky.ems.protocol;
+
+import lombok.Data;
+
+/**
+ * 网络层数据包
+ * 格式：Head(2字节) + Type(1字节) + Length(4字节) + Data(变长)
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Data
+public class NetworkPacket {
+
+    /**
+     * 消息头，固定值0x1F1F
+     */
+    public static final short HEAD = 0x1F1F;
+
+    /**
+     * 消息类型：身份认证
+     */
+    public static final byte TYPE_AUTH = 0x01;
+
+    /**
+     * 消息类型：心跳
+     */
+    public static final byte TYPE_HEARTBEAT = 0x02;
+
+    /**
+     * 消息类型：能耗数据
+     */
+    public static final byte TYPE_ENERGY_DATA = 0x03;
+
+    /**
+     * 消息类型
+     */
+    private byte type;
+
+    /**
+     * 数据体（加密后的字节数组）
+     */
+    private byte[] data;
+
+    /**
+     * 将数据包编码为字节数组
+     *
+     * @return 编码后的字节数组
+     */
+    public byte[] encode() {
+        int dataLength = data != null ? data.length : 0;
+        int totalLength = 2 + 1 + 4 + dataLength; // Head + Type + Length + Data
+        
+        byte[] packet = new byte[totalLength];
+        int offset = 0;
+        
+        // Head (2字节，网络字节序，高位在前)
+        packet[offset++] = (byte) ((HEAD >> 8) & 0xFF);
+        packet[offset++] = (byte) (HEAD & 0xFF);
+        
+        // Type (1字节)
+        packet[offset++] = type;
+        
+        // Length (4字节，网络字节序，高位在前)
+        packet[offset++] = (byte) ((dataLength >> 24) & 0xFF);
+        packet[offset++] = (byte) ((dataLength >> 16) & 0xFF);
+        packet[offset++] = (byte) ((dataLength >> 8) & 0xFF);
+        packet[offset++] = (byte) (dataLength & 0xFF);
+        
+        // Data
+        if (data != null && dataLength > 0) {
+            System.arraycopy(data, 0, packet, offset, dataLength);
+        }
+        
+        return packet;
+    }
+
+    /**
+     * 从字节数组解码数据包
+     *
+     * @param bytes 字节数组
+     * @return 解码后的数据包
+     */
+    public static NetworkPacket decode(byte[] bytes) {
+        if (bytes == null || bytes.length < 7) {
+            throw new IllegalArgumentException("数据包长度不足");
+        }
+        
+        int offset = 0;
+        
+        // 验证Head
+        short head = (short) (((bytes[offset++] & 0xFF) << 8) | (bytes[offset++] & 0xFF));
+        if (head != HEAD) {
+            throw new IllegalArgumentException("无效的消息头: " + String.format("0x%04X", head));
+        }
+        
+        NetworkPacket packet = new NetworkPacket();
+        
+        // Type
+        packet.type = bytes[offset++];
+        
+        // Length
+        int length = ((bytes[offset++] & 0xFF) << 24) |
+                     ((bytes[offset++] & 0xFF) << 16) |
+                     ((bytes[offset++] & 0xFF) << 8) |
+                     (bytes[offset++] & 0xFF);
+        
+        // Data
+        if (length > 0) {
+            if (bytes.length < offset + length) {
+                throw new IllegalArgumentException("数据包长度不足，期望: " + (offset + length) + ", 实际: " + bytes.length);
+            }
+            packet.data = new byte[length];
+            System.arraycopy(bytes, offset, packet.data, 0, length);
+        }
+        
+        return packet;
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/protocol/TcpClient.java

@@ -0,0 +1,474 @@
+package com.usky.ems.protocol;
+
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.usky.ems.util.AesUtil;
+import org.dom4j.Document;
+import org.dom4j.DocumentException;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.net.Socket;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
+import java.util.Objects;
+import java.util.concurrent.atomic.AtomicBoolean;
+
+/**
+ * TCP客户端
+ * 用于与能耗监管系统建立连接并发送数据
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public class TcpClient {
+
+    private static final Logger logger = LoggerFactory.getLogger(TcpClient.class);
+
+    private String host;
+    private int port;
+    private String authKey;
+    private Socket socket;
+    private InputStream inputStream;
+    private OutputStream outputStream;
+    private AtomicBoolean connected = new AtomicBoolean(false);
+    private AtomicBoolean authenticated = new AtomicBoolean(false);
+
+    public TcpClient(String host, int port, String authKey) {
+        this.host = host;
+        this.port = port;
+        this.authKey = authKey;
+    }
+
+    /**
+     * 建立TCP连接
+     *
+     * @return 是否连接成功
+     */
+    public boolean connect() {
+        try {
+            if (socket != null && !socket.isClosed()) {
+                socket.close();
+            }
+
+            socket = new Socket(host, port);
+            socket.setSoTimeout(30000); // 30秒超时
+            inputStream = socket.getInputStream();
+            outputStream = socket.getOutputStream();
+            connected.set(true);
+            authenticated.set(false);
+
+            logger.info("TCP连接成功: {}:{}", host, port);
+            return true;
+        } catch (IOException e) {
+            logger.error("TCP连接失败: {}:{}", host, port, e);
+            connected.set(false);
+            return false;
+        }
+    }
+
+    /**
+     * 关闭连接
+     */
+    public void close() {
+        try {
+            if (inputStream != null) {
+                inputStream.close();
+            }
+            if (outputStream != null) {
+                outputStream.close();
+            }
+            if (socket != null && !socket.isClosed()) {
+                socket.close();
+            }
+            connected.set(false);
+            authenticated.set(false);
+            logger.info("TCP连接已关闭");
+        } catch (IOException e) {
+            logger.error("关闭TCP连接失败", e);
+        }
+    }
+
+    /**
+     * 身份认证
+     *
+     * @param buildingId 建筑ID
+     * @param gatewayId  网关ID
+     * @return 是否认证成功
+     */
+    public boolean authenticate(String buildingId, String gatewayId) {
+        if (!connected.get()) {
+            logger.error("未建立TCP连接，无法进行身份认证");
+            return false;
+        }
+
+        try {
+            // 1. 发送身份认证请求
+            String requestXml = com.usky.ems.util.XmlBuilder.buildAuthRequest(buildingId, gatewayId);
+            sendPacket(NetworkPacket.TYPE_AUTH, requestXml, false);
+
+            // 2. 接收服务端返回的随机序列
+            NetworkPacket response = receivePacket();
+            if (response == null || response.getType() != NetworkPacket.TYPE_AUTH) {
+                logger.error("接收身份认证响应失败");
+                return false;
+            }
+
+            // 认证响应不加密
+            String responseXml = new String(response.getData(), java.nio.charset.StandardCharsets.UTF_8);
+            String sequence = parseSequenceFromXml(responseXml);
+            if (sequence == null || sequence.isEmpty()) {
+                logger.error("解析随机序列失败");
+                return false;
+            }
+
+            // 3. 计算MD5：密钥 + 随机序列
+            String md5 = com.usky.ems.util.Md5Util.md5(authKey + sequence);
+
+            // 4. 发送MD5值
+            String md5Xml = com.usky.ems.util.XmlBuilder.buildAuthMd5Request(buildingId, gatewayId, md5);
+            sendPacket(NetworkPacket.TYPE_AUTH, md5Xml, false);
+
+            // 5. 接收认证结果
+            NetworkPacket result = receivePacket();
+            if (result == null || result.getType() != NetworkPacket.TYPE_AUTH) {
+                logger.error("接收认证结果失败");
+                return false;
+            }
+
+            // 认证响应不加密
+            String resultXml = new String(result.getData(), java.nio.charset.StandardCharsets.UTF_8);
+            boolean success = parseAuthResult(resultXml);
+
+            if (success) {
+                authenticated.set(true);
+                logger.info("身份认证成功");
+            } else {
+                logger.error("身份认证失败");
+            }
+
+            return success;
+        } catch (Exception e) {
+            logger.error("身份认证过程异常", e);
+            return false;
+        }
+    }
+
+    /**
+     * 发送心跳
+     *
+     * @param buildingId 建筑ID
+     * @param gatewayId  网关ID
+     * @return 是否发送成功
+     */
+    public boolean sendHeartbeat(String buildingId, String gatewayId) {
+        if (!connected.get() || !authenticated.get()) {
+            logger.warn("连接未建立或未认证，无法发送心跳");
+            return false;
+        }
+
+        try {
+            String heartbeatXml = com.usky.ems.util.XmlBuilder.buildHeartbeatRequest(buildingId, gatewayId);
+            sendPacket(NetworkPacket.TYPE_HEARTBEAT, heartbeatXml, false);
+
+            NetworkPacket response1 = receivePacket();
+            if (response1 != null  && response1.getType() == NetworkPacket.TYPE_HEARTBEAT) {
+                // 直接转换为可读XML（无需解密）
+                String heartbeatResponseXml = new String(response1.getData(), java.nio.charset.StandardCharsets.UTF_8);
+                System.out.println("可读报文：\n" + heartbeatResponseXml);
+                boolean success = this.parseHeartbeatResult(heartbeatResponseXml);
+                if (success) {
+                    logger.info("发送心跳成功");
+                    return true;
+                }else{
+                    logger.info("发送心跳失败");
+                    return false;
+                }
+            }
+            return false;
+        } catch (Exception e) {
+            logger.error("发送心跳失败", e);
+            return false;
+        }
+    }
+
+    /**
+     * 发送能耗数据
+     *
+     * @param xmlData XML数据（未加密）
+     * @return 是否发送成功
+     */
+    public boolean sendEnergyData(String xmlData) {
+        if (!connected.get() || !authenticated.get()) {
+            logger.warn("连接未建立或未认证，无法发送能耗数据");
+            return false;
+        }
+
+        try {
+            sendPacket(NetworkPacket.TYPE_ENERGY_DATA, xmlData, true);
+
+            NetworkPacket response = receivePacket();
+            if (response != null  && response.getType() == NetworkPacket.TYPE_ENERGY_DATA) {
+                // 直接转换为可读XML（无需解密）
+                String readable = new String(response.getData(), java.nio.charset.StandardCharsets.UTF_8);
+                System.out.println("可读报文：\n" + readable);
+                boolean success = this.parseEnergyDataResult(readable);
+                if (success) {
+                    logger.info("能耗数据发送成功");
+                    return true;
+                }else{
+                    logger.info("能耗数据发送失败");
+                    return false;
+                }
+            }
+            return false;
+
+        } catch (Exception e) {
+            logger.error("发送能耗数据失败", e);
+            return false;
+        }
+    }
+
+    /**
+     * 将TCP报文字节数组直接转换为可读格式（无需解密）
+     * @param dataBytes 原始报文字节数组
+     * @param charset 报文字符编码（默认UTF-8）
+     * @param format 报文格式（xml/json/plain，plain为普通文本）
+     * @return 可读的报文字符串
+     */
+    public String convertToReadablePacket(byte[] dataBytes, String charset, String format) {
+        if (dataBytes == null || dataBytes.length == 0) {
+            return "空报文";
+        }
+
+        // 兜底处理字符编码，默认用UTF-8
+        String actualCharset = (charset == null || charset.isEmpty()) ? "UTF-8" : charset;
+
+        try {
+            // 第一步：直接将字节数组转字符串（核心，无需解密）
+            String rawText = new String(dataBytes, actualCharset);
+            logger.debug("原始文本报文：{}", rawText);
+
+            // 第二步：根据格式美化
+            switch (format.toLowerCase()) {
+                case "xml":
+                    return formatXml(rawText); // XML格式化（带缩进）
+                case "json":
+                    return formatJson(rawText); // JSON格式化（带缩进）
+                case "plain":
+                default:
+                    return rawText; // 普通文本直接返回
+            }
+        } catch (Exception e) {
+            logger.warn("转换为文本格式失败，返回十六进制格式：{}", e.getMessage());
+            // 转换失败时，返回十六进制（所有二进制数据都能读）
+            return bytesToHex(dataBytes);
+        }
+    }
+
+    /**
+     * XML格式化（美化缩进）
+     */
+    private String formatXml(String xmlText) throws DocumentException {
+        Document document = DocumentHelper.parseText(xmlText);
+        return document.asXML();
+    }
+
+    /**
+     * JSON格式化（美化缩进）
+     */
+    private String formatJson(String jsonText) throws Exception {
+        ObjectMapper mapper = new ObjectMapper();
+        Object jsonObj = mapper.readValue(jsonText, Object.class);
+        return mapper.writerWithDefaultPrettyPrinter().writeValueAsString(jsonObj);
+    }
+
+    /**
+     * 字节数组转十六进制字符串（兜底方案）
+     * 格式：00 1A 2B ... （便于排查二进制数据问题）
+     */
+    private String bytesToHex(byte[] bytes) {
+        StringBuilder sb = new StringBuilder();
+        for (byte b : bytes) {
+            sb.append(String.format("%02X ", b));
+        }
+        return "十六进制格式：" + sb.toString().trim();
+    }
+
+    /**
+     * 发送数据包
+     *
+     * @param type     消息类型
+     * @param xmlData  XML数据
+     * @param encrypt  是否加密
+     */
+    private void sendPacket(byte type, String xmlData, boolean encrypt) throws IOException {
+        byte[] data;
+        if (encrypt) {
+            // 能耗数据需要AES加密
+            try {
+                data = AesUtil.encryptEnergyXml(xmlData, authKey);
+            } catch (Exception e) {
+                throw new IOException("加密能耗数据失败", e);
+            }
+        } else {
+            // 身份认证和心跳不加密
+            data = xmlData.getBytes(java.nio.charset.StandardCharsets.UTF_8);
+        }
+
+        NetworkPacket packet = new NetworkPacket();
+        packet.setType(type);
+        packet.setData(data);
+
+        byte[] packetBytes = packet.encode();
+        outputStream.write(packetBytes);
+        outputStream.flush();
+    }
+
+    /**
+     * 接收数据包
+     *
+     * @return 接收到的数据包
+     */
+    private NetworkPacket receivePacket() throws IOException {
+        // 先读取7字节（Head + Type + Length）
+        byte[] header = new byte[7];
+        int bytesRead = 0;
+        while (bytesRead < 7) {
+            int n = inputStream.read(header, bytesRead, 7 - bytesRead);
+            if (n == -1) {
+                throw new IOException("连接已关闭");
+            }
+            bytesRead += n;
+        }
+
+        // 解析Length
+        int length = ((header[3] & 0xFF) << 24) |
+                ((header[4] & 0xFF) << 16) |
+                ((header[5] & 0xFF) << 8) |
+                (header[6] & 0xFF);
+
+        // 读取Data
+        byte[] data = new byte[length];
+        bytesRead = 0;
+        while (bytesRead < length) {
+            int n = inputStream.read(data, bytesRead, length - bytesRead);
+            if (n == -1) {
+                throw new IOException("连接已关闭");
+            }
+            bytesRead += n;
+        }
+
+        // 组装完整数据包
+        byte[] packetBytes = new byte[7 + length];
+        System.arraycopy(header, 0, packetBytes, 0, 7);
+        System.arraycopy(data, 0, packetBytes, 7, length);
+
+        return NetworkPacket.decode(packetBytes);
+    }
+
+
+    /**
+     * 从XML中解析随机序列
+     */
+    private String parseSequenceFromXml(String xml) {
+        try {
+            Document document = DocumentHelper.parseText(xml);
+            Element root = document.getRootElement();
+            Element idValidate = root.element("id_validate");
+            if (idValidate != null) {
+                Element sequence = idValidate.element("sequence");
+                if (sequence != null) {
+                    return sequence.getTextTrim();
+                }
+            }
+        } catch (Exception e) {
+            logger.error("解析随机序列失败", e);
+        }
+        return null;
+    }
+
+    /**
+     * 从XML中解析认证结果
+     */
+    private boolean parseAuthResult(String xml) {
+        try {
+            Document document = DocumentHelper.parseText(xml);
+            Element root = document.getRootElement();
+            Element idValidate = root.element("id_validate");
+            if (idValidate != null && "result".equals(idValidate.attributeValue("operation"))) {
+                Element result = idValidate.element("result");
+                if (result != null) {
+                    return "pass".equals(result.getTextTrim());
+                }
+            }
+        } catch (Exception e) {
+            logger.error("解析认证结果失败", e);
+        }
+        return false;
+    }
+
+    /**
+     * 从XML中解析推送能耗数据响应结果
+     */
+    private boolean parseEnergyDataResult(String xml) {
+        try {
+            Document document = DocumentHelper.parseText(xml);
+            Element root = document.getRootElement();
+            Element dataElement = root.element("data");
+            if (dataElement == null) {
+                logger.warn("XML中未找到<data>节点");
+            }
+
+            // 4. 获取<ack>子节点的文本值
+            Element ackElement = dataElement.element("ack");
+            if (ackElement == null) {
+                logger.warn("XML中未找到<ack>节点");
+            }
+
+            return "OK".equals(ackElement.getTextTrim());
+        } catch (Exception e) {
+            logger.error("解析认证结果失败", e);
+        }
+        return false;
+    }
+
+    /**
+     * 从XML中解析推送能耗数据响应结果
+     */
+    private boolean parseHeartbeatResult(String xml) {
+        try {
+            Document document = DocumentHelper.parseText(xml);
+            Element root = document.getRootElement();
+            Element dataElement = root.element("heart_beat");
+            if (dataElement == null) {
+                logger.warn("XML中未找到<heart_beat>节点");
+            }
+
+            // 4. 获取<ack>子节点的文本值
+            Element ackElement = dataElement.element("time");
+            if (ackElement == null) {
+                logger.warn("XML中未找到<time>节点");
+            }
+
+            return StringUtils.isNotBlank(ackElement.getTextTrim());
+        } catch (Exception e) {
+            logger.error("解析认证结果失败", e);
+        }
+        return false;
+    }
+
+    public boolean isConnected() {
+        return connected.get() && socket != null && !socket.isClosed();
+    }
+
+    public boolean isAuthenticated() {
+        return authenticated.get();
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/DmpDeviceService.java

@@ -0,0 +1,31 @@
+package com.usky.ems.service;
+
+import com.usky.ems.domain.DmpDevice;
+
+import java.util.List;
+
+/**
+ * 设备信息服务接口
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public interface DmpDeviceService {
+
+    /**
+     * 根据网关ID查询网关设备
+     *
+     * @param tenantId 租户ID
+     * @param productCode  产品编码
+     * @return 网关设备信息
+     */
+    List<DmpDevice> getGatewayByDeviceId(Integer tenantId, String productCode);
+
+    /**
+     * 根据网关UUID查询所有子设备
+     *
+     * @param gatewayUuid 网关UUID
+     * @return 子设备列表
+     */
+    List<DmpDevice> getDevicesByGatewayUuid(String gatewayUuid);
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/EmsConsPlatformConfigService.java

@@ -0,0 +1,23 @@
+package com.usky.ems.service;
+
+import com.usky.ems.domain.EmsConsPlatformConfig;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 能耗_集成平台配置表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2026-01-29
+ */
+public interface EmsConsPlatformConfigService extends CrudService<EmsConsPlatformConfig> {
+
+    /**
+     * 查询能耗平台信息
+     */
+    List<EmsConsPlatformConfig> getPlatformConfig();
+
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/EnergyDataService.java

@@ -0,0 +1,20 @@
+package com.usky.ems.service;
+
+/**
+ * 能耗数据服务接口
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public interface EnergyDataService {
+
+    /**
+     * 定时推送能耗数据到能耗平台
+     */
+    void sendEnergyData();
+
+    /**
+     * 定时推送心跳数据到能耗平台
+     */
+    void sendEnergyHeartbeat();
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/TdengineService.java

@@ -0,0 +1,30 @@
+package com.usky.ems.service;
+
+import com.usky.ems.domain.TdengineData;
+
+import java.util.List;
+
+/**
+ * TDengine数据查询服务接口
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public interface TdengineService {
+
+    /**
+     * 查询设备的最新数据
+     *
+     * @param deviceUuid 设备UUID
+     * @return 最新数据
+     */
+    TdengineData getLatestData(String deviceUuid);
+
+    /**
+     * 批量查询设备的最新数据
+     *
+     * @param deviceUuids 设备UUID列表
+     * @return 设备数据映射（key: deviceUuid, value: TdengineData）
+     */
+    java.util.Map<String, TdengineData> getLatestDataBatch(List<String> deviceUuids);
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/impl/DmpDeviceServiceImpl.java

@@ -0,0 +1,32 @@
+package com.usky.ems.service.impl;
+
+import com.usky.ems.domain.DmpDevice;
+import com.usky.ems.mapper.DmpDeviceMapper;
+import com.usky.ems.service.DmpDeviceService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * 设备信息服务实现类
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Service
+public class DmpDeviceServiceImpl implements DmpDeviceService {
+
+    @Autowired
+    private DmpDeviceMapper dmpDeviceMapper;
+
+    @Override
+    public List<DmpDevice> getGatewayByDeviceId(Integer tenantId, String productCode) {
+        return dmpDeviceMapper.selectGatewayByDeviceId(tenantId, productCode);
+    }
+
+    @Override
+    public List<DmpDevice> getDevicesByGatewayUuid(String gatewayUuid) {
+        return dmpDeviceMapper.selectDevicesByGatewayUuid(gatewayUuid);
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/impl/EmsConsPlatformConfigServiceImpl.java

@@ -0,0 +1,29 @@
+package com.usky.ems.service.impl;
+
+import com.usky.ems.domain.EmsConsPlatformConfig;
+import com.usky.ems.mapper.EmsConsPlatformConfigMapper;
+import com.usky.ems.service.EmsConsPlatformConfigService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 能耗_集成平台配置表 服务实现类
+ * </p>
+ *
+ * @author ya
+ * @since 2026-01-29
+ */
+@Service
+public class EmsConsPlatformConfigServiceImpl extends AbstractCrudService<EmsConsPlatformConfigMapper, EmsConsPlatformConfig> implements EmsConsPlatformConfigService {
+
+    @Autowired
+    private EmsConsPlatformConfigMapper emsConsPlatformConfigMapper;
+
+    public List<EmsConsPlatformConfig> getPlatformConfig(){
+        return emsConsPlatformConfigMapper.getPlatformConfig();
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/impl/EnergyDataServiceImpl.java

@@ -0,0 +1,290 @@
+package com.usky.ems.service.impl;
+
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.usky.ems.domain.DmpDevice;
+import com.usky.ems.domain.EmsConsPlatformConfig;
+import com.usky.ems.domain.TdengineData;
+import com.usky.ems.protocol.TcpClient;
+import com.usky.ems.service.DmpDeviceService;
+import com.usky.ems.service.EmsConsPlatformConfigService;
+import com.usky.ems.service.EnergyDataService;
+import com.usky.ems.service.TdengineService;
+import com.usky.ems.util.XmlBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.stereotype.Service;
+
+import java.util.*;
+
+/**
+ * 能耗数据服务实现类
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Service
+public class EnergyDataServiceImpl implements EnergyDataService {
+
+    private static final Logger logger = LoggerFactory.getLogger(EnergyDataServiceImpl.class);
+
+
+    private final DmpDeviceService dmpDeviceService;
+    private final TdengineService tdengineService;
+    private final EmsConsPlatformConfigService emsConsPlatformConfigService;
+
+    // TCP客户端连接池（每个网关一个连接）
+    private final Map<String, TcpClient> clientPool = new HashMap<>();
+
+    public EnergyDataServiceImpl(DmpDeviceService dmpDeviceService, TdengineService tdengineService, EmsConsPlatformConfigService emsConsPlatformConfigService) {
+        this.dmpDeviceService = dmpDeviceService;
+        this.tdengineService = tdengineService;
+        this.emsConsPlatformConfigService = emsConsPlatformConfigService;
+    }
+
+    @Override
+    public void sendEnergyData(){
+        logger.info("开始执行能耗数据推送任务");
+
+        List<EmsConsPlatformConfig> platformConfigList = emsConsPlatformConfigService.getPlatformConfig();
+        if(CollectionUtils.isNotEmpty(platformConfigList)){
+            for (EmsConsPlatformConfig platformConfig : platformConfigList) {
+                String serverHost = platformConfig.getPlatformIp();
+                int serverPort = platformConfig.getPlatformPort();
+                String authKey = platformConfig.getPasswd();
+                String buildingId = platformConfig.getBuildId();
+                Integer tenantId = platformConfig.getTenantId();
+                String productCode = platformConfig.getProductCode();
+
+
+                // 1. 查询网关设备
+                List<DmpDevice> gatewayList = dmpDeviceService.getGatewayByDeviceId(tenantId,productCode);
+                if (CollectionUtils.isEmpty(gatewayList)) {
+                    logger.error("{}产品下不存在网关设备", productCode);
+                }
+                for (DmpDevice dmpDevice : gatewayList) {
+                    String gatewayId = dmpDevice.getDeviceId();
+                    try {
+
+                        // 2. 查询网关下的所有电表设备
+                        List<DmpDevice> devices = dmpDeviceService.getDevicesByGatewayUuid(dmpDevice.getDeviceUuid());
+                        if (devices == null || devices.isEmpty()) {
+                            logger.warn("{}网关下没有电表设备", dmpDevice);
+                            continue;
+                        }
+
+                        // 3. 查询所有设备的最新数据
+                        List<String> deviceUuids = new ArrayList<>();
+                        for (DmpDevice device : devices) {
+                            if(!deviceUuids.contains(device.getDeviceUuid())){
+                                deviceUuids.add(device.getDeviceUuid());
+                            }
+
+                        }
+                        Map<String, TdengineData> dataMap = tdengineService.getLatestDataBatch(deviceUuids);
+
+                        // 4. 构建XML数据
+                        String xmlData = buildEnergyDataXml(buildingId, dmpDevice.getDeviceId(), devices, dataMap);
+
+                        // 5. 获取或创建TCP客户端连接
+                        TcpClient client = getOrCreateClient(serverHost, serverPort, authKey, buildingId, gatewayId);
+                        if (client == null) {
+                            logger.error("无法建立TCP连接: {}", gatewayId);
+                        }
+
+                        // 6. 发送数据
+                        boolean success = client.sendEnergyData(xmlData);
+
+                        if (success) {
+                            logger.info("能耗数据推送成功: gatewayId={}, deviceCount={}", gatewayId, devices.size());
+                        } else {
+                            logger.error("能耗数据推送失败: gatewayId={}", gatewayId);
+                        }
+
+                    } catch (Exception e) {
+                        logger.error("生成并推送能耗数据异常: gatewayId={}", gatewayId, e);
+                    }
+                }
+            }
+
+        }
+
+        logger.info("能耗数据推送任务执行完成");
+    }
+
+    @Override
+    public void sendEnergyHeartbeat(){
+        logger.debug("开始执行心跳任务");
+
+        List<EmsConsPlatformConfig> platformConfigList = emsConsPlatformConfigService.getPlatformConfig();
+        if(CollectionUtils.isNotEmpty(platformConfigList)){
+            for (EmsConsPlatformConfig platformConfig : platformConfigList) {
+                String serverHost = platformConfig.getPlatformIp();
+                int serverPort = platformConfig.getPlatformPort();
+                String authKey = platformConfig.getPasswd();
+                String buildingId = platformConfig.getBuildId();
+                Integer tenantId = platformConfig.getTenantId();
+                String productCode = platformConfig.getProductCode();
+
+
+                // 1. 查询网关设备
+                List<DmpDevice> gatewayList = dmpDeviceService.getGatewayByDeviceId(tenantId,productCode);
+                if (CollectionUtils.isEmpty(gatewayList)) {
+                    logger.error("{}产品下不存在网关设备", productCode);
+                }
+                for (DmpDevice dmpDevice : gatewayList) {
+                    String gatewayId = dmpDevice.getDeviceId();
+                    try {
+                        // 2. 获取TCP客户端连接
+                        TcpClient client = getOrCreateClient(serverHost, serverPort, authKey, buildingId, gatewayId);
+                        if (client == null || !client.isConnected() || !client.isAuthenticated()) {
+                            logger.warn("网关连接不存在或未认证，跳过心跳: gatewayId={}", gatewayId);
+                        }
+
+                        // 3. 发送心跳
+                        boolean success = client.sendHeartbeat(buildingId, gatewayId);
+
+                        if (success) {
+                            logger.debug("心跳发送成功: gatewayId={}", gatewayId);
+                        } else {
+                            logger.warn("心跳发送失败: gatewayId={}", gatewayId);
+                        }
+
+                    } catch (Exception e) {
+                        logger.error("发送心跳异常: gatewayId={}", gatewayId, e);
+                    }
+                }
+            }
+
+        }
+
+        logger.debug("心跳任务执行完成");
+    }
+
+    /**
+     * 构建能耗数据XML
+     */
+    private String buildEnergyDataXml(String buildingId, String gatewayId, List<DmpDevice> devices, Map<String, TdengineData> dataMap) {
+        String time = XmlBuilder.formatCurrentTime();
+
+        // 计算分项数据（总电量）
+        Map<String, Double> energyItems = new HashMap<>();
+        double totalEnergy = 0.0;
+//        for (TdengineData data : dataMap.values()) {
+//            if (data.getTotalActiveEnergyF() != null) {
+//                totalEnergy += data.getTotalActiveEnergyF();
+//            }
+//        }
+        energyItems.put("0", totalEnergy);
+
+        // 构建仪表数据
+        List<Map<String, Object>> meters = new ArrayList<>();
+        for (DmpDevice device : devices) {
+            TdengineData data = dataMap.get(device.getDeviceUuid());
+            if (data == null) {
+                continue;
+            }
+
+            Map<String, Object> meter = new HashMap<>();
+            meter.put("id", buildingId + device.getDeviceId().substring(device.getDeviceId().length() - 3));
+            meter.put("name", device.getDeviceName());
+
+            List<Map<String, String>> functions = new ArrayList<>();
+            
+            // 累计正向有功电量
+            if (data.getTotalActiveEnergyF() != null) {
+                functions.add(createFunction("WPP", String.valueOf(data.getTotalActiveEnergyF()), null));
+            }
+            
+            // 正向有功功率
+            if (data.getTotalActivePower() != null) {
+                functions.add(createFunction("Ps", String.valueOf(data.getTotalActivePower()), null));
+            }
+            
+            // 正向无功功率
+            if (data.getTotalReactiveEnergyF() != null) {
+                functions.add(createFunction("Qs", String.valueOf(data.getTotalReactiveEnergyF()), null));
+            }
+            
+            // A相电压
+            if (data.getVoltageA() != null) {
+                functions.add(createFunction("Ua", String.valueOf(data.getVoltageA()), null));
+            }
+            
+            // B相电压
+            if (data.getVoltageB() != null) {
+                functions.add(createFunction("Ub", String.valueOf(data.getVoltageB()), null));
+            }
+            
+            // C相电压
+            if (data.getVoltageC() != null) {
+                functions.add(createFunction("Uc", String.valueOf(data.getVoltageC()), null));
+            }
+            
+            // A相电流
+            if (data.getCurrentA() != null) {
+                functions.add(createFunction("Ia", String.valueOf(data.getCurrentA()), null));
+            }
+            
+            // B相电流
+            if (data.getCurrentB() != null) {
+                functions.add(createFunction("Ib", String.valueOf(data.getCurrentB()), null));
+            }
+            
+            // C相电流
+            if (data.getCurrentC() != null) {
+                functions.add(createFunction("Ic", String.valueOf(data.getCurrentC()), null));
+            }
+            
+            // 功率因数
+            if (data.getTotalPowerFactor() != null) {
+                functions.add(createFunction("PFs", String.valueOf(data.getTotalPowerFactor()), null));
+            }
+
+            meter.put("functions", functions);
+            meters.add(meter);
+        }
+
+        return XmlBuilder.buildEnergyDataRequest(buildingId, gatewayId, time, energyItems, meters);
+    }
+
+    /**
+     * 创建function节点数据
+     */
+    private Map<String, String> createFunction(String id, String value, String error) {
+        Map<String, String> function = new HashMap<>();
+        function.put("id", id);
+        function.put("value", value);
+        if (error != null) {
+            function.put("error", error);
+        }
+        return function;
+    }
+
+    /**
+     * 获取或创建TCP客户端
+     */
+    private synchronized TcpClient getOrCreateClient(String serverHost, int serverPort, String authKey, String buildingId, String gatewayId) {
+        TcpClient client = clientPool.get(gatewayId);
+        
+        if (client == null || !client.isConnected() || !client.isAuthenticated()) {
+            // 创建新连接
+            client = new TcpClient(serverHost, serverPort, authKey);
+            
+            // 建立连接
+            if (!client.connect()) {
+                return null;
+            }
+            
+            // 身份认证
+            if (!client.authenticate(buildingId, gatewayId)) {
+                client.close();
+                return null;
+            }
+            
+            clientPool.put(gatewayId, client);
+        }
+        
+        return client;
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/impl/TdengineServiceImpl.java

@@ -0,0 +1,115 @@
+package com.usky.ems.service.impl;
+
+import com.baomidou.dynamic.datasource.annotation.DS;
+import com.usky.ems.domain.TdengineData;
+import com.usky.ems.service.TdengineService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.sql.DataSource;
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.util.*;
+
+/**
+ * TDengine数据查询服务实现类
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+@Service
+@DS("taos")
+public class TdengineServiceImpl implements TdengineService {
+
+    private static final Logger logger = LoggerFactory.getLogger(TdengineServiceImpl.class);
+
+    @Autowired
+    private DataSource tdengineDataSource;
+
+    @Override
+    public TdengineData getLatestData(String deviceUuid) {
+        if (tdengineDataSource == null) {
+            logger.warn("TDengine数据源未配置");
+            return null;
+        }
+
+        // 子表名格式：_ + deviceUuid
+        String tableName = "_" + deviceUuid;
+        String sql = "SELECT ts, device_id, voltage_a, voltage_b, voltage_c, " +
+                     "current_a, current_b, current_c, activepowera, activepowerb, activepowerc, " +
+                     "totalActivePower, totalPowerFactor, totalActiveEnergyF, totalActiveEnergyR, " +
+                     "totalReactiveEnergyF, totalReactiveEnergyR " +
+                     "FROM " + tableName + " " +
+                     "ORDER BY ts DESC LIMIT 1";
+
+        try (Connection conn = tdengineDataSource.getConnection();
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+            
+            try (ResultSet rs = stmt.executeQuery()) {
+                if (rs.next()) {
+                    return mapResultSetToTdengineData(rs);
+                }
+            }
+        } catch (Exception e) {
+            logger.error("查询TDengine数据失败, deviceUuid: {}", deviceUuid, e);
+        }
+        
+        return null;
+    }
+
+    @Override
+    public Map<String, TdengineData> getLatestDataBatch(List<String> deviceUuids) {
+        Map<String, TdengineData> result = new HashMap<>();
+        
+        if (tdengineDataSource == null || deviceUuids == null || deviceUuids.isEmpty()) {
+            return result;
+        }
+
+        // 为每个设备查询最新数据
+        for (String deviceUuid : deviceUuids) {
+            TdengineData data = getLatestData(deviceUuid);
+            if (data != null) {
+                result.put(deviceUuid, data);
+            }
+        }
+        
+        return result;
+    }
+
+    /**
+     * 将ResultSet映射为TdengineData对象
+     */
+    private TdengineData mapResultSetToTdengineData(ResultSet rs) throws Exception {
+        TdengineData data = new TdengineData();
+        data.setTs(rs.getTimestamp("ts"));
+        data.setDeviceId(rs.getString("device_id"));
+        data.setVoltageA(getDouble(rs, "voltage_a"));
+        data.setVoltageB(getDouble(rs, "voltage_b"));
+        data.setVoltageC(getDouble(rs, "voltage_c"));
+        data.setCurrentA(getDouble(rs, "current_a"));
+        data.setCurrentB(getDouble(rs, "current_b"));
+        data.setCurrentC(getDouble(rs, "current_c"));
+        data.setActivepowera(getDouble(rs, "activepowera"));
+        data.setActivepowerb(getDouble(rs, "activepowerb"));
+        data.setActivepowerc(getDouble(rs, "activepowerc"));
+        data.setTotalActivePower(getDouble(rs, "totalactivepower"));
+        data.setTotalPowerFactor(getDouble(rs, "totalpowerfactor"));
+        data.setTotalActiveEnergyF(getDouble(rs, "totalactiveenergyf"));
+        data.setTotalActiveEnergyR(getDouble(rs, "totalactiveenergyr"));
+        data.setTotalReactiveEnergyF(getDouble(rs, "totalreactiveenergyf"));
+        data.setTotalReactiveEnergyR(getDouble(rs, "totalreactiveenergyr"));
+        return data;
+    }
+
+    private Double getDouble(ResultSet rs, String column) {
+        try {
+            double value = rs.getDouble(column);
+            return rs.wasNull() ? null : value;
+        } catch (Exception e) {
+            return null;
+        }
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/service/vo/EnergyDataRequestVO.java

@@ -0,0 +1,11 @@
+package com.usky.ems.service.vo;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class EnergyDataRequestVO implements Serializable {
+
+    private String gatewayId;
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/util/AesUtil.java

@@ -0,0 +1,51 @@
+package com.usky.ems.util;
+
+import cn.hutool.crypto.Mode;
+import cn.hutool.crypto.Padding;
+
+import javax.crypto.Cipher;
+import javax.crypto.spec.IvParameterSpec;
+import javax.crypto.spec.SecretKeySpec;
+import java.nio.charset.StandardCharsets;
+import cn.hutool.crypto.symmetric.AES;
+import cn.hutool.crypto.Mode;
+import cn.hutool.crypto.Padding;
+
+/**
+ * AES加密工具类
+ * 采用CBC模式，PKCS5填充，密钥和向量相同
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public class AesUtil {
+
+    public static String decrypt(String key, byte[] cipherText) {
+        try {
+            AES aes = new AES(Mode.CBC, Padding.PKCS5Padding,
+                    key.getBytes(), key.getBytes());
+            return aes.decryptStr(cipherText);
+        } catch (Exception e) {
+            throw new RuntimeException("密钥错误!");
+        }
+    }
+
+    public static byte[] encryptEnergyXml(String xml, String key) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] uploadKeyBytes = key.getBytes();
+        SecretKeySpec secretKeySpec = new SecretKeySpec(uploadKeyBytes, "AES");
+        IvParameterSpec ivParameterSpec = new IvParameterSpec(uploadKeyBytes);
+        cipher.init(Cipher.ENCRYPT_MODE, secretKeySpec, ivParameterSpec);
+        return cipher.doFinal(xml.getBytes(StandardCharsets.UTF_8));
+    }
+
+    public static String decryptEnergyXml(byte[] encryptedXml, String key) throws Exception {
+        Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding");
+        byte[] uploadKeyBytes = key.getBytes(StandardCharsets.UTF_8);
+        SecretKeySpec secretKeySpec = new SecretKeySpec(uploadKeyBytes, "AES");
+        IvParameterSpec ivParameterSpec = new IvParameterSpec(uploadKeyBytes);
+        cipher.init(Cipher.DECRYPT_MODE, secretKeySpec, ivParameterSpec);
+        byte[] decryptedBytes = cipher.doFinal(encryptedXml);
+        return new String(decryptedBytes, StandardCharsets.UTF_8);
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/util/Md5Util.java

@@ -0,0 +1,40 @@
+package com.usky.ems.util;
+
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+/**
+ * MD5工具类
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public class Md5Util {
+
+    /**
+     * 计算MD5值
+     *
+     * @param input 输入字符串
+     * @return MD5值（32位小写十六进制字符串）
+     */
+    public static String md5(String input) {
+        try {
+            MessageDigest md = MessageDigest.getInstance("MD5");
+            byte[] messageDigest = md.digest(input.getBytes());
+            
+            // 转换为十六进制字符串
+            StringBuilder hexString = new StringBuilder();
+            for (byte b : messageDigest) {
+                String hex = Integer.toHexString(0xff & b);
+                if (hex.length() == 1) {
+                    hexString.append('0');
+                }
+                hexString.append(hex);
+            }
+            
+            return hexString.toString();
+        } catch (NoSuchAlgorithmException e) {
+            throw new RuntimeException("MD5计算失败", e);
+        }
+    }
+}

service-ems/service-ems-biz/src/main/java/com/usky/ems/util/XmlBuilder.java

@@ -0,0 +1,180 @@
+package com.usky.ems.util;
+
+import org.dom4j.Document;
+import org.dom4j.DocumentHelper;
+import org.dom4j.Element;
+
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * XML报文构建工具类
+ *
+ * @author system
+ * @since 2024-01-01
+ */
+public class XmlBuilder {
+
+    private static final SimpleDateFormat DATE_FORMAT = new SimpleDateFormat("yyyyMMddHHmmss");
+
+    /**
+     * 构建身份认证请求XML
+     *
+     * @param buildingId 建筑ID
+     * @param gatewayId  网关ID
+     * @return XML字符串
+     */
+    public static String buildAuthRequest(String buildingId, String gatewayId) {
+        Document document = DocumentHelper.createDocument();
+        Element root = document.addElement("root");
+        
+        // common节点
+        Element common = root.addElement("common");
+        common.addElement("building_id").setText(buildingId);
+        common.addElement("gateway_id").setText(gatewayId);
+        common.addElement("type").setText("id_validate");
+        
+        // id_validate节点
+        Element idValidate = root.addElement("id_validate");
+        idValidate.addAttribute("operation", "request");
+        
+        return document.asXML();
+    }
+
+    /**
+     * 构建身份认证MD5请求XML
+     *
+     * @param buildingId 建筑ID
+     * @param gatewayId  网关ID
+     * @param md5        MD5值
+     * @return XML字符串
+     */
+    public static String buildAuthMd5Request(String buildingId, String gatewayId, String md5) {
+        Document document = DocumentHelper.createDocument();
+        Element root = document.addElement("root");
+        
+        // common节点
+        Element common = root.addElement("common");
+        common.addElement("building_id").setText(buildingId);
+        common.addElement("gateway_id").setText(gatewayId);
+        common.addElement("type").setText("id_validate");
+        
+        // id_validate节点
+        Element idValidate = root.addElement("id_validate");
+        idValidate.addAttribute("operation", "md5");
+        idValidate.addElement("md5").setText(md5);
+        
+        return document.asXML();
+    }
+
+    /**
+     * 构建心跳请求XML
+     *
+     * @param buildingId 建筑ID
+     * @param gatewayId  网关ID
+     * @return XML字符串
+     */
+    public static String buildHeartbeatRequest(String buildingId, String gatewayId) {
+        Document document = DocumentHelper.createDocument();
+        Element root = document.addElement("root");
+        
+        // common节点
+        Element common = root.addElement("common");
+        common.addElement("building_id").setText(buildingId);
+        common.addElement("gateway_id").setText(gatewayId);
+        common.addElement("type").setText("heart_beat");
+        
+        // heart_beat节点
+        Element heartBeat = root.addElement("heart_beat");
+        heartBeat.addAttribute("operation", "notify");
+        
+        return document.asXML();
+    }
+
+    /**
+     * 构建能耗数据上报XML
+     *
+     * @param buildingId  建筑ID
+     * @param gatewayId   网关ID
+     * @param time        时间（yyyyMMddHHmmss格式）
+     * @param energyItems 分项数据
+     * @param meters      仪表数据列表
+     * @return XML字符串
+     */
+    public static String buildEnergyDataRequest(String buildingId, String gatewayId, String time,
+                                                 Map<String, Double> energyItems, List<Map<String, Object>> meters) {
+        Document document = DocumentHelper.createDocument();
+        Element root = document.addElement("root");
+        
+        // common节点
+        Element common = root.addElement("common");
+        common.addElement("building_id").setText(buildingId);
+        common.addElement("gateway_id").setText(gatewayId);
+        common.addElement("type").setText("energy_data");
+        
+        // data节点
+        Element data = root.addElement("data");
+        data.addAttribute("operation", "report");
+        data.addElement("time").setText(time);
+        
+        // energy_items节点
+        if (energyItems != null && !energyItems.isEmpty()) {
+            Element energyItemsElement = data.addElement("energy_items");
+            for (Map.Entry<String, Double> entry : energyItems.entrySet()) {
+                Element item = energyItemsElement.addElement("energy_item");
+                item.addAttribute("code", entry.getKey());
+                item.setText(String.valueOf(entry.getValue()));
+            }
+        }
+        
+        // meters节点
+        if (meters != null && !meters.isEmpty()) {
+            Element metersElement = data.addElement("meters");
+            metersElement.addAttribute("total", String.valueOf(meters.size()));
+            
+            for (Map<String, Object> meter : meters) {
+                Element meterElement = metersElement.addElement("meter");
+                meterElement.addAttribute("id", (String) meter.get("id"));
+                meterElement.addAttribute("name", (String) meter.get("name"));
+                
+                // function节点
+                @SuppressWarnings("unchecked")
+                List<Map<String, String>> functions = (List<Map<String, String>>) meter.get("functions");
+                if (functions != null) {
+                    for (Map<String, String> function : functions) {
+                        Element functionElement = meterElement.addElement("function");
+                        functionElement.addAttribute("id", function.get("id"));
+                        String error = function.get("error");
+                        if (error != null && !error.isEmpty()) {
+                            functionElement.addAttribute("error", error);
+                        }
+                        functionElement.setText(function.get("value"));
+                    }
+                }
+            }
+        }
+        
+        return document.asXML();
+    }
+
+    /**
+     * 格式化时间为yyyyMMddHHmmss格式
+     *
+     * @param date 日期
+     * @return 格式化后的字符串
+     */
+    public static String formatTime(Date date) {
+        return DATE_FORMAT.format(date);
+    }
+
+    /**
+     * 格式化当前时间为yyyyMMddHHmmss格式
+     *
+     * @return 格式化后的字符串
+     */
+    public static String formatCurrentTime() {
+        return formatTime(new Date());
+    }
+}

service-ems/service-ems-biz/src/main/resources/bootstrap.yml

@@ -0,0 +1,25 @@
+# Tomcat
+server:
+  port: 9903
+
+# Spring
+spring:
+  application:
+    # 应用名称
+    name: service-ems
+  profiles:
+    # 环境配置
+    active: dev
+  cloud:
+    nacos:
+      discovery:
+        # 服务注册地址
+        server-addr: 192.168.10.165:8848
+      config:
+        # 配置中心地址
+        server-addr: 192.168.10.165:8848
+        # 配置文件格式
+        file-extension: yml
+        # 共享配置
+        shared-configs:
+          - application-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension}

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

@@ -0,0 +1,74 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<configuration scan="true" scanPeriod="60 seconds" debug="false">
+    <!-- 日志存放路径 -->
+	<property name="log.path" value="/var/log/uskycloud/service-ems" />
+   <!-- 日志输出格式 -->
+	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
+
+    <!-- 控制台输出 -->
+	<appender name="console" class="ch.qos.logback.core.ConsoleAppender">
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+	</appender>
+
+    <!-- 系统日志输出 -->
+	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/info.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+			<fileNamePattern>${log.path}/info.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+		</rollingPolicy>
+		<encoder>
+			<pattern>${log.pattern}</pattern>
+		</encoder>
+		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>INFO</level>
+            <!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+            <!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+	</appender>
+
+    <appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
+	    <file>${log.path}/error.log</file>
+        <!-- 循环政策：基于时间创建日志文件 -->
+        <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+            <!-- 日志文件名格式 -->
+            <fileNamePattern>${log.path}/error.%d{yyyy-MM-dd}.log</fileNamePattern>
+			<!-- 日志最大的历史 60天 -->
+			<maxHistory>60</maxHistory>
+        </rollingPolicy>
+        <encoder>
+            <pattern>${log.pattern}</pattern>
+        </encoder>
+        <filter class="ch.qos.logback.classic.filter.LevelFilter">
+            <!-- 过滤的级别 -->
+            <level>ERROR</level>
+			<!-- 匹配时的操作：接收（记录） -->
+            <onMatch>ACCEPT</onMatch>
+			<!-- 不匹配时的操作：拒绝（不记录） -->
+            <onMismatch>DENY</onMismatch>
+        </filter>
+    </appender>
+
+    <!-- 系统模块日志级别控制  -->
+	<logger name="com.usky" level="info" />
+	<!-- Spring日志级别控制  -->
+	<logger name="org.springframework" level="warn" />
+
+	<root level="info">
+		<appender-ref ref="console" />
+	</root>
+	
+	<!--系统操作日志-->
+    <root level="info">
+        <appender-ref ref="file_info" />
+        <appender-ref ref="file_error" />
+    </root>
+</configuration>

service-ems/service-ems-biz/src/main/resources/mapper/ems/DmpDeviceMapper.xml

@@ -0,0 +1,38 @@
+<?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">
+<mapper namespace="com.usky.ems.mapper.DmpDeviceMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.ems.domain.DmpDevice">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="device_name" property="deviceName" />
+        <result column="device_type" property="deviceType" />
+        <result column="product_id" property="productId" />
+        <result column="product_code" property="productCode" />
+        <result column="device_uuid" property="deviceUuid" />
+        <result column="category_type" property="categoryType" />
+        <result column="gateway_uuid" property="gatewayUuid" />
+        <result column="build_id" property="buildId" />
+        <result column="delete_flag" property="deleteFlag" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+    <!-- 根据网关ID查询网关设备 -->
+    <select id="selectGatewayByDeviceId" resultMap="BaseResultMap">
+        SELECT * FROM dmp_device
+        WHERE tenant_id = #{tenantId}
+        AND product_code = #{productCode}
+        AND category_type = 2
+        AND delete_flag = 0
+    </select>
+
+    <!-- 根据网关UUID查询所有子设备 -->
+    <select id="selectDevicesByGatewayUuid" resultMap="BaseResultMap">
+        SELECT device_id,device_name,device_type,product_id,product_code,IFNULL(TRIM(sim_code), device_uuid) AS device_uuid,category_type,gateway_uuid,build_id,delete_flag,tenant_id FROM dmp_device
+        WHERE gateway_uuid = #{gatewayUuid}
+        AND category_type = 3
+        AND delete_flag = 0
+    </select>
+
+</mapper>

service-ems/service-ems-biz/src/main/resources/mapper/ems/EmsConsPlatformConfigMapper.xml

@@ -0,0 +1,28 @@
+<?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">
+<mapper namespace="com.usky.ems.mapper.EmsConsPlatformConfigMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.ems.domain.EmsConsPlatformConfig">
+        <id column="id" property="id" />
+        <result column="platform_name" property="platformName" />
+        <result column="build_id" property="buildId" />
+        <result column="build_name" property="buildName" />
+        <result column="platform_ip" property="platformIp" />
+        <result column="platform_port" property="platformPort" />
+        <result column="username" property="username" />
+        <result column="passwd" property="passwd" />
+        <result column="created_by" property="createdBy" />
+        <result column="created_time" property="createdTime" />
+        <result column="updated_by" property="updatedBy" />
+        <result column="updated_time" property="updatedTime" />
+        <result column="tenant_id" property="tenantId" />
+        <result column="product_code" property="productCode" />
+        <result column="delete_flag" property="deleteFlag" />
+    </resultMap>
+    <select id="getPlatformConfig" resultMap="BaseResultMap">
+        SELECT * FROM ems_cons_platform_config
+        WHERE delete_flag = 0
+    </select>
+
+</mapper>

service-fire/service-fire-biz/src/main/java/com/usky/fire/controller/web/PatrolInspectionPlanController.java

@@ -112,5 +112,16 @@ public class PatrolInspectionPlanController {
         return ApiResult.success(patrolInspectionPlanService.patrolInspectionSiteVoList(planId, areaId));
     }
 
+    /**
+     * 巡查自检-巡检子计划-手动生成
+     *
+     * @return
+     */
+    @GetMapping("addPlanSon")
+    public ApiResult<Void> addPlanSon() {
+        patrolInspectionPlanService.addPatrolInspectionPlanSon();
+        return ApiResult.success();
+    }
+
 }
 

service-fire/service-fire-biz/src/main/java/com/usky/fire/service/impl/PatrolInspectionPlanSonServiceImpl.java

@@ -619,9 +619,9 @@ public class PatrolInspectionPlanSonServiceImpl extends AbstractCrudService<Patr
         if (list > 0) {
             throw new BusinessException("不可重复采集地点");
         }
-        if (siteCount <= 0) {
-            throw new BusinessException("采集点位不合法，请采集合法点位");
-        }
+//        if (siteCount <= 0) {
+//            throw new BusinessException("采集点位不合法，请采集合法点位");
+//        }
         patrolInspectionSite.setCreator(SecurityUtils.getUsername());
         patrolInspectionSite.setCollector(SecurityUtils.getLoginUser().getSysUser().getNickName());
         patrolInspectionSite.setCreateTime(LocalDateTime.now());

service-iot/service-iot-biz/pom.xml

@@ -21,12 +21,12 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-tsdb-proxy-api</artifactId>
+            <artifactId>service-tsdb-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
 

service-iot/service-iot-biz/src/main/java/com/usky/iot/controller/web/BaseScreenController.java

@@ -0,0 +1,84 @@
+package com.usky.iot.controller.web;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.log.annotation.Log;
+import com.usky.common.log.enums.BusinessType;
+import com.usky.iot.domain.BaseGgpFacility;
+import com.usky.iot.domain.BaseScreen;
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.iot.service.BaseGgpFacilityService;
+import com.usky.iot.service.BaseScreenService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import org.springframework.stereotype.Controller;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author han
+ * @since 2026-01-20
+ */
+@RestController
+@RequestMapping("/baseScreen")
+public class BaseScreenController {
+    @Autowired
+    private BaseScreenService baseScreenService;
+
+    /**
+     * 新增
+     * @param baseScreen
+     * @return
+     */
+    @PostMapping("/add")
+    public ApiResult<Void> add(@RequestBody BaseScreen baseScreen) {
+        baseScreenService.add(baseScreen);
+        return ApiResult.success();
+    }
+
+    /**
+     * 修改
+     * @param baseScreen
+     * @return
+     */
+    @PutMapping("/edit")
+    public ApiResult<Void> edit(@RequestBody BaseScreen baseScreen) {
+        baseScreenService.update(baseScreen);
+        return ApiResult.success();
+    }
+
+    /**
+     * 关联设备查看分页
+     * @param screenGroup  设备ID
+     * @param id  设施主键ID
+     * @return
+     */
+    @Log(title = "大屏查看列表", businessType = BusinessType.OTHER)
+    @GetMapping("/screenList")
+    public ApiResult<List<BaseScreen>> screenList(@RequestParam(value = "screenGroup", required = false) Integer screenGroup,
+                                                  @RequestParam(value = "id", required = false) Integer id) {
+        return ApiResult.success(baseScreenService.screenList(screenGroup, id));
+    }
+
+    /**
+     * 删除
+     * @param id
+     * @return
+     */
+    @Log(title = "删除大屏", businessType = BusinessType.DELETE)
+    @DeleteMapping("/{id}")
+    public ApiResult<Void> remove(@PathVariable("id") Integer id) {
+        try {
+            return baseScreenService.removeById(id) ? ApiResult.success() : ApiResult.error("删除失败！");
+        } catch (Exception e) {
+            return ApiResult.error("删除失败：" + e.getMessage());
+        }
+    }
+}
+

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseScreen.java

@@ -0,0 +1,101 @@
+package com.usky.iot.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author han
+ * @since 2026-01-20
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseScreen implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 大屏管理信息表
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 大屏编号
+     */
+    private String screenCode;
+
+    /**
+     * 大屏标题
+     */
+    private String screenTitle;
+
+    /**
+     * 副标题
+     */
+    private String screenSubtitle;
+
+    /**
+     * 分组
+     */
+    private Integer screenGroup;
+
+    /**
+     * 是否默认
+     */
+    private Integer isDefault;
+
+    /**
+     * 大屏地址
+     */
+    private String screenAddress;
+
+    /**
+     * 显示顺序
+     */
+    private Integer orderNum;
+
+    /**
+     * 缩略图URL
+     */
+    private String thumbnailUrl;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/mapper/BaseScreenMapper.java

@@ -0,0 +1,16 @@
+package com.usky.iot.mapper;
+
+import com.usky.iot.domain.BaseScreen;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author han
+ * @since 2026-01-20
+ */
+public interface BaseScreenMapper extends CrudMapper<BaseScreen> {
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/BaseScreenService.java

@@ -0,0 +1,23 @@
+package com.usky.iot.service;
+
+import com.usky.iot.domain.BaseGgpFacility;
+import com.usky.iot.domain.BaseScreen;
+import com.usky.common.mybatis.core.CrudService;
+
+import java.util.List;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author han
+ * @since 2026-01-20
+ */
+public interface BaseScreenService extends CrudService<BaseScreen> {
+    boolean add(BaseScreen baseGgpFacility);
+
+    void update(BaseScreen baseGgpFacility);
+
+    List<BaseScreen> screenList(Integer screenGroup,Integer id);
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/BaseScreenServiceImpl.java

@@ -0,0 +1,86 @@
+package com.usky.iot.service.impl;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.common.security.utils.SecurityUtils;
+import com.usky.iot.domain.BaseFacilityDevice;
+import com.usky.iot.domain.BaseGgpFacility;
+import com.usky.iot.domain.BaseScreen;
+import com.usky.iot.domain.DmpDeviceInfo;
+import com.usky.iot.mapper.BaseScreenMapper;
+import com.usky.iot.service.BaseScreenService;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.stereotype.Service;
+
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Calendar;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author han
+ * @since 2026-01-20
+ */
+@Service
+public class BaseScreenServiceImpl extends AbstractCrudService<BaseScreenMapper, BaseScreen> implements BaseScreenService {
+    @Override
+    public boolean add(BaseScreen baseScreen) {
+        Calendar cal = Calendar.getInstance();
+        Date date = cal.getTime();
+        baseScreen.setScreenCode(new SimpleDateFormat("yyyyMMddHHmmssSSS").format(date));
+        baseScreen.setCreatedBy(SecurityUtils.getUsername());
+        baseScreen.setCreatedTime(LocalDateTime.now());
+        baseScreen.setTenantId(SecurityUtils.getTenantId());
+        this.checkRequiredData(baseScreen);
+        return this.save(baseScreen);
+    }
+
+    @Override
+    public void update(BaseScreen baseScreen) {
+        baseScreen.setUpdatedTime(LocalDateTime.now());
+        baseScreen.setUpdatedBy(SecurityUtils.getUsername());
+        this.checkRequiredData(baseScreen);
+        this.updateById(baseScreen);
+    }
+
+    @Override
+    public List<BaseScreen> screenList(Integer screenGroup, Integer id) {
+        LambdaQueryWrapper<BaseScreen> lambdaQuery = Wrappers.lambdaQuery();
+        lambdaQuery.eq(id != null, BaseScreen::getId, id)
+                .eq(screenGroup != null, BaseScreen::getScreenGroup, screenGroup)
+                .eq(BaseScreen::getTenantId, SecurityUtils.getTenantId());
+        List<BaseScreen> list = this.list(lambdaQuery);
+        return list;
+    }
+
+    /**
+     * 必填数据校验
+     */
+    private void checkRequiredData(BaseScreen baseScreen) {
+
+        if (StringUtils.isBlank(baseScreen.getScreenTitle())) {
+            throw new BusinessException("大屏标题不能为空！");
+        }
+
+        if (StringUtils.isBlank(baseScreen.getScreenCode())) {
+            throw new BusinessException("大屏编号不能为空！");
+        }
+
+        if (baseScreen.getScreenGroup() == null) {
+            throw new BusinessException("分组不能为空！");
+        }
+
+        if (baseScreen.getIsDefault() == null) {
+            throw new BusinessException("是否默认不能为空！");
+        }
+    }
+
+}

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/impl/PmTimeConfServiceImpl.java

@@ -66,7 +66,7 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
         // 查询时间配置
         PmTimeConf timeConf = getTimeConf(tenantId);
         if (timeConf == null) {
-            throw new RuntimeException("未找到工作报提交统计告时间配置，请联系管理员");
+            throw new BusinessException("未找到工作报提交统计告时间配置，请联系管理员");
         } else if (countDate.equals(LocalDate.now()) && timeConf.getStartTime().isAfter(LocalTime.now()) || countDate.isAfter(LocalDate.now())) {
             responseVO.setSubmitOnTime(0);
             responseVO.setSubmitLate(0);

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseScreenMapper.xml

@@ -0,0 +1,24 @@
+<?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">
+<mapper namespace="com.usky.iot.mapper.BaseScreenMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.iot.domain.BaseScreen">
+        <id column="id" property="id"/>
+        <result column="screen_code" property="screenCode"/>
+        <result column="screen_title" property="screenTitle"/>
+        <result column="screen_subtitle" property="screenSubtitle"/>
+        <result column="screen_group" property="screenGroup"/>
+        <result column="is_default" property="isDefault"/>
+        <result column="screen_address" property="screenAddress"/>
+        <result column="order_num" property="orderNum"/>
+        <result column="thumbnail_url" property="thumbnailUrl"/>
+        <result column="remark" property="remark"/>
+        <result column="created_by" property="createdBy"/>
+        <result column="created_time" property="createdTime"/>
+        <result column="updated_by" property="updatedBy"/>
+        <result column="updated_time" property="updatedTime"/>
+        <result column="tenant_id" property="tenantId"/>
+    </resultMap>
+
+</mapper>

service-job/pom.xml

@@ -81,6 +81,12 @@
             <version>0.0.1</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-ems-api</artifactId>
+            <version>0.0.1</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

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

@@ -4,6 +4,7 @@ import com.usky.cdi.AlarmDataSyncTaskService;
 import com.usky.cdi.RemotecdiTaskService;
 import com.usky.common.core.utils.StringUtils;
 import com.usky.meeting.RemoteMeetingService;
+import com.usky.ems.RemoteEmsTaskService;
 import com.usky.fire.RemoteFireService;
 import com.usky.iot.RemoteIotTaskService;
 import com.usky.pm.RemotePmService;
@@ -35,6 +36,10 @@ public class RyTask {
     @Autowired
     private AlarmDataSyncTaskService alarmDataSyncTaskService;
 
+    @Autowired
+    private RemoteEmsTaskService remoteEmsTaskService;
+
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
@@ -104,4 +109,16 @@ public class RyTask {
         alarmDataSyncTaskService.synchronizeAlarmData(tenantId, engineeringId, username, password, status);
     }
 
+    // 推送设备数据到能耗平台
+    public void sendEnergyData(){
+        System.out.println("sendEnergyData start......");
+        remoteEmsTaskService.sendEnergyData();
+    }
+
+    // 推送设备心跳到能耗平台
+    public void sendEnergyHeartbeat(){
+        System.out.println("sendEnergyHeartbeat start......");
+        remoteEmsTaskService.sendEnergyHeartbeat();
+    }
+
 }

service-meeting/service-meeting-biz/pom.xml

@@ -19,7 +19,7 @@
         </dependency>
         <dependency>
             <groupId>com.usky</groupId>
-            <artifactId>data-transfer-api</artifactId>
+            <artifactId>service-transfer-api</artifactId>
             <version>0.0.1</version>
         </dependency>
         <dependency>
@@ -73,6 +73,12 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web</artifactId>
         </dependency>
+        
+        <!-- WebSocket依赖 -->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-websocket</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>com.auth0</groupId>

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/config/WebSocketConfig.java

@@ -0,0 +1,22 @@
+package com.usky.meeting.config;
+
+import com.usky.meeting.websocket.MeetingDeviceWebSocketHandler;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.web.socket.config.annotation.EnableWebSocket;
+import org.springframework.web.socket.server.standard.ServerEndpointExporter;
+
+@Configuration
+@EnableWebSocket
+public class WebSocketConfig {
+
+    @Bean
+    public ServerEndpointExporter serverEndpointExporter() {
+        return new ServerEndpointExporter();
+    }
+
+    @Bean
+    public MeetingDeviceWebSocketHandler meetingDeviceWebSocketHandler() {
+        return new MeetingDeviceWebSocketHandler();
+    }
+}

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/MeetingDeviceWebSocketService.java

@@ -0,0 +1,77 @@
+package com.usky.meeting.service;
+
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.meeting.domain.MeetingDevice;
+import com.usky.meeting.domain.MeetingDeviceHeartbeat;
+import com.usky.meeting.mapper.MeetingDeviceHeartbeatMapper;
+import com.usky.meeting.mapper.MeetingDeviceMapper;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class MeetingDeviceWebSocketService {
+
+    private static final int HEARTBEAT_TIMEOUT_MINUTES = 5;
+
+    @Autowired
+    private MeetingDeviceMapper meetingDeviceMapper;
+
+    @Autowired
+    private MeetingDeviceHeartbeatMapper heartbeatMapper;
+
+    public Map<String, Object> validateDevice(String deviceCode) {
+        Map<String, Object> result = new HashMap<>();
+
+        MeetingDevice device = validateDeviceExists(deviceCode);
+        boolean isOnline = validateDeviceOnline(deviceCode);
+
+        result.put("deviceCode", deviceCode);
+        result.put("deviceName", device.getDeviceName());
+        result.put("deviceStatus", isOnline ? 1 : 0);
+        result.put("isOnline", isOnline);
+        result.put("validateSuccess", true);
+
+        log.info("设备验证成功, deviceCode: {}, isOnline: {}", deviceCode, isOnline);
+        return result;
+    }
+
+    private MeetingDevice validateDeviceExists(String deviceCode) {
+        MeetingDevice device = meetingDeviceMapper.selectOne(
+                Wrappers.<MeetingDevice>lambdaQuery().eq(MeetingDevice::getDeviceCode, deviceCode)
+        );
+        if (device == null) {
+            log.warn("设备不存在, deviceCode: {}", deviceCode);
+            throw new BusinessException("设备不存在: " + deviceCode);
+        }
+        return device;
+    }
+
+    private boolean validateDeviceOnline(String deviceCode) {
+        MeetingDeviceHeartbeat heartbeat = heartbeatMapper.selectOne(
+                Wrappers.<MeetingDeviceHeartbeat>lambdaQuery()
+                        .eq(MeetingDeviceHeartbeat::getDeviceCode, deviceCode)
+                        .orderByDesc(MeetingDeviceHeartbeat::getCreateTime)
+                        .last("LIMIT 1")
+        );
+        if (heartbeat == null) {
+            log.warn("设备心跳记录不存在, deviceCode: {}", deviceCode);
+            throw new BusinessException("设备离线: " + deviceCode + ", 未找到心跳记录");
+        }
+        LocalDateTime heartbeatTime = heartbeat.getCreateTime();
+        LocalDateTime now = LocalDateTime.now();
+        if (heartbeatTime == null || now.isAfter(heartbeatTime.plusMinutes(HEARTBEAT_TIMEOUT_MINUTES))) {
+            log.warn("设备心跳超时, deviceCode: {}, heartbeatTime: {}", deviceCode, heartbeatTime);
+            throw new BusinessException("设备离线: " + deviceCode + ", 心跳超时");
+        }
+        return true;
+    }
+}

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/service/vo/WebSocketConnectionResponseVO.java

@@ -0,0 +1,21 @@
+package com.usky.meeting.service.vo;
+
+import lombok.Data;
+
+@Data
+public class WebSocketConnectionResponseVO {
+
+    private String sessionId;
+
+    private String deviceCode;
+
+    private String deviceName;
+
+    private Integer deviceStatus;
+
+    private Boolean isOnline;
+
+    private String message;
+
+    private Long timestamp;
+}

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/websocket/MeetingDeviceWebSocketController.java

@@ -0,0 +1,72 @@
+package com.usky.meeting.websocket;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.meeting.service.MeetingDeviceWebSocketService;
+import com.usky.meeting.service.vo.WebSocketConnectionResponseVO;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.*;
+
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.Map;
+
+@Slf4j
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/meetingDevice/websocket")
+public class MeetingDeviceWebSocketController {
+
+    @Autowired
+    private MeetingDeviceWebSocketService deviceWebSocketService;
+
+    @GetMapping("/connect")
+    @ResponseBody
+    public ApiResult<WebSocketConnectionResponseVO> connect(
+            @RequestParam String deviceCode
+            //,@RequestHeader(value = "X-Real-IP", required = false) String realIp
+    ) {
+        log.info("收到WebSocket连接请求, deviceCode: {}", deviceCode);
+        WebSocketConnectionResponseVO response = new WebSocketConnectionResponseVO();
+        try {
+            Map<String, Object> validateResult = deviceWebSocketService.validateDevice(deviceCode);
+            response.setDeviceCode(deviceCode);
+            response.setDeviceName((String) validateResult.get("deviceName"));
+            response.setDeviceStatus((Integer) validateResult.get("deviceStatus"));
+            response.setIsOnline((Boolean) validateResult.get("isOnline"));
+            response.setMessage("设备验证通过，可建立WebSocket连接");
+            response.setTimestamp(System.currentTimeMillis());
+            log.info("设备验证成功, deviceCode: {}", deviceCode);
+            return ApiResult.success(response);
+        } catch (Exception e) {
+            log.error("设备验证失败, deviceCode: {}", deviceCode, e);
+            response.setDeviceCode(deviceCode);
+            response.setMessage("设备验证失败: " + e.getMessage());
+            response.setTimestamp(System.currentTimeMillis());
+            return ApiResult.error(e.getMessage());
+        }
+    }
+
+    @GetMapping("/status/{sessionId}")
+    @ResponseBody
+    public ApiResult<Map<String, Object>> getConnectionStatus(@PathVariable String sessionId) {
+        Map<String, Object> status = new HashMap<>();
+        boolean isOpen = MeetingDeviceWebSocketHandler.isSessionOpen(sessionId);
+        String deviceCode = MeetingDeviceWebSocketHandler.getDeviceCodeBySession(sessionId);
+        status.put("sessionId", sessionId);
+        status.put("deviceCode", deviceCode);
+        status.put("isOpen", isOpen);
+        status.put("checkTime", LocalDateTime.now().toString());
+        return ApiResult.success(status);
+    }
+
+    @GetMapping("/close/{sessionId}")
+    @ResponseBody
+    public ApiResult<Void> closeConnection(@PathVariable String sessionId) {
+        MeetingDeviceWebSocketHandler.removeSession(sessionId);
+        log.info("WebSocket连接已手动关闭, sessionId: {}", sessionId);
+        return ApiResult.success();
+    }
+}

service-meeting/service-meeting-biz/src/main/java/com/usky/meeting/websocket/MeetingDeviceWebSocketHandler.java

@@ -0,0 +1,76 @@
+package com.usky.meeting.websocket;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Component;
+import org.springframework.web.socket.CloseStatus;
+import org.springframework.web.socket.TextMessage;
+import org.springframework.web.socket.WebSocketSession;
+import org.springframework.web.socket.handler.TextWebSocketHandler;
+
+import java.io.IOException;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+@Slf4j
+//@Component
+public class MeetingDeviceWebSocketHandler extends TextWebSocketHandler {
+
+    private static final Map<String, WebSocketSession> SESSION_MAP = new ConcurrentHashMap<>();
+    private static final Map<String, String> SESSION_DEVICE_MAP = new ConcurrentHashMap<>();
+
+    @Override
+    public void afterConnectionEstablished(WebSocketSession session) throws Exception {
+        String sessionId = session.getId();
+        String deviceCode = (String) session.getAttributes().get("deviceCode");
+        SESSION_MAP.put(sessionId, session);
+        if (deviceCode != null) {
+            SESSION_DEVICE_MAP.put(sessionId, deviceCode);
+        }
+        log.info("WebSocket连接已建立, sessionId: {}, deviceCode: {}", sessionId, deviceCode);
+    }
+
+    @Override
+    protected void handleTextMessage(WebSocketSession session, TextMessage message) throws Exception {
+        String payload = message.getPayload();
+        log.info("收到消息, sessionId: {}, message: {}", session.getId(), payload);
+        String deviceCode = SESSION_DEVICE_MAP.get(session.getId());
+        session.sendMessage(new TextMessage("{\"type\":\"ack\",\"deviceCode\":\"" + deviceCode + "\",\"message\":\"消息已收到\"}"));
+    }
+
+    @Override
+    public void afterConnectionClosed(WebSocketSession session, CloseStatus status) throws Exception {
+        String sessionId = session.getId();
+        SESSION_MAP.remove(sessionId);
+        SESSION_DEVICE_MAP.remove(sessionId);
+        log.info("WebSocket连接已关闭, sessionId: {}, status: {}", sessionId, status);
+    }
+
+    @Override
+    public void handleTransportError(WebSocketSession session, Throwable exception) throws Exception {
+        log.error("WebSocket传输错误, sessionId: {}", session.getId(), exception);
+        if (session.isOpen()) {
+            session.close();
+        }
+    }
+
+    public static void sendMessage(String sessionId, String message) throws IOException {
+        WebSocketSession session = SESSION_MAP.get(sessionId);
+        if (session != null && session.isOpen()) {
+            session.sendMessage(new TextMessage(message));
+        }
+    }
+
+    public static boolean isSessionOpen(String sessionId) {
+        WebSocketSession session = SESSION_MAP.get(sessionId);
+        return session != null && session.isOpen();
+    }
+
+    public static void removeSession(String sessionId) {
+        SESSION_MAP.remove(sessionId);
+        SESSION_DEVICE_MAP.remove(sessionId);
+    }
+
+    public static String getDeviceCodeBySession(String sessionId) {
+        return SESSION_DEVICE_MAP.get(sessionId);
+    }
+}

service-pm/service-pm-biz/src/main/java/com/usky/pm/service/impl/PmTimeConfServiceImpl.java

@@ -66,7 +66,7 @@ public class PmTimeConfServiceImpl extends AbstractCrudService<PmTimeConfMapper,
         // 查询时间配置
         PmTimeConf timeConf = getTimeConf(tenantId);
         if (timeConf == null) {
-            throw new RuntimeException("未找到工作报提交统计告时间配置，请联系管理员");
+            throw new BusinessException("未找到工作报提交统计告时间配置，请联系管理员");
         } else if (countDate.equals(LocalDate.now()) && timeConf.getStartTime().isAfter(LocalTime.now()) || countDate.isAfter(LocalDate.now())) {
             responseVO.setSubmitOnTime(0);
             responseVO.setSubmitLate(0);

service-transfer/pom.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>usky-modules</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-transfer</artifactId>
+    <packaging>pom</packaging>
+    <modules>
+        <module>service-transfer-biz</module>
+        <module>service-transfer-api</module>
+  </modules>
+
+</project>

service-transfer/service-transfer-api/pom.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-transfer</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-transfer-api</artifactId>
+    <!-- SpringCloud Openfeign -->
+    <dependencies>
+        <dependency>
+            <groupId>org.springframework.cloud</groupId>
+            <artifactId>spring-cloud-starter-openfeign</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>usky-common-core</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+    </build>
+
+</project>

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/RemoteTransferService.java

@@ -0,0 +1,33 @@
+package com.usky.transfer;
+
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.transfer.domain.*;
+import com.usky.transfer.factory.RemoteTransferFallbackFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.Map;
+
+@FeignClient(contextId = "remoteTransferService", value = "service-transfer", fallbackFactory = RemoteTransferFallbackFactory.class)
+public interface RemoteTransferService {
+
+    /**
+     * 单个设备数据写入
+     * @return
+     */
+    @PostMapping("/sendDeviceData")
+    ApiResult<Void> sendDeviceData(@RequestBody DeviceDataWriteVO writeVO);
+
+    @PostMapping("/deleteProductCache")
+    ApiResult<Void> deleteProductCache();
+    @PostMapping("/deleteDeviceCache")
+    ApiResult<Void> deleteDeviceCache(@RequestParam("productCode") String productCode);
+
+    /**
+     * 下发单个设备控制命令
+     */
+    @PostMapping("/deviceControl")
+    Map<String,Object> deviceControl(@RequestParam("productCode") String productCode, @RequestParam(value = "deviceUuid",required = false) String deviceUuid, @RequestParam("commandStr") String commandStr,@RequestParam(value = "tenantId") Integer tenantId, @RequestParam(value = "userId") Long userId, @RequestParam(value = "userName") String userName);
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/DeviceDataInfoVO.java

@@ -0,0 +1,41 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DeviceDataInfoVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 属性值集合
+     */
+    private Map<String,Object> metrics;
+
+    /**
+     * 标签集合
+     */
+    private Map<String,Object> tags;
+
+    /**
+     * 设备编号
+     */
+    private String deviceUUId;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 数据上报时间
+     */
+    private long timestamp;
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/DeviceDataWriteVO.java

@@ -0,0 +1,43 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DeviceDataWriteVO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备UUId
+     */
+    private String deviceUUId;
+
+    /**
+     * 数据上报时间
+     */
+    private Long timestamp;
+
+    /**
+     * 标签集合
+     */
+    private Map<String,String> tags;
+
+    /**
+     * 属性值集合
+     */
+    private Map<String,Object> metrics;
+
+}
+

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/HistoryRequestVO.java

@@ -0,0 +1,30 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class HistoryRequestVO implements Serializable {
+
+    /**
+     * 产品编码
+     */
+    private String  productCode;
+
+    /**
+     * 设备Id
+     */
+    private List<String> deviceId;
+
+    /**
+     * 开始时间
+     */
+    private String startTime;
+
+    /**
+     * 结束时间
+     */
+    private String endTime;
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/HistoryResultVO.java

@@ -0,0 +1,19 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class HistoryResultVO implements Serializable {
+    private String deviceId;
+    private List<MetricVO> metrics;
+
+    public HistoryResultVO(String devId,List<MetricVO> metrics){
+        this.deviceId = devId;
+        this.metrics = metrics;
+    }
+
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/LastRequestVO.java

@@ -0,0 +1,20 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+@Data
+public class LastRequestVO implements Serializable {
+
+    /**
+     * 产品编码
+     */
+    private String  productCode;
+
+    /**
+     * 设备Id
+     */
+    private List<String> deviceId;
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/LastResultVO.java

@@ -0,0 +1,20 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class LastResultVO implements Serializable {
+
+    private String deviceId;
+    private List<Map<String,Object>> metrics;
+
+    public LastResultVO(String devId,List<Map<String,Object>> metrics){
+        this.deviceId = devId;
+        this.metrics = metrics;
+    }
+
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/MetricVO.java

@@ -0,0 +1,20 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class MetricVO implements Serializable {
+
+    private String metric;
+    private List<Map<String,Object>> metricItems;
+
+    public MetricVO(String metric,List<Map<String,Object>> metricItems){
+        this.metric = metric;
+        this.metricItems = metricItems;
+    }
+
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/domain/MqttDeviceDataVO.java

@@ -0,0 +1,18 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+
+import java.io.Serializable;
+
+@Data
+public class MqttDeviceDataVO implements Serializable {
+    /**
+     * topic
+     */
+    private String topic;
+
+    /**
+     * 设备数据体
+     */
+    private String deviceData;
+}

service-transfer/service-transfer-api/src/main/java/com/usky/transfer/factory/RemoteTransferFallbackFactory.java

@@ -0,0 +1,52 @@
+package com.usky.transfer.factory;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.transfer.RemoteTransferService;
+import com.usky.transfer.domain.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+import java.util.Map;
+
+
+/**
+ * 用户服务降级处理
+ *
+ * @author ruoyi
+ */
+@Component
+public class RemoteTransferFallbackFactory implements FallbackFactory<RemoteTransferService>
+{
+    private static final Logger log = LoggerFactory.getLogger(RemoteTransferFallbackFactory.class);
+
+    @Override
+    public RemoteTransferService create(Throwable throwable)
+    {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new RemoteTransferService() {
+            @Override
+            public ApiResult<Void> sendDeviceData(DeviceDataWriteVO writeVO) {
+                throw new BusinessException(throwable.getMessage());
+            }
+            @Override
+            public ApiResult<Void> deleteProductCache() {
+                throw new BusinessException(throwable.getMessage());
+            }
+            @Override
+            public ApiResult<Void> deleteDeviceCache(String productCode) {
+                throw new BusinessException(throwable.getMessage());
+            }
+            @Override
+            public Map<String,Object> deviceControl(String productCode, String deviceUuid, String commandStr,Integer tenantId, Long userId, String userName) {
+                throw new BusinessException(throwable.getMessage());
+            }
+        };
+    }
+}

service-transfer/service-transfer-biz/pom.xml

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>service-transfer</artifactId>
+        <groupId>com.usky</groupId>
+        <version>0.0.1</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>service-transfer-biz</artifactId>
+    <dependencies>
+        <!--MQTT依赖-->
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.springframework.integration</groupId>
+            <artifactId>spring-integration-mqtt</artifactId>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>common-cloud-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-configuration-processor</artifactId>
+            <optional>true</optional>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <!-- Pagehelper -->
+        <dependency>
+            <groupId>com.github.pagehelper</groupId>
+            <artifactId>pagehelper-spring-boot-starter</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>ruoyi-common-swagger</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>com.alibaba</groupId>
+            <artifactId>fastjson</artifactId>
+            <version>1.2.28</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.rocketmq</groupId>
+            <artifactId>rocketmq-spring-boot-starter</artifactId>
+            <version>2.1.1</version>
+        </dependency>
+        <!-- InfluxDB Java 客户端，用于连接和操作 InfluxDB 数据库 -->
+        <dependency>
+            <groupId>org.influxdb</groupId>
+            <artifactId>influxdb-java</artifactId>
+            <version>2.23</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-transfer-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+        <dependency>
+            <groupId>com.usky</groupId>
+            <artifactId>service-tsdb-api</artifactId>
+            <version>0.0.1</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <finalName>${project.artifactId}</finalName>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>2.2.6.RELEASE</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>repackage</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>com.github.shalousun</groupId>
+                <artifactId>smart-doc-maven-plugin</artifactId>
+                <version>2.1.1</version>
+                <configuration>
+                    <!--指定生成文档的使用的配置文件,配置文件放在自己的项目中-->
+                    <configFile>./src/main/resources/smart-doc.json</configFile>
+                    <!--指定项目名称-->
+                    <projectName>test</projectName>
+                    <!--                    <excludes>-->
+                    <!--                        <exclude>com.bizmatics:product-service-provider</exclude>-->
+                    <!--                        <exclude>cn.afterturn:easypoi-web</exclude>-->
+                    <!--                    </excludes>-->
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/ApplicationRun.java

@@ -0,0 +1,51 @@
+package com.usky.transfer;
+
+
+import com.ruoyi.common.swagger.annotation.EnableCustomSwagger2;
+import org.mybatis.spring.annotation.MapperScan;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.cache.annotation.EnableCaching;
+import org.springframework.cloud.openfeign.EnableFeignClients;
+import org.springframework.context.ConfigurableApplicationContext;
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.core.env.Environment;
+import springfox.documentation.swagger2.annotations.EnableSwagger2;
+
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
+/**
+ * 应用启动模块
+ * 
+ */
+
+
+@EnableCaching
+@EnableCustomSwagger2
+//@EnableSwagger2
+@EnableFeignClients(basePackages = "com.usky")
+@MapperScan(value = "com.usky.transfer.mapper")
+@ComponentScan("com.usky")
+@SpringBootApplication
+public class ApplicationRun
+{
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(ApplicationRun.class);
+
+    public static void main(String[] args) throws UnknownHostException {
+        ConfigurableApplicationContext application = SpringApplication.run(ApplicationRun.class, args);
+        Environment env = application.getEnvironment();
+        String ip = InetAddress.getLocalHost().getHostAddress();
+        String port = env.getProperty("server.port");
+        String path = env.getProperty("server.servlet.context-path");
+        LOGGER.info("\n----------------------------------------------------------\n\t" +
+                "Application is running! Access URLs:\n\t" +
+                "Local: \t\thttp://localhost:" + port + (null==path?"":path) + "/\n\t" +
+                "External: \thttp://" + ip + ":" + port + (null==path?"":path) + "/\n\t" +
+                "Api: \t\thttp://" + ip + ":" + port + (null==path?"":path) + "/swagger-ui/index.html\n\t" +
+                "----------------------------------------------------------");
+    }
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/MybatisGenerator.java

@@ -0,0 +1,107 @@
+package com.usky.transfer;//package com.usky.demo.controller;//package com.usky.dm.controller.web.business;//package com.usky.dm.controller.web;
+
+
+
+import com.baomidou.mybatisplus.core.toolkit.StringPool;
+import com.baomidou.mybatisplus.generator.AutoGenerator;
+import com.baomidou.mybatisplus.generator.InjectionConfig;
+import com.baomidou.mybatisplus.generator.config.*;
+import com.baomidou.mybatisplus.generator.config.po.TableInfo;
+import com.baomidou.mybatisplus.generator.config.rules.NamingStrategy;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ */
+public class MybatisGenerator {
+    public static void main(String[] args) {
+
+            shell("service-transfer","service-transfer-biz");
+    }
+
+    private static void shell(String parentName,String model) {
+
+        AutoGenerator mpg = new AutoGenerator();
+        //1、全局配置
+        GlobalConfig gc = new GlobalConfig();
+//        File file = new File(model);
+//        String path = file.getAbsolutePath();
+        String projectPath = System.getProperty("user.dir");
+        projectPath+="/"+parentName;
+        projectPath+="/"+model;
+        gc.setOutputDir(projectPath+ "/src/main/java");  //生成路径(一般都是生成在此项目的src/main/java下面)
+        //修改为自己的名字
+        gc.setAuthor("ya"); //设置作者
+        gc.setOpen(false);
+        gc.setFileOverride(true); //第二次生成会把第一次生成的覆盖掉
+        gc.setServiceName("%sService"); //生成的service接口名字首字母是否为I，这样设置就没有
+        gc.setBaseResultMap(true); //生成resultMap
+        mpg.setGlobalConfig(gc);
+
+        //2、数据源配置
+        //修改数据源
+        DataSourceConfig dsc = new DataSourceConfig();
+        dsc.setUrl("jdbc:mysql://192.168.10.165:3306/usky-cloud?useUnicode=true&serverTimezone=GMT&useSSL=false&characterEncoding=utf8");
+        dsc.setDriverName("com.mysql.jdbc.Driver");
+        dsc.setUsername("root");
+        dsc.setPassword("yt123456");
+        mpg.setDataSource(dsc);
+
+        // 3、包配置
+        PackageConfig pc = new PackageConfig();
+        pc.setParent("com.usky.transfer");
+        pc.setController("controller.web");
+        pc.setEntity("domain");
+        pc.setMapper("mapper");
+        pc.setService("service");
+        pc.setServiceImpl("service.impl");
+//        pc.setXml("mapper.demo");
+        //pc.setModuleName("test");
+        mpg.setPackageInfo(pc);
+
+        // 4、策略配置
+        StrategyConfig strategy = new StrategyConfig();
+        strategy.setNaming(NamingStrategy.underline_to_camel);
+        strategy.setColumnNaming(NamingStrategy.underline_to_camel);
+        strategy.setSuperMapperClass("com.usky.common.mybatis.core.CrudMapper");
+        strategy.setSuperServiceClass("com.usky.common.mybatis.core.CrudService");
+        strategy.setSuperServiceImplClass("com.usky.common.mybatis.core.AbstractCrudService");
+        // strategy.setTablePrefix("t_"); // 表名前缀
+        strategy.setEntityLombokModel(true); //使用lombok
+        //修改自己想要生成的表
+        strategy.setInclude("dmp_product_attribute");  // 逆向工程使用的表   如果要生成多个,这里可以传入String[]
+        mpg.setStrategy(strategy);
+
+        // 关闭默认 xml 生成，调整生成 至 根目录
+        //修改对应的模块名称
+        TemplateConfig tc = new TemplateConfig();
+        // 自定义配置
+        InjectionConfig cfg = new InjectionConfig() {
+            @Override
+            public void initMap() {
+                // to do nothing
+            }
+        };
+        //如果模板引擎是 velocity
+        String templatePath = "/templates/mapper.xml.vm";
+        // 自定义输出配置
+        List<FileOutConfig> focList = new ArrayList<>();
+        // 自定义配置会被优先输出
+        String finalProjectPath = projectPath;
+        focList.add(new FileOutConfig(templatePath) {
+            @Override
+            public String outputFile(TableInfo tableInfo) {
+                // 自定义输出文件名 ， 如果你 Entity 设置了前后缀、此处注意 xml 的名称会跟着发生变化！！
+                return finalProjectPath + "/src/main/resources/mapper/transfer" + "/"
+                        + tableInfo.getEntityName() + "Mapper" + StringPool.DOT_XML;
+            }
+        });
+        cfg.setFileOutConfigList(focList);
+        mpg.setCfg(cfg);
+        tc.setXml(null);
+        mpg.setTemplate(tc);
+        //5、执行
+        mpg.execute();
+    }
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/controller/api/DataTransferControllerApi.java

@@ -0,0 +1,56 @@
+package com.usky.transfer.controller.api;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.transfer.RemoteTransferService;
+import com.usky.transfer.domain.*;
+import com.usky.transfer.service.DmpProductService;
+import com.usky.transfer.service.QueryInfluxdbDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+@RestController
+public class DataTransferControllerApi implements RemoteTransferService {
+
+    @Autowired
+    private QueryInfluxdbDataService queryInfluxdbDataService;
+    @Autowired
+    private DmpProductService dmpProductService;
+
+    /**
+     * 删除产品缓存信息
+     */
+    @Override
+    public ApiResult<Void> deleteProductCache(){
+        dmpProductService.deleteProductCache();
+        return ApiResult.success();
+    }
+
+    /**
+     * 删除设备缓存信息
+     */
+    @Override
+    public ApiResult<Void> deleteDeviceCache(String productCode){
+        dmpProductService.deleteDeviceCache(productCode);
+        return ApiResult.success();
+    }
+
+    /**
+     * 单个设备数据写入
+     * @return
+     */
+    @Override
+    public ApiResult<Void> sendDeviceData(DeviceDataWriteVO writeVO){
+        queryInfluxdbDataService.sendDeviceDataToMQ(writeVO);
+        return ApiResult.success();
+    }
+
+    /**
+     * 下发单个设备控制命令
+     */
+    @Override
+    public Map<String,Object> deviceControl(String productCode, String deviceUuid, String commandStr,Integer tenantId, Long userId, String userName){
+        return queryInfluxdbDataService.deviceControl(productCode, deviceUuid, commandStr, tenantId, userId, userName);
+    }
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/controller/web/QueryDeviceDataController.java

@@ -0,0 +1,209 @@
+package com.usky.transfer.controller.web;
+
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.usky.common.core.bean.ApiResult;
+import com.usky.common.core.bean.CommonPage;
+import com.usky.common.core.exception.BusinessException;
+import com.usky.demo.RemoteTsdbProxyService;
+import com.usky.demo.domain.*;
+import com.usky.transfer.domain.DmpDevice;
+import com.usky.transfer.domain.DmpDeviceCommand;
+import com.usky.transfer.service.DmpDeviceCommandService;
+import com.usky.transfer.service.DmpDeviceService;
+import com.usky.transfer.service.vo.DeviceMapVO;
+import com.usky.transfer.service.vo.ExternalHistoryRequestVO;
+import com.usky.transfer.service.vo.ExternalLastRequestVO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.cache.annotation.Cacheable;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@RestController
+@RequestMapping("dataQuery")
+public class QueryDeviceDataController {
+    @Autowired
+    private RemoteTsdbProxyService remoteTsdbProxyService;
+    @Autowired
+    private DmpDeviceService dmpDeviceService;
+    @Autowired
+    private DmpDeviceCommandService dmpDeviceCommandService;
+
+    @Cacheable(cacheNames = "externalDeviceList",sync = true)
+    public Map<String, DeviceMapVO> getExternalDeviceMap(){
+        Map<String,DeviceMapVO> deviceMap = new HashMap<>();
+        LambdaQueryWrapper<DmpDevice> queryWrapper = Wrappers.lambdaQuery();
+        queryWrapper.eq(DmpDevice::getDeleteFlag,0)
+                .orderByDesc(DmpDevice::getId);
+        List<DmpDevice> list = dmpDeviceService.list(queryWrapper);
+        if(CollectionUtils.isNotEmpty(list)){
+            for (int i = 0; i < list.size(); i++) {
+                String deviceId = list.get(i).getDeviceId();
+                DeviceMapVO mapVO = new DeviceMapVO();
+                mapVO.setProductCode(list.get(i).getProductCode());
+                mapVO.setDeviceId(list.get(i).getDeviceId());
+                mapVO.setDeviceUuid(list.get(i).getDeviceUuid());
+                mapVO.setDeviceStatus(list.get(i).getServiceStatus());
+
+                deviceMap.put(deviceId,mapVO);
+            }
+        }
+
+        return deviceMap;
+    }
+
+//    /**
+//     * 单个设备实时数据查询(对外)
+//     * @param productCode
+//     * @param deviceId
+//     * @return
+//     */
+//    @GetMapping("/externalLast")
+//    public ApiResult<LastResultVO> queryLastDeviceData(@RequestParam(value = "productCode") String productCode,
+//                                                       @RequestParam(value = "deviceId") String deviceId){
+//        Map<String, DeviceMapVO> deviceMapList = this.getExternalDeviceMap();
+//        if(!deviceMapList.containsKey(deviceId)){
+//            throw new BusinessException(deviceId+"无设备信息");
+//        }
+//
+//        String deviceUUId = "";
+//
+//        for (Map.Entry<String,DeviceMapVO> map:deviceMapList.entrySet()) {
+//            String productCode1 = map.getValue().getProductCode();
+//            String deviceId1 = map.getKey();
+//            if((productCode.equals(productCode1)) && (deviceId.equals(deviceId1))){
+//                deviceUUId = map.getValue().getDeviceUuid();
+//            }
+//        }
+//
+//        return ApiResult.success(remoteTsdbProxyService.queryLastDeviceData(deviceUUId));
+//    }
+
+    /**
+     * 批量设备实时数据查询(对外)
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("/externalLast")
+    public ApiResult<List<LastInnerResultVO>> queryLastDeviceData(@RequestBody ExternalLastRequestVO requestVO){
+        Map<String, DeviceMapVO> deviceMapList = this.getExternalDeviceMap();
+        LastInnerQueryVO reqVO = new LastInnerQueryVO();
+
+        String productCode = requestVO.getProductCode();
+        List<String> deviceIds = requestVO.getDeviceId();
+        List<String> deviceUUIds = new ArrayList<>();
+        for (int i = 0; i < deviceIds.size(); i++) {
+            String deviceId = deviceIds.get(i);
+            if(!deviceMapList.containsKey(deviceId)){
+                throw new BusinessException(deviceId+"无设备信息");
+            }
+
+            for (Map.Entry<String,DeviceMapVO> map:deviceMapList.entrySet()) {
+                String productCode1 = map.getValue().getProductCode();
+                String deviceId1 = map.getKey();
+                if((productCode.equals(productCode1)) && (deviceId.equals(deviceId1))){
+                    deviceUUIds.add(map.getValue().getDeviceUuid());
+
+                }
+            }
+        }
+        reqVO.setDeviceuuid(deviceUUIds);
+
+        return ApiResult.success(remoteTsdbProxyService.queryLastDeviceData(reqVO));
+    }
+
+//    /**
+//     * 单个设备历史数据查询(对外)
+//     * @param productCode
+//     * @param deviceId
+//     * @param startTime
+//     * @param endTime
+//     * @return
+//     */
+//    @GetMapping("/externalHistory")
+//    public ApiResult<HistoryResultVO> queryHistoryDeviceData(@RequestParam(value = "productCode") String productCode,
+//                                                             @RequestParam(value = "deviceId") String deviceId,
+//                                                             @RequestParam(value = "startTime") String startTime,
+//                                                             @RequestParam(value = "endTime") String endTime){
+//        Map<String, DeviceMapVO> deviceMapList = this.getExternalDeviceMap();
+//        if(!deviceMapList.containsKey(deviceId)){
+//            throw new BusinessException(deviceId+"无设备信息");
+//        }
+//
+//        String deviceUUId = "";
+//
+//        for (Map.Entry<String,DeviceMapVO> map:deviceMapList.entrySet()) {
+//            String productCode1 = map.getValue().getProductCode();
+//            String deviceId1 = map.getKey();
+//            if((productCode.equals(productCode1)) && (deviceId.equals(deviceId1))){
+//                deviceUUId = map.getValue().getDeviceUuid();
+//            }
+//        }
+//
+//        return ApiResult.success(remoteTsdbProxyService.queryHistoryDeviceData(deviceUUId,startTime,endTime));
+//    }
+
+    /**
+     * 批量设备历史数据查询(对外)
+     * @param requestVO
+     * @return
+     */
+    @PostMapping("/externalHistory")
+    public ApiResult<List<HistorysInnerResultVO>> queryHistoryDeviceData(@RequestBody ExternalHistoryRequestVO requestVO){
+        Map<String, DeviceMapVO> deviceMapList = this.getExternalDeviceMap();
+        HistorysInnerRequestVO reqVO = new HistorysInnerRequestVO();
+
+        String productCode = requestVO.getProductCode();
+        List<String> deviceIds = requestVO.getDeviceId();
+        List<String> deviceUUIds = new ArrayList<>();
+        for (int i = 0; i < deviceIds.size(); i++) {
+            String deviceId = deviceIds.get(i);
+            if(!deviceMapList.containsKey(deviceId)){
+                throw new BusinessException(deviceId+"无设备信息");
+            }
+
+            for (Map.Entry<String,DeviceMapVO> map:deviceMapList.entrySet()) {
+                String productCode1 = map.getValue().getProductCode();
+                String deviceId1 = map.getKey();
+                if((productCode.equals(productCode1)) && (deviceId.equals(deviceId1))){
+                    deviceUUIds.add(map.getValue().getDeviceUuid());
+
+                }
+            }
+        }
+        reqVO.setDeviceuuid(deviceUUIds);
+        reqVO.setStartTime(requestVO.getStartTime());
+        reqVO.setEndTime(requestVO.getEndTime());
+
+        return ApiResult.success(remoteTsdbProxyService.queryHistoryDeviceData(reqVO));
+    }
+
+    /**
+     * 指令记录
+     * @param commandStatus
+     * @param productCode
+     * @param deviceId
+     * @param userName
+     * @param startTime
+     * @param endTime
+     * @param pageNum
+     * @param pageSize
+     * @return
+     */
+    @GetMapping("deviceCommandRecord")
+    public ApiResult<CommonPage<DmpDeviceCommand>> deviceCommandRecord(@RequestParam(value = "commandStatus",required = false) Integer commandStatus,
+                                                                       @RequestParam(value = "productCode",required = false) String productCode,
+                                                                       @RequestParam(value = "deviceUuid",required = false) String deviceUuid,
+                                                                       @RequestParam(value = "userName",required = false) String userName,
+                                                                       @RequestParam(value = "startTime",required = false) String startTime,
+                                                                       @RequestParam(value = "endTime",required = false) String endTime,
+                                                                       @RequestParam(value = "pageNum", required = false, defaultValue = "1") Integer pageNum,
+                                                                       @RequestParam(value = "pageSize", required = false, defaultValue = "10") Integer pageSize){
+        return ApiResult.success(dmpDeviceCommandService.deviceCommandRecord(commandStatus,productCode,deviceUuid,userName,startTime,endTime,pageNum,pageSize));
+    }
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/controller/web/SendMessageController.java

@@ -0,0 +1,43 @@
+package com.usky.transfer.controller.web;
+
+import com.usky.common.core.bean.ApiResult;
+import com.usky.transfer.domain.DeviceDataWriteVO;
+import com.usky.transfer.domain.MqttDeviceDataVO;
+import com.usky.transfer.service.QueryInfluxdbDataService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Map;
+
+/**
+ * @Author :
+ * @CreateTime : 2024/2/29
+ * @Description :
+ **/
+@RestController
+@RequestMapping("/dataWrite")
+public class SendMessageController {
+    @Autowired
+    private QueryInfluxdbDataService queryInfluxdbDataService;
+
+    /**
+     * 单个设备数据写入
+     * @return
+     */
+    @PostMapping("/sendDeviceData")
+    public ApiResult<Map<String,Object>> sendDeviceData(@RequestBody DeviceDataWriteVO writeVO){
+        return ApiResult.success(queryInfluxdbDataService.sendDeviceDataToMQ(writeVO));
+    }
+
+    /**
+     * MQTT设备数据上报调试
+     * @param mqttDeviceDataVO
+     * @return
+     */
+    @PostMapping("/mqttDeviceData")
+    public ApiResult<Map<String,Object>> mqttDeviceData(@RequestBody MqttDeviceDataVO mqttDeviceDataVO){
+        return ApiResult.success(queryInfluxdbDataService.mqttDeviceData(mqttDeviceDataVO));
+    }
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/DmpDevice.java

@@ -0,0 +1,151 @@
+package com.usky.transfer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDevice implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 设备名称
+     */
+    private String deviceName;
+
+    /**
+     * 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     */
+    private Integer deviceType;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 物联网卡号
+     */
+    private String simCode;
+
+    /**
+     * 国际移动用户识别码
+     */
+    private String imsiCode;
+
+    /**
+     * 自动订阅标识（0：否，1：是）
+     */
+    private Integer subscribeFlag;
+
+    /**
+     * 节点类型
+     */
+    private Integer nodeType;
+
+    /**
+     * 分组id
+     */
+    private Integer groupId;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 单位编号
+     */
+    private String companyCode;
+
+    /**
+     * 安装位置
+     */
+    private String installAddress;
+
+    /**
+     * 业务状态;1：未激活，2：已激活，3：禁用
+     */
+    private Integer serviceStatus;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备uuid
+     */
+    private String deviceUuid;
+
+    /**
+     * 经度
+     */
+    private String longitude;
+
+    /**
+     * 纬度
+     */
+    private String latitude;
+
+    /**
+     * 设备所属类型（1、普通设备  2、网关设备  3、网关子设备）
+     */
+    private Integer categoryType;
+
+    /**
+     * 所属网关
+     */
+    private String gatewayUuid;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/DmpDeviceCommand.java

@@ -0,0 +1,96 @@
+package com.usky.transfer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 创建下发命令历史记录表
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-24
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDeviceCommand implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备Uuid
+     */
+    private String deviceUuid;
+
+    /**
+     * 下发命令内容
+     */
+    private String commandContent;
+
+    /**
+     * 下发命令响应内容
+     */
+    private String commandResponse;
+
+    /**
+     * 命令状态;0 命令执行中，1 命令成功，2 命令失败
+     */
+    private Integer commandStatus;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 组织结构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+    /**
+     * 操作人
+     */
+    private String userName;
+
+    /**
+     * 操作人Id
+     */
+    private Long userId;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/DmpDeviceStatus.java

@@ -0,0 +1,66 @@
+package com.usky.transfer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 设备状态表
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpDeviceStatus implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID;设备注册时系统自动生成一个唯一编号
+     */
+    private String deviceId;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 设备状态;1：在线，2：离线
+     */
+    private Integer deviceStatus;
+
+    /**
+     * 最后上线时间
+     */
+    private LocalDateTime lastOnlineTime;
+
+    /**
+     * 最后离线时间
+     */
+    private LocalDateTime lastOfflineTime;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 设备uuid
+     */
+    private String deviceUuid;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/DmpProduct.java

@@ -0,0 +1,141 @@
+package com.usky.transfer.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品信息表
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProduct implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品名称
+     */
+    private String productName;
+
+    /**
+     * 接入方式（1、设备直连  2、网关接入）
+     */
+    private Integer accessMode;
+
+    /**
+     * 网络类型（1、WIFI  2、移动蜂窝数据 3、NB-IoT 4、以太网）
+     */
+    private Integer networkType;
+
+    /**
+     * 设备类型（501、监控系统  502、门禁系统  503、梯控系统  504、机房系统  509、环境系统  510、照明系统）
+     */
+    private Integer deviceType;
+
+    /**
+     * 通信协议（1、MQTT  2、TCP设备直连 3、HTTP）
+     */
+    private Integer comProtocol;
+
+    /**
+     * 认证方式
+     */
+    private String authMode;
+
+    /**
+     * 设备型号
+     */
+    private String deviceModel;
+
+    /**
+     * 产品描述
+     */
+    private String productDescribe;
+
+    /**
+     * 厂家名称
+     */
+    private String factoryName;
+
+    /**
+     * 厂家联系人
+     */
+    private String factoryPerson;
+
+    /**
+     * 厂家联系电话
+     */
+    private String factoryPhone;
+
+    /**
+     * 资质证书1
+     */
+    private String certificateUrl1;
+
+    /**
+     * 资质证书2
+     */
+    private String certificateUrl2;
+
+    /**
+     * 资质证书3
+     */
+    private String certificateUrl3;
+
+    /**
+     * 协议文档
+     */
+    private String agreementUrl;
+
+    /**
+     * 删除标识
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/DmpProductAttribute.java

@@ -0,0 +1,137 @@
+package com.usky.transfer.domain;
+
+import java.math.BigDecimal;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 产品属性表
+ * </p>
+ *
+ * @author ya
+ * @since 2025-02-10
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class DmpProductAttribute implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键id
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 产品ID
+     */
+    private Integer productId;
+
+    /**
+     * 属性名称
+     */
+    private String attributeName;
+
+    /**
+     * 属性标识
+     */
+    private String attributeCode;
+
+    /**
+     * 对应端口/属性ID
+     */
+    private Integer attributePort;
+
+    /**
+     * 属性类型;1：必选，2：可选
+     */
+    private Integer attributeType;
+
+    /**
+     * 数据类型（1、数值型 2、字符型 3、bool型）
+     */
+    private Integer dataType;
+
+    /**
+     * 绑定状态;1：已绑定，2：未绑定
+     */
+    private Integer bindStatus;
+
+    /**
+     * 长度
+     */
+    private Integer attributeLength;
+
+    /**
+     * 单位
+     */
+    private String attributeUnit;
+
+    /**
+     * 最大值
+     */
+    private BigDecimal maximum;
+
+    /**
+     * 最小值
+     */
+    private BigDecimal minimum;
+
+    /**
+     * 时间格式
+     */
+    private String timeFormat;
+
+    /**
+     * 布尔值false
+     */
+    private String boolFalse;
+
+    /**
+     * 布尔值true
+     */
+    private String boolTrue;
+
+    /**
+     * 删除标识;0：未删除，1：已删除
+     */
+    private Integer deleteFlag;
+
+    /**
+     * 描述
+     */
+    private String attributeDescribe;
+
+    /**
+     * 创建人
+     */
+    private String createdBy;
+
+    /**
+     * 创建时间
+     */
+    private LocalDateTime createdTime;
+
+    /**
+     * 更新人
+     */
+    private String updatedBy;
+
+    /**
+     * 更新时间
+     */
+    private LocalDateTime updatedTime;
+
+    /**
+     * 租户号
+     */
+    private Integer tenantId;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/domain/QueryInfluxdbData.java

@@ -0,0 +1,27 @@
+package com.usky.transfer.domain;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author ya
+ * @since 2024-07-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class QueryInfluxdbData implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    private String influxdbName;
+
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/DmpDeviceCommandMapper.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.mapper;
+
+import com.usky.transfer.domain.DmpDeviceCommand;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 创建下发命令历史记录表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-24
+ */
+public interface DmpDeviceCommandMapper extends CrudMapper<DmpDeviceCommand> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/DmpDeviceMapper.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.transfer.domain.DmpDevice;
+
+/**
+ * <p>
+ * 设备信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+public interface DmpDeviceMapper extends CrudMapper<DmpDevice> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/DmpDeviceStatusMapper.java

@@ -0,0 +1,19 @@
+package com.usky.transfer.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.transfer.domain.DmpDeviceStatus;
+
+import java.util.Date;
+import java.util.List;
+
+
+/**
+ * <p>
+ * 设备状态表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2022-10-08
+ */
+public interface DmpDeviceStatusMapper extends CrudMapper<DmpDeviceStatus> {
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/DmpProductAttributeMapper.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.mapper;
+
+import com.usky.transfer.domain.DmpProductAttribute;
+import com.usky.common.mybatis.core.CrudMapper;
+
+/**
+ * <p>
+ * 产品属性表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2025-02-10
+ */
+public interface DmpProductAttributeMapper extends CrudMapper<DmpProductAttribute> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/DmpProductMapper.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.transfer.domain.DmpProduct;
+
+/**
+ * <p>
+ * 产品信息表 Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+public interface DmpProductMapper extends CrudMapper<DmpProduct> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/mapper/QueryInfluxdbDataMapper.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.mapper;
+
+import com.usky.common.mybatis.core.CrudMapper;
+import com.usky.transfer.domain.QueryInfluxdbData;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author ya
+ * @since 2024-07-29
+ */
+public interface QueryInfluxdbDataMapper extends CrudMapper<QueryInfluxdbData> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/DmpDeviceCommandService.java

@@ -0,0 +1,19 @@
+package com.usky.transfer.service;
+
+import com.usky.common.core.bean.CommonPage;
+import com.usky.transfer.domain.DmpDeviceCommand;
+import com.usky.common.mybatis.core.CrudService;
+import org.springframework.web.bind.annotation.RequestParam;
+
+/**
+ * <p>
+ * 创建下发命令历史记录表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-24
+ */
+public interface DmpDeviceCommandService extends CrudService<DmpDeviceCommand> {
+
+    CommonPage<DmpDeviceCommand> deviceCommandRecord(Integer commandStatus,String productCode,String deviceUuid,String userName,String startTime,String endTime,Integer pageNum,Integer pageSize);
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/DmpDeviceService.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.service;
+
+import com.usky.transfer.domain.DmpDevice;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 设备信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+public interface DmpDeviceService extends CrudService<DmpDevice> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/DmpDeviceStatusService.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.service;
+
+import com.usky.transfer.domain.DmpDeviceStatus;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 设备状态表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+public interface DmpDeviceStatusService extends CrudService<DmpDeviceStatus> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/DmpProductAttributeService.java

@@ -0,0 +1,16 @@
+package com.usky.transfer.service;
+
+import com.usky.transfer.domain.DmpProductAttribute;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 产品属性表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2025-02-10
+ */
+public interface DmpProductAttributeService extends CrudService<DmpProductAttribute> {
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/DmpProductService.java

@@ -0,0 +1,24 @@
+package com.usky.transfer.service;
+
+import com.usky.transfer.domain.DmpProduct;
+import com.usky.common.mybatis.core.CrudService;
+import com.usky.transfer.service.vo.DeviceMapVO;
+import com.usky.transfer.service.vo.ProductMapVO;
+
+import java.util.Map;
+
+/**
+ * <p>
+ * 产品信息表 服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2024-09-19
+ */
+public interface DmpProductService extends CrudService<DmpProduct> {
+    void deleteProductCache();
+    void deleteDeviceCache(String productCode);
+
+    Map<String, ProductMapVO> getProductMap();
+    Map<String, DeviceMapVO> getDeviceMap(String productCode);
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/QueryInfluxdbDataService.java

@@ -0,0 +1,26 @@
+package com.usky.transfer.service;
+
+import com.usky.transfer.domain.*;
+import com.usky.common.mybatis.core.CrudService;
+import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author ya
+ * @since 2024-07-29
+ */
+public interface QueryInfluxdbDataService extends CrudService<QueryInfluxdbData> {
+
+    Map<String,Object> sendDeviceDataToMQ(DeviceDataWriteVO writeVO);
+
+    Map<String,Object> mqttDeviceData(MqttDeviceDataVO mqttDeviceDataVO);
+
+    Map<String,Object> deviceControl(String productCode, String deviceUuid, String commandStr,Integer tenantId, Long userId, String userName);
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/config/CodeCache.java

@@ -0,0 +1,12 @@
+package com.usky.transfer.service.config;
+
+import org.springframework.stereotype.Component;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@Component
+public class CodeCache {
+    public static List<String> tablesList = new ArrayList<>();
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/config/TsdbConfig.java

@@ -0,0 +1,62 @@
+package com.usky.transfer.service.config;
+
+import com.usky.common.core.util.StringUtils;
+import okhttp3.OkHttpClient;
+import org.influxdb.InfluxDB;
+import org.influxdb.InfluxDBFactory;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+import java.util.concurrent.TimeUnit;
+
+@Configuration
+public class TsdbConfig {
+
+    @Value("${spring.influx.url}")
+    private String influxDBUrl;
+
+    @Value("${spring.influx.username}")
+    private String userName;
+
+    @Value("${spring.influx.password}")
+    private String password;
+    @Value("${spring.influx.retention_policy}")
+    private String retention_policy;
+
+    @Value("${spring.influx.database}")
+    private String database;
+
+    @Bean
+    public InfluxDB influxdb() {
+        InfluxDB influxDB = null;
+        if (StringUtils.isEmpty(userName)) {
+            influxDB = InfluxDBFactory.connect(influxDBUrl);
+        } else {
+            OkHttpClient.Builder client = new OkHttpClient.Builder();
+            client.readTimeout(300, TimeUnit.SECONDS);
+            influxDB = InfluxDBFactory.connect(influxDBUrl, userName, password, client);
+        }
+        try {
+
+            /**
+             * 异步插入：
+             * enableBatch这里第一个是point的个数，第二个是时间，单位毫秒
+             * point的个数和时间是联合使用的，如果满100条或者60 * 1000毫秒
+             * 满足任何一个条件就会发送一次写的请求。
+             */
+//            influxDB.setDatabase(database).enableBatch(100, 1000 * 60, TimeUnit.MILLISECONDS);
+            influxDB.setDatabase(database);
+        } catch (Exception e) {
+            e.printStackTrace();
+        } finally {
+            //设置默认策略
+            this.retention_policy = retention_policy == null || "".equals(retention_policy) ? "autogen" : retention_policy;
+            influxDB.setRetentionPolicy(retention_policy);
+        }
+        //设置日志输出级别
+        influxDB.setLogLevel(InfluxDB.LogLevel.BASIC);
+        return influxDB;
+    }
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/config/mqtt/MqttBaseConfig.java

@@ -0,0 +1,50 @@
+package com.usky.transfer.service.config.mqtt;
+
+import lombok.Data;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.stereotype.Component;
+
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
+@Data
+@Component
+@ConfigurationProperties(prefix = "mqtt")
+public class MqttBaseConfig {
+
+	@Value("${mqtt.username}")
+	private String username;
+
+	@Value("${mqtt.password}")
+	private String password;
+
+	@Value("${mqtt.url}")
+	private String hostUrl;
+
+	@Value("${mqtt.sub-topics}")
+	private String msgTopic;
+
+	@Value("${mqtt.keep-alive-interval}")
+	//心跳间隔
+	private int keepAliveInterval;
+	@Value("${mqtt.completionTimeout}")
+	//心跳间隔
+	private int completionTimeout;
+
+
+	@Bean
+	public MqttPahoClientFactory mqttClientFactory() {
+		DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
+		MqttConnectOptions options = new MqttConnectOptions();
+		options.setServerURIs(new String[]{this.getHostUrl()});
+		options.setUserName(this.getUsername());
+		options.setPassword(this.getPassword().toCharArray());
+		factory.setConnectionOptions(options);
+		return factory;
+	}
+
+}

service-transfer/service-transfer-biz/src/main/java/com/usky/transfer/service/config/mqtt/MqttInConfig.java

@@ -0,0 +1,56 @@
+package com.usky.transfer.service.config.mqtt;
+
+import com.usky.transfer.service.enums.TopListener;
+import lombok.Data;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.integration.core.MessageProducer;
+import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
+import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.stereotype.Component;
+
+import java.util.List;
+
+/**
+ * @author yq
+ * @date 2021/11/1 16:37
+ */
+@ConditionalOnProperty(prefix = "mqtt", value = {"enabled"}, havingValue = "true")
+@Configuration
+public class MqttInConfig {
+
+    @Autowired
+    private MqttBaseConfig mqttBaseConfig;
+
+    public static final String CHANNEL_NAME_INPUT = "mqttInputChannel";
+
+    @Bean(name = CHANNEL_NAME_INPUT)
+    public MessageChannel mqttInputChannel() {
+        return new DirectChannel();
+    }
+
+
+    /**
+     * 消息订阅绑定-消费者
+     *
+     * @return
+     */
+    @Bean
+    public MessageProducer inbound() {
+        String[] tops = mqttBaseConfig.getMsgTopic().split(",");
+        String clientId = "h-transfer-mqtt-in-" + System.currentTimeMillis();
+        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(clientId,
+                mqttBaseConfig.mqttClientFactory(), tops);
+        adapter.setCompletionTimeout(mqttBaseConfig.getCompletionTimeout());
+        adapter.setConverter(new DefaultPahoMessageConverter());
+        adapter.setQos(2);
+        adapter.setOutputChannel(mqttInputChannel());
+        return adapter;
+    }
+}