Merge branch 'dev/0.9_cockpit' into dev/1.0_reportExport

# Conflicts:
#	.claude/settings.local.json
#	bin/script/send_modbus_and_register.py

bin/script/send_modbus_and_register.py

@@ -6,14 +6,17 @@ from binascii import unhexlify
 TARGET_HOST = 'localhost'   # 请根据实际情况修改
 TARGET_PORT = 8888          # 请根据实际情况修改
 
-# 元数组 modbus 指令
+# 元数组 modbus 指令  DEF7B23FD985  D9C6983D30F8
 MODBUS_DATA_HEX = (
- "7e80D87D8A07BCC47e",
+ "7e80DEF7B23FD9857e"
- "01031c41aa0c7941d78000402000220000000042b121523fb1fb373eb5668c9cd8",
+  "04031c41aa0c7941d78000402000220000000042b121523fb1fb373eb5668c4CDA",
- "02031c419b24c741e18000400bf3910000000042a83e6840824127c0877958c7d0",
+  "05031c419b24c741e18000400bf3910000000042a83e6840824127c08779583613",
- "03031c418eb64a41cb00003ff8d8130000000042aaaa05bf95093cc090a1de8803"
+  "06031c418eb64a41cb00003ff8d8130000000042aaaa05bf95093cc090a1de5801"
+
 )
 
+
+
 # 重要-四川远德MQTT推送 （倾角计）
 #  "7e803042593632517e",
 #  "01033041011b7b0000000041eaafb742d19bd74513d545450dd9a4450ec53d00000000420ccf64420c74a9420c74a9c2d200009d99"
@@ -27,6 +30,10 @@ MODBUS_DATA_HEX = (
 # "01031c41aa0c7941d78000402000220000000042b121523fb1fb373eb5668c9cd8",
 # "02031c419b24c741e18000400bf3910000000042a83e6840824127c0877958c7d0",
 # "03031c418eb64a41cb00003ff8d8130000000042aaaa05bf95093cc090a1de8803"
+# "04031c41aa0c7941d78000402000220000000042b121523fb1fb373eb5668c4CDA",
+# "05031c419b24c741e18000400bf3910000000042a83e6840824127c08779583613",
+# "06031c418eb64a41cb00003ff8d8130000000042aaaa05bf95093cc090a1de5801"
+
 # 01        03      1c      4268 442f 41d3 0000 418b 6685 0000 0000 4026 f4ca c00d 1fd3 c2ad 2a9d 6311
 # 从机地址   功能码   字节长度  2个字节                                                               CRC校验
 
@@ -47,6 +54,8 @@ def main():
             print("已连接。")
 
             for hex_bytes in MODBUS_DATA_HEX:
+                # 替换所有的空格
+                hex_bytes = hex_bytes.replace(" ", "")
 
                 # 0.将十六进制字符串转换为字节
                 modbus_bytes = unhexlify(hex_bytes)

docker/docker-compose.yml

@@ -72,7 +72,7 @@ services:
     logging:
       driver: "json-file"
       options:
-        max-size: "10m"
+        max-size: "50m"
         max-file: "2"
     ports:
       - 8080:8080

fastbee-admin/src/main/java/com/fastbee/web/task/LogCleanTask.java

@@ -0,0 +1,94 @@
+package com.fastbee.web.task;
+
+import com.fastbee.iot.platform.service.IPlatformPushLogService;
+import com.fastbee.iot.service.IAlertLogService;
+import com.fastbee.iot.service.IEventLogService;
+import com.fastbee.notify.service.INotifyLogService;
+import com.fastbee.quartz.service.ISysJobLogService;
+import com.fastbee.system.service.ISysLogininforService;
+import com.fastbee.system.service.ISysOperLogService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+/**
+ * 日志清理定时任务
+ *
+ * @author fastbee
+ */
+@Component("logCleanTask")
+public class LogCleanTask {
+    private static final Logger log = LoggerFactory.getLogger(LogCleanTask.class);
+
+    @Autowired
+    private IEventLogService eventLogService;
+
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @Autowired
+    private IAlertLogService alertLogService;
+
+    @Autowired
+    private ISysJobLogService jobLogService;
+
+    @Autowired
+    private INotifyLogService notifyLogService;
+
+    @Autowired
+    private IPlatformPushLogService platformPushLogService;
+
+    // 之后还有清理的表往下写
+
+    /**
+     * 清理日志（默认清理15天前）
+     */
+    public void cleanLogs() {
+        cleanLogs(15);
+    }
+
+    /**
+     * 清理日志
+     *
+     * @param days 保留天数
+     */
+    public void cleanLogs(int days) {
+        log.info("========== 开始清理日志数据，保留最近 {} 天的记录 ==========", days);
+        try {
+            // 清理 IoT 事件日志
+            eventLogService.cleanEventLog(days);
+            //log.info("已清理 iot_event_log 表 {} 天前的数据", days);
+
+            // 清理系统操作日志
+            operLogService.cleanOperLog(days);
+            //log.info("已清理 sys_oper_log 表 {} 天前的数据", days);
+
+            // 清理登录日志
+            logininforService.cleanLogininfor(days);
+            //log.info("已清理 sys_logininfor 表 {} 天前的数据", days);
+
+            // 清理设备告警日志
+            alertLogService.cleanAlertLog(days);
+            //log.info("已清理 iot_alert_log 表 {} 天前的数据", days);
+
+            // 清理定时任务日志
+            jobLogService.cleanJobLog(days);
+            //log.info("已清理 sys_job_log 表 {} 天前的数据", days);
+
+            // 清理通知日志
+            notifyLogService.cleanNotifyLog(days);
+            //log.info("已清理 notify_log 表 {} 天前的数据", days);
+
+            platformPushLogService.cleanPushLog(days);
+
+            log.info("========== 日志清理任务执行完成 ==========");
+        } catch (Exception e) {
+            log.error("日志清理任务执行失败", e);
+            throw e;
+        }
+    }
+}

fastbee-common/src/main/java/com/fastbee/common/config/DeviceTask.java

@@ -1,6 +1,7 @@
 package com.fastbee.common.config;
 
 import com.fastbee.common.constant.FastBeeConstant;
+import com.fastbee.common.trace.MdcTaskDecorator;
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.context.annotation.Bean;
@@ -60,7 +61,11 @@ public class DeviceTask {
         return builder(FastBeeConstant.TASK.FUNCTION_INVOKE_TASK);
     }
 
-    /*内部消费线程*/
+    /**
+     * 内部消费线程
+     * 监听循环从消息恢复 TraceId 并逐条清理；
+     * TaskDecorator 用于让 @Async 消费方法继承监听线程的 TraceId
+     */
     @Bean(FastBeeConstant.TASK.MESSAGE_CONSUME_TASK)
     public Executor messageConsumeTaskExecutor() {
         return builder(FastBeeConstant.TASK.MESSAGE_CONSUME_TASK);
@@ -104,7 +109,7 @@ public class DeviceTask {
     }
 
 
-    /*组装线程池*/
+    /*组装线程池（带 TaskDecorator，用于跨线程传播 TraceId）*/
     private ThreadPoolTaskExecutor builder(String threadNamePrefix) {
         ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
         executor.setCorePoolSize(coreSize);
@@ -115,6 +120,10 @@ public class DeviceTask {
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.DiscardOldestPolicy());
         //线程池名的前缀
         executor.setThreadNamePrefix(threadNamePrefix);
+
+        // 配置 TaskDecorator，自动传播 TraceId
+        executor.setTaskDecorator(new MdcTaskDecorator());
+
         executor.initialize();
         return executor;
     }

fastbee-common/src/main/java/com/fastbee/common/constant/FastBeeConstant.java

@@ -15,6 +15,8 @@ public interface FastBeeConstant {
         String MQTT = "mqtt";
         String PORT = "port";
         String ADAPTER = "adapter";
+        /** 链路追踪处理器名 */
+        String TRACE = "trace";
         String FRAMEDECODER = "frameDecoder";
         String DISPATCHER = "dispatcher";
         String DECODER = "decoder";

fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReplyBo.java

@@ -8,6 +8,9 @@ import lombok.Data;
 @Data
 public class DeviceReplyBo {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     /*设备下发消息id*/
     private String messageId;
     /*标识符*/

fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceReportBo.java

@@ -24,6 +24,9 @@ import java.util.List;
 @AllArgsConstructor
 public class DeviceReportBo {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     /*设备编号或IMEI号*/
     private String serialNumber;
     /*产品ID*/

fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceStatusBo.java

@@ -18,6 +18,10 @@ import java.util.Date;
 @Data
 @Builder
 public class DeviceStatusBo {
+
+    /** 链路追踪ID */
+    private String traceId;
+
     /**
      * 设备客户端id
      */

fastbee-common/src/main/java/com/fastbee/common/core/mq/DeviceTestReportBo.java

@@ -11,6 +11,9 @@ import java.util.List;
 @Data
 public class DeviceTestReportBo {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     private Long productId;
     /**
      * 设备编号

fastbee-common/src/main/java/com/fastbee/common/core/mq/InvokeReqDto.java

@@ -17,6 +17,9 @@ import java.util.Map;
 @Data
 public class InvokeReqDto {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     @ApiModelProperty(value = "设备编号")
     private String serialNumber;
 

fastbee-common/src/main/java/com/fastbee/common/core/mq/MQSendMessageBo.java

@@ -14,6 +14,9 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class MQSendMessageBo {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     public Boolean isShadow;
     public Long userId;
     public Long delay;

fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeBo.java

@@ -17,6 +17,9 @@ import java.math.BigDecimal;
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 public class OtaUpgradeBo {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     // 设备编码
     private String serialNumber;
     // 升级任务ID

fastbee-common/src/main/java/com/fastbee/common/core/mq/ota/OtaUpgradeDelayTask.java

@@ -17,6 +17,11 @@ import java.util.concurrent.TimeUnit;
 @Data
 public class OtaUpgradeDelayTask implements Delayed {
 
+    /**
+     * 链路追踪ID
+     */
+    private String traceId;
+
     /**
      * 固件id
      */

fastbee-common/src/main/java/com/fastbee/common/trace/MdcTaskDecorator.java

@@ -0,0 +1,75 @@
+package com.fastbee.common.trace;
+
+import com.fastbee.common.trace.TraceContext.TraceSnapshot;
+import org.springframework.core.task.TaskDecorator;
+
+import java.util.concurrent.Callable;
+
+/**
+ * 线程池 TraceId 传播装饰器
+ * 解决 @Async 异步任务 TraceId 丢失问题
+ *
+ * <p>使用方法：
+ * <pre>
+ * ThreadPoolTaskExecutor executor = new ThreadPoolTaskExecutor();
+ * executor.setTaskDecorator(new MdcTaskDecorator());
+ * </pre>
+ *
+ * <p>工作原理：
+ * <ol>
+ *   <li>在任务提交时，捕获当前线程的 TraceContext 快照</li>
+ *   <li>在任务执行时，恢复快照到新线程（MDC 由 TraceContext 统一同步）</li>
+ *   <li>在任务完成后，清理上下文防止线程池污染</li>
+ * </ol>
+ *
+ * <p>说明：MDC 的写入/清理全部由 {@link TraceContext} 统一管理，
+ * 本装饰器只负责快照与恢复，避免 MDC 与 TraceContext 双重操作导致的不一致。
+ *
+ * @author FastBee
+ */
+public class MdcTaskDecorator implements TaskDecorator {
+
+    @Override
+    public Runnable decorate(Runnable runnable) {
+        // 捕获当前线程的 TraceContext 快照（跨线程传播的唯一依据）
+        TraceSnapshot snapshot = TraceContext.snapshot();
+
+        return () -> {
+            if (snapshot != null) {
+                TraceContext.restore(snapshot);
+            } else {
+                // 父线程无上下文，生成新的 TraceId
+                TraceContext.getOrCreateTraceId();
+            }
+            try {
+                runnable.run();
+            } finally {
+                // 清理上下文，防止线程池复用造成污染
+                TraceContext.clear();
+            }
+        };
+    }
+
+    /**
+     * 装饰 Callable
+     *
+     * @param task Callable 任务
+     * @return 装饰后的 Callable
+     */
+    public <T> Callable<T> decorate(Callable<T> task) {
+        TraceSnapshot snapshot = TraceContext.snapshot();
+
+        return () -> {
+            if (snapshot != null) {
+                TraceContext.restore(snapshot);
+            } else {
+                TraceContext.getOrCreateTraceId();
+            }
+            try {
+                return task.call();
+            } finally {
+                TraceContext.clear();
+            }
+        };
+    }
+}

fastbee-common/src/main/java/com/fastbee/common/trace/TraceContext.java

@@ -0,0 +1,270 @@
+package com.fastbee.common.trace;
+
+import lombok.Data;
+import org.slf4j.MDC;
+
+import java.io.Serializable;
+
+/**
+ * 统一追踪上下文
+ * 管理 traceId, tenantId, userId 等追踪信息
+ *
+ * <p>核心特性：
+ * <ul>
+ *   <li>基于 ThreadLocal 实现线程隔离</li>
+ *   <li>自动同步到 MDC 用于日志输出</li>
+ *   <li>支持 snapshot/restore 用于跨线程传播</li>
+ * </ul>
+ *
+ * <p>使用示例：
+ * <pre>
+ * // Web请求入口
+ * TraceContext.setTraceId(TraceIdGenerator.generate());
+ *
+ * // 异步任务（通过 TaskDecorator 自动传播）
+ * &#64;Async
+ * public void asyncTask() {
+ *     log.info("处理中"); // 日志自动包含 traceId
+ * }
+ *
+ * // 手动传播（用于非 Spring 管理的线程池）
+ * TraceSnapshot snapshot = TraceContext.snapshot();
+ * executor.submit(() -> {
+ *     TraceContext.restore(snapshot);
+ *     try {
+ *         // 业务逻辑
+ *     } finally {
+ *         TraceContext.clear();
+ *     }
+ * });
+ * </pre>
+ *
+ * @author FastBee
+ */
+public class TraceContext {
+
+    /**
+     * TraceId 在 MDC 中的 key
+     */
+    public static final String TRACE_ID_KEY = "traceId";
+
+    /**
+     * TenantId 在 MDC 中的 key
+     * 预留字段，暂未使用
+     */
+    public static final String TENANT_ID_KEY = "tenantId";
+
+    /**
+     * UserId 在 MDC 中的 key
+     * 预留字段，暂未使用
+     */
+    public static final String USER_ID_KEY = "userId";
+
+    /**
+     * 线程本地上下文存储
+     */
+    private static final ThreadLocal<TraceSnapshot> CONTEXT = new ThreadLocal<>();
+
+    /**
+     * 追踪上下文快照
+     * 用于跨线程传递
+     */
+    @Data
+    public static class TraceSnapshot implements Serializable {
+        private static final long serialVersionUID = 1L;
+
+        private String traceId;
+        private Long tenantId;  // 预留字段
+        private Long userId;    // 预留字段
+
+        /**
+         * 将快照应用到 MDC
+         * 先移除旧值再写入，保证 MDC 状态与快照精确一致（包括 null 字段）
+         */
+        public void applyToMdc() {
+            MDC.remove(TRACE_ID_KEY);
+            MDC.remove(TENANT_ID_KEY);
+            MDC.remove(USER_ID_KEY);
+            if (traceId != null) {
+                MDC.put(TRACE_ID_KEY, traceId);
+            }
+            if (tenantId != null) {
+                MDC.put(TENANT_ID_KEY, String.valueOf(tenantId));
+            }
+            if (userId != null) {
+                MDC.put(USER_ID_KEY, String.valueOf(userId));
+            }
+        }
+    }
+
+    // ================== Get Methods ==================
+
+    /**
+     * 获取当前 TraceId
+     *
+     * @return TraceId，如果不存在返回 null
+     */
+    public static String getTraceId() {
+        TraceSnapshot snapshot = CONTEXT.get();
+        return snapshot != null ? snapshot.getTraceId() : null;
+    }
+
+    /**
+     * 获取当前 TenantId（预留）
+     *
+     * @return TenantId，如果不存在返回 null
+     */
+    public static Long getTenantId() {
+        TraceSnapshot snapshot = CONTEXT.get();
+        return snapshot != null ? snapshot.getTenantId() : null;
+    }
+
+    /**
+     * 获取当前 UserId（预留）
+     *
+     * @return UserId，如果不存在返回 null
+     */
+    public static Long getUserId() {
+        TraceSnapshot snapshot = CONTEXT.get();
+        return snapshot != null ? snapshot.getUserId() : null;
+    }
+
+    // ================== Set Methods ==================
+
+    /**
+     * 设置 TraceId
+     * 同时更新 ThreadLocal 和 MDC
+     *
+     * @param traceId TraceId
+     */
+    public static void setTraceId(String traceId) {
+        TraceSnapshot snapshot = CONTEXT.get();
+        if (snapshot == null) {
+            snapshot = new TraceSnapshot();
+            CONTEXT.set(snapshot);
+        }
+        snapshot.setTraceId(traceId);
+        if (traceId != null) {
+            MDC.put(TRACE_ID_KEY, traceId);
+        } else {
+            MDC.remove(TRACE_ID_KEY);
+        }
+    }
+
+    /**
+     * 设置 TenantId（预留）
+     * 同时更新 ThreadLocal 和 MDC
+     *
+     * @param tenantId TenantId
+     */
+    public static void setTenantId(Long tenantId) {
+        TraceSnapshot snapshot = CONTEXT.get();
+        if (snapshot == null) {
+            snapshot = new TraceSnapshot();
+            CONTEXT.set(snapshot);
+        }
+        snapshot.setTenantId(tenantId);
+        if (tenantId != null) {
+            MDC.put(TENANT_ID_KEY, String.valueOf(tenantId));
+        } else {
+            MDC.remove(TENANT_ID_KEY);
+        }
+    }
+
+    /**
+     * 设置 UserId（预留）
+     * 同时更新 ThreadLocal 和 MDC
+     *
+     * @param userId UserId
+     */
+    public static void setUserId(Long userId) {
+        TraceSnapshot snapshot = CONTEXT.get();
+        if (snapshot == null) {
+            snapshot = new TraceSnapshot();
+            CONTEXT.set(snapshot);
+        }
+        snapshot.setUserId(userId);
+        if (userId != null) {
+            MDC.put(USER_ID_KEY, String.valueOf(userId));
+        } else {
+            MDC.remove(USER_ID_KEY);
+        }
+    }
+
+    // ================== Convenience Methods ==================
+
+    /**
+     * 获取或创建 TraceId
+     * 如果当前没有 TraceId，自动生成一个新的
+     *
+     * @return TraceId
+     */
+    public static String getOrCreateTraceId() {
+        String traceId = getTraceId();
+        if (traceId == null || traceId.isEmpty()) {
+            traceId = TraceIdGenerator.generate();
+            setTraceId(traceId);
+        }
+        return traceId;
+    }
+
+    /**
+     * 确保当前有 TraceId
+     * 如果传入的 traceId 不为空，使用传入的；否则生成新的
+     *
+     * @param traceId 可选的 TraceId
+     * @return 最终的 TraceId
+     */
+    public static String ensureTraceId(String traceId) {
+        if (traceId != null && !traceId.isEmpty()) {
+            setTraceId(traceId);
+            return traceId;
+        }
+        return getOrCreateTraceId();
+    }
+
+    // ================== Snapshot & Restore ==================
+
+    /**
+     * 创建当前上下文的快照
+     * 用于跨线程传递
+     *
+     * @return TraceSnapshot 快照，如果当前无上下文返回 null
+     */
+    public static TraceSnapshot snapshot() {
+        TraceSnapshot current = CONTEXT.get();
+        if (current == null) {
+            return null;
+        }
+        TraceSnapshot copy = new TraceSnapshot();
+        copy.setTraceId(current.getTraceId());
+        copy.setTenantId(current.getTenantId());
+        copy.setUserId(current.getUserId());
+        return copy;
+    }
+
+    /**
+     * 从快照恢复上下文
+     *
+     * @param snapshot 快照，如果为 null 则清理上下文
+     */
+    public static void restore(TraceSnapshot snapshot) {
+        if (snapshot == null) {
+            clear();
+            return;
+        }
+        CONTEXT.set(snapshot);
+        snapshot.applyToMdc();
+    }
+
+    /**
+     * 清除当前上下文
+     * 同时清除 ThreadLocal 和 MDC
+     */
+    public static void clear() {
+        CONTEXT.remove();
+        MDC.remove(TRACE_ID_KEY);
+        MDC.remove(TENANT_ID_KEY);
+        MDC.remove(USER_ID_KEY);
+    }
+}

fastbee-common/src/main/java/com/fastbee/common/trace/TraceIdGenerator.java

@@ -0,0 +1,106 @@
+package com.fastbee.common.trace;
+
+import org.slf4j.MDC;
+
+import java.util.concurrent.ThreadLocalRandom;
+import java.util.concurrent.atomic.AtomicLong;
+
+/**
+ * TraceId 生成器
+ * 生成纯数字格式的 TraceId
+ *
+ * <p>格式：基于时间戳 + 序列号 + 随机数
+ * <p>示例：752431931275776594
+ *
+ * <p>特点：
+ * <ul>
+ *   <li>纯数字格式，便于存储和索引</li>
+ *   <li>时间有序，大致按生成时间排序</li>
+ *   <li>线程安全，使用 synchronized 保证</li>
+ *   <li>高并发友好，单机每秒可生成百万级 ID</li>
+ * </ul>
+ *
+ * @author FastBee
+ */
+public class TraceIdGenerator {
+
+    /**
+     * 起始时间戳 (2023-01-01 00:00:00)
+     * 用于减少时间戳位数，延长 ID 可用年限
+     */
+    private static final long START_TIMESTAMP = 1672531200000L;
+
+    /**
+     * 序列号掩码：16 bit（0 ~ 65535）
+     */
+    private static final long SEQUENCE_MASK = 0xFFFFL;
+
+    /**
+     * 序列号，同一毫秒内递增
+     */
+    private static final AtomicLong sequence = new AtomicLong(0);
+
+    /**
+     * 上次生成时间戳
+     */
+    private static volatile long lastTimestamp = -1L;
+
+    /**
+     * 生成纯数字格式的 TraceId
+     *
+     * @return 纯数字 TraceId 字符串
+     */
+    public static String generate() {
+        return String.valueOf(generateLong());
+    }
+
+    /**
+     * 生成 long 类型的 TraceId
+     * 使用 synchronized 保证线程安全
+     *
+     * <p>位域分配（低到高）：
+     * <ul>
+     *   <li>随机数 6 bit（第 0~5 位）</li>
+     *   <li>序列号 16 bit（第 6~21 位）</li>
+     *   <li>时间差 剩余位（第 22 位及以上）</li>
+     * </ul>
+     *
+     * @return long 类型 TraceId
+     */
+    public static synchronized long generateLong() {
+        long timestamp = System.currentTimeMillis();
+
+        // 时钟回拨保护：时间不允许倒退，沿用上次时间戳
+        if (timestamp < lastTimestamp) {
+            timestamp = lastTimestamp;
+        }
+
+        if (timestamp == lastTimestamp) {
+            // 同毫秒：序列号递增并回写（& MASK 防止溢出侵入时间位域）
+            sequence.set((sequence.get() + 1) & SEQUENCE_MASK);
+            if (sequence.get() == 0) {
+                // 序列号用尽，等待下一毫秒
+                timestamp = tilNextMillis(lastTimestamp);
+            }
+        } else {
+            sequence.set(0);
+        }
+        lastTimestamp = timestamp;
+
+        // 时间差(高位) | 序列号(中位) | 随机数(低位 6 bit)
+        long timeDiff = timestamp - START_TIMESTAMP;
+        long random = ThreadLocalRandom.current().nextInt(64);
+        return (timeDiff << 22) | (sequence.get() << 6) | random;
+    }
+
+    /**
+     * 等待下一毫秒
+     */
+    private static long tilNextMillis(long lastTimestamp) {
+        long timestamp = System.currentTimeMillis();
+        while (timestamp <= lastTimestamp) {
+            timestamp = System.currentTimeMillis();
+        }
+        return timestamp;
+    }
+}

fastbee-common/src/main/java/com/fastbee/common/utils/StringUtils.java

@@ -295,21 +295,19 @@ public class StringUtils extends org.apache.commons.lang3.StringUtils {
     /**
      * 判断给定的set列表中是否包含数组array 判断给定的数组array中是否包含给定的元素value
      *
-     * @param set   给定的集合
+     * @param collection   给定的集合
      * @param array 给定的数组
      * @return boolean 结果
      */
     public static boolean containsAny(Collection<String> collection, String... array) {
-        if (isEmpty(collection) || isEmpty(array)) {
+        if (!isEmpty(collection) && !isEmpty(array)) {
-            return false;
-        } else {
             for (String str : array) {
                 if (collection.contains(str)) {
                     return true;
                 }
             }
-            return false;
         }
+        return false;
     }
 
     /**

fastbee-common/src/main/java/com/fastbee/common/utils/TraceIdUtils.java

@@ -1,188 +1,64 @@
 package com.fastbee.common.utils;
 
-import com.fastbee.common.utils.uuid.IdUtils;
+import com.fastbee.common.trace.TraceContext;
-import org.slf4j.MDC;
+import com.fastbee.common.trace.TraceContext.TraceSnapshot;
 
-import java.util.Map;
 import java.util.concurrent.Callable;
-import java.util.concurrent.ThreadLocalRandom;
 
 /**
  * 日志追踪ID工具类
- * 统一生成TraceId的逻辑，使用IdWorker和ThreadLocalRandom
+ * 提供向后兼容的 API，内部委托给 TraceContext
  *
  * @author Sumuxi
+ * 建议直接使用 {@link TraceContext}
  */
 public class TraceIdUtils {
 
     /**
-     * TraceId在MDC中的key
+     * 包装 Runnable：透传 TraceContext（MDC 由 TraceContext 统一同步）
-     */
+     * 用于非 Spring 管理的线程池（如 ScheduledExecutorService）
-    public static final String TRACE_ID_KEY = "traceId";
-
-    /**
-     * IdWorker实例（单例模式）
-     */
-    private static volatile IdUtils idWorker;
-
-    /**
-     * 获取IdWorker实例（懒加载单例）
      *
-     * @return IdWorker实例
+     * @param task Runnable 任务
-     */
+     * @return 包装后的 Runnable
-    private static IdUtils getIdWorker() {
-        if (idWorker == null) {
-            synchronized (TraceIdUtils.class) {
-                if (idWorker == null) {
-                    // 使用机器ID，可以根据实际情况配置
-                    // 这里使用1作为默认workerId，可以通过配置文件读取
-                    // IdUtils构造函数：workerId, datacenterId，-1表示随机生成
-                    idWorker = new IdUtils(-1L, -1L);
-                }
-            }
-        }
-        return idWorker;
-    }
-
-    /**
-     * 生成TraceId
-     * 格式：IdWorker.nextId() * 1000 + ThreadLocalRandom.nextInt(1000)
-     * 参考：generateClueId() 的实现方式
-     * 使用Math.abs确保TraceId为正数
-     *
-     * @return TraceId
-     */
-    public static long generateTraceId() {
-        long id = getIdWorker().nextId();
-        // 使用绝对值确保TraceId为正数，避免负数显示
-        // 注意：Math.abs(id) * 1000 可能会溢出，所以需要对最终结果再次使用Math.abs()
-        long traceId = Math.abs(id) * 1000 + ThreadLocalRandom.current().nextInt(1000);
-        // 确保最终结果为非负数（处理溢出情况）
-        traceId = Math.abs(traceId);
-        MDC.put(TRACE_ID_KEY, String.valueOf(traceId));
-        return traceId;
-    }
-
-    /**
-     * 生成TraceId并放入MDC
-     * 返回字符串格式的TraceId
-     *
-     * @return TraceId字符串
-     */
-    public static String generateTraceIdString() {
-        long traceId = generateTraceId();
-        return String.valueOf(traceId);
-    }
-
-    /**
-     * 设置TraceId到MDC
-     *
-     * @param traceId TraceId
-     */
-    public static void setTraceId(String traceId) {
-        if (traceId != null && !traceId.isEmpty()) {
-            MDC.put(TRACE_ID_KEY, traceId);
-        }
-    }
-
-    /**
-     * 设置TraceId到MDC（long类型）
-     *
-     * @param traceId TraceId
-     */
-    public static void setTraceId(long traceId) {
-        MDC.put(TRACE_ID_KEY, String.valueOf(traceId));
-    }
-
-    /**
-     * 从MDC获取TraceId
-     *
-     * @return TraceId
-     */
-    public static String getTraceId() {
-        return MDC.get(TRACE_ID_KEY);
-    }
-
-    /**
-     * 确保当前线程 MDC 中存在 TraceId。
-     * - 已存在：直接返回
-     * - 不存在：生成并写入 MDC
-     */
-    public static String ensureTraceId() {
-        String traceId = getTraceId();
-        if (traceId == null || traceId.isEmpty()) {
-            traceId = generateTraceIdString();
-        }
-        return traceId;
-    }
-
-    /**
-     * 使用指定 traceId 覆盖当前线程 MDC（为空则生成）。
-     * 主要用于跨线程/跨进程透传后的落地。
-     */
-    public static String ensureTraceId(String traceId) {
-        if (traceId == null || traceId.isEmpty()) {
-            return ensureTraceId();
-        }
-        setTraceId(traceId);
-        return traceId;
-    }
-
-    /**
-     * 包装 Runnable：透传提交线程的 MDC，上下文中无 traceId 则补齐；执行完自动清理/还原。
      */
     public static Runnable wrapWithMdc(Runnable task) {
-        final Map<String, String> captured = MDC.getCopyOfContextMap();
+        final TraceSnapshot snapshot = TraceContext.snapshot();
+
         return () -> {
-            Map<String, String> previous = MDC.getCopyOfContextMap();
+            if (snapshot != null) {
+                TraceContext.restore(snapshot);
+            } else {
+                TraceContext.getOrCreateTraceId();
+            }
             try {
-                if (captured == null || captured.isEmpty()) {
-                    MDC.clear();
-                } else {
-                    MDC.setContextMap(captured);
-                }
-                ensureTraceId();
                 task.run();
             } finally {
-                if (previous == null || previous.isEmpty()) {
+                TraceContext.clear();
-                    MDC.clear();
-                } else {
-                    MDC.setContextMap(previous);
-                }
             }
         };
     }
 
     /**
-     * 包装 Callable：透传提交线程的 MDC，上下文中无 traceId 则补齐；执行完自动清理/还原。
+     * 包装 Callable：透传 TraceContext（MDC 由 TraceContext 统一同步）
+     * 用于非 Spring 管理的线程池（如 ScheduledExecutorService）
+     *
+     * @param task Callable 任务
+     * @return 包装后的 Callable
      */
     public static <T> Callable<T> wrapWithMdc(Callable<T> task) {
-        final Map<String, String> captured = MDC.getCopyOfContextMap();
+        final TraceSnapshot snapshot = TraceContext.snapshot();
+
         return () -> {
-            Map<String, String> previous = MDC.getCopyOfContextMap();
+            if (snapshot != null) {
+                TraceContext.restore(snapshot);
+            } else {
+                TraceContext.getOrCreateTraceId();
+            }
             try {
-                if (captured == null || captured.isEmpty()) {
-                    MDC.clear();
-                } else {
-                    MDC.setContextMap(captured);
-                }
-                ensureTraceId();
                 return task.call();
             } finally {
-                if (previous == null || previous.isEmpty()) {
+                TraceContext.clear();
-                    MDC.clear();
-                } else {
-                    MDC.setContextMap(previous);
-                }
             }
         };
     }
-
+}
-    /**
-     * 清除MDC中的TraceId
-     */
-    public static void clearTraceId() {
-        MDC.remove(TRACE_ID_KEY);
-    }
-}
-

fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC16Utils.java

@@ -133,7 +133,8 @@ public class CRC16Utils {
 
 
     public static void main(String[] args) throws Exception {
-        String hex = "01030400110018AA3C";
+        String hex = "01060004001E";
+        hex = hex.replace(" ", "");
         byte[] bytes = ByteUtils.hexToByte(hex);
         String crc = getCRC(bytes);
         System.out.println(crc);

fastbee-common/src/main/java/com/fastbee/common/utils/gateway/CRC8Utils.java

@@ -25,12 +25,12 @@ public class CRC8Utils {
      */
     public static byte calcCrc8_E5(byte[] data) {
         byte crc = 0;
-        for (int j = 0; j < data.length; j++) {
+        for (byte datum : data) {
-            crc ^= data[j];
+            crc ^= datum;
             for (int i = 0; i < 8; i++) {
                 if ((crc & 0x80) != 0) {
                     crc = (byte) ((crc) << 1);
-                    crc ^= 0xE5;
+                    crc ^= (byte) 0xE5;
                 } else {
                     crc = (byte) ((crc) << 1);
                 }

fastbee-common/src/main/java/com/fastbee/common/utils/gateway/protocol/ByteUtils.java

@@ -78,8 +78,7 @@ public class ByteUtils {
         byte[] write = new byte[length];
 
         int index = 0;
-        for (int i = 0; i < bytes.size(); i++) {
+        for (byte[] values : bytes) {
-            byte[] values = bytes.get(i);
             addBytes(write, values, index);
             index += values.length;
         }
@@ -312,8 +311,9 @@ public class ByteUtils {
         if (StringUtils.isBlank(hexStr)) {
             return null;
         }
-        if (hexStr.length() % 2 != 0) {//长度为单数
+        // 长度为单数
-            hexStr = "0" + hexStr;//前面补0
+        if (hexStr.length() % 2 != 0) {
+            hexStr = "0" + hexStr; // 前面补0
         }
 
         char[] chars = hexStr.toCharArray();

fastbee-framework/src/main/java/com/fastbee/framework/aspectj/ScheduledTraceAspect.java

@@ -0,0 +1,47 @@
+package com.fastbee.framework.aspectj;
+
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
+import lombok.extern.slf4j.Slf4j;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.springframework.core.annotation.Order;
+import org.springframework.stereotype.Component;
+
+/**
+ * @Scheduled 定时任务 TraceId 切面
+ * 自动为所有 Spring 定时任务方法生成 TraceId
+ *
+ * @author FastBee
+ */
+@Slf4j
+@Aspect
+@Component
+@Order(1)  // 高优先级，确保最先执行
+public class ScheduledTraceAspect {
+
+    /**
+     * 拦截所有 @Scheduled 方法
+     */
+    @Around("@annotation(org.springframework.scheduling.annotation.Scheduled)")
+    public Object aroundScheduled(ProceedingJoinPoint joinPoint) throws Throwable {
+        String methodName = joinPoint.getSignature().toShortString();
+
+        // 生成 TraceId
+        String traceId = TraceIdGenerator.generate();
+        TraceContext.setTraceId(traceId);
+
+        log.debug("定时任务开始执行: {}", methodName);
+
+        try {
+            return joinPoint.proceed();
+        } catch (Throwable e) {
+            log.error("定时任务执行异常: {}", methodName, e);
+            throw e;
+        } finally {
+            log.debug("定时任务执行完成: {}", methodName);
+            TraceContext.clear();
+        }
+    }
+}

fastbee-framework/src/main/java/com/fastbee/framework/config/OtaThreadPoolConfig.java

@@ -1,6 +1,7 @@
 package com.fastbee.framework.config;
 
 import com.fastbee.common.constant.FastBeeConstant;
+import com.fastbee.common.trace.MdcTaskDecorator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.concurrent.ThreadPoolTaskExecutor;
@@ -30,6 +31,10 @@ public class OtaThreadPoolConfig {
         executor.setThreadNamePrefix(threadNamePrefix);
         // 线程池对拒绝任务(无线程可用)的处理策略
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+
+        // 新增：配置 TaskDecorator，自动传播 TraceId
+        executor.setTaskDecorator(new MdcTaskDecorator());
+
         // 进行加载
         executor.initialize();
         return executor;

fastbee-framework/src/main/java/com/fastbee/framework/config/ThreadPoolConfig.java

@@ -1,5 +1,6 @@
 package com.fastbee.framework.config;
 
+import com.fastbee.common.trace.MdcTaskDecorator;
 import com.fastbee.common.utils.Threads;
 import org.apache.commons.lang3.concurrent.BasicThreadFactory;
 import org.springframework.context.annotation.Bean;
@@ -38,6 +39,10 @@ public class ThreadPoolConfig {
         executor.setKeepAliveSeconds(keepAliveSeconds);
         // 线程池对拒绝任务(无线程可用)的处理策略
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+
+        // 新增：配置 TaskDecorator，自动传播 TraceId
+        executor.setTaskDecorator(new MdcTaskDecorator());
+
         return executor;
     }
 

fastbee-framework/src/main/java/com/fastbee/framework/interceptor/TraceIdInterceptor.java

@@ -1,9 +1,9 @@
 package com.fastbee.framework.interceptor;
 
-import com.fastbee.common.utils.TraceIdUtils;
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
 import org.springframework.stereotype.Component;
 import org.springframework.web.servlet.HandlerInterceptor;
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -16,24 +16,26 @@ import javax.servlet.http.HttpServletResponse;
 @Component
 public class TraceIdInterceptor implements HandlerInterceptor {
 
+    private static final String TRACE_ID_HEADER = "X-Trace-Id";
+
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
         // 获取请求URI
         String requestURI = request.getRequestURI();
 
         // 尝试从请求头中获取TraceId（支持分布式追踪）
-        String traceId = request.getHeader("X-Trace-Id");
+        String traceId = request.getHeader(TRACE_ID_HEADER);
 
         // 如果请求头中没有TraceId，则生成一个新的
         if (traceId == null || traceId.isEmpty()) {
-            traceId = TraceIdUtils.generateTraceIdString();
+            traceId = TraceIdGenerator.generate();
-        } else {
-            // 如果请求头中有TraceId，设置到MDC
-            TraceIdUtils.setTraceId(traceId);
         }
 
+        // 设置到 TraceContext（自动同步到 MDC）
+        TraceContext.setTraceId(traceId);
+
         // 将TraceId放入响应头，方便前端获取
-        response.setHeader("X-Trace-Id", traceId);
+        response.setHeader(TRACE_ID_HEADER, traceId);
 
         // 打印请求路径日志
         org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(TraceIdInterceptor.class);
@@ -44,8 +46,8 @@ public class TraceIdInterceptor implements HandlerInterceptor {
 
     @Override
     public void afterCompletion(HttpServletRequest request, HttpServletResponse response, Object handler, Exception ex) throws Exception {
-        // 请求完成后清除MDC中的TraceId，避免内存泄漏
+        // 请求完成后清除 TraceContext，避免内存泄漏
-        TraceIdUtils.clearTraceId();
+        TraceContext.clear();
     }
 }
 

fastbee-framework/src/main/java/com/fastbee/framework/manager/AsyncManager.java

@@ -1,6 +1,7 @@
 package com.fastbee.framework.manager;
 
 import com.fastbee.common.utils.Threads;
+import com.fastbee.common.utils.TraceIdUtils;
 import com.fastbee.common.utils.spring.SpringUtils;
 
 import java.util.TimerTask;
@@ -36,10 +37,17 @@ public class AsyncManager {
     /**
      * 执行任务
      *
+     * <p>包装任务以透传 TraceId：{@code scheduledExecutorService} 是裸
+     * {@link java.util.concurrent.ScheduledThreadPoolExecutor}，不支持
+     * {@code setTaskDecorator}，因此必须在提交点包装任务本身。
+     * {@link TraceIdUtils#wrapWithMdc} 会捕获调用方线程的 TraceContext
+     * 快照并在 schedule-pool 线程内恢复，使登录/登出/操作日志等
+     * 异步落库链路的日志携带同一 TraceId。
+     *
      * @param task 任务
      */
     public void execute(TimerTask task) {
-        executor.schedule(task, OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
+        executor.schedule(TraceIdUtils.wrapWithMdc(task), OPERATE_DELAY_TIME, TimeUnit.MILLISECONDS);
     }
 
     /**

fastbee-iot-data/src/main/java/com/fastbee/iot/data/consumer/DevicePropFetchConsumer.java

@@ -99,7 +99,7 @@ public class DevicePropFetchConsumer {
                 // 不进行格式校验，直接转换数据
                 byte[] commandData = ByteUtils.convertToHexByteArray(command);
                 switch (serverType) {
-                    //通过mqtt内部客户端 下发指令
+                    // 通过mqtt内部客户端 下发指令
                     case MQTT:
                         publish(topic, commandData);
                         log.info("=>MQTT-线程=[{}],设备=[{}],轮询指令:[{}],主题:[{}]", Thread.currentThread().getName(), serialNumber, command, topic);

fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceAbstractQuartzJob.java

@@ -2,9 +2,10 @@ package com.fastbee.iot.data.job;
 
 import com.fastbee.common.constant.Constants;
 import com.fastbee.common.constant.ScheduleConstants;
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
 import com.fastbee.common.utils.ExceptionUtil;
 import com.fastbee.common.utils.StringUtils;
-import com.fastbee.common.utils.TraceIdUtils;
 import com.fastbee.common.utils.bean.BeanUtils;
 import com.fastbee.common.utils.spring.SpringUtils;
 import com.fastbee.iot.domain.DeviceJob;
@@ -29,7 +30,7 @@ public abstract class DeviceAbstractQuartzJob implements Job {
     /**
      * 线程本地变量
      */
-    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -37,9 +38,7 @@ public abstract class DeviceAbstractQuartzJob implements Job {
         BeanUtils.copyBeanProp(deviceJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
         try {
             before(context, deviceJob);
-            if (deviceJob != null) {
+            doExecute(context, deviceJob);
-                doExecute(context, deviceJob);
-            }
             after(context, deviceJob, null);
         } catch (Exception e) {
             log.error("任务执行异常  - ：", e);
@@ -56,8 +55,8 @@ public abstract class DeviceAbstractQuartzJob implements Job {
     protected void before(JobExecutionContext context, DeviceJob deviceJob) {
         threadLocal.set(new Date());
 
-        // 为设备定时任务生成TraceId，使用统一的生成逻辑
+        // 为设备定时任务生成 TraceId
-        TraceIdUtils.generateTraceId();
+        TraceContext.setTraceId(TraceIdGenerator.generate());
 
         log.info("设备定时任务开始执行: {} - {}", deviceJob.getJobName(), deviceJob.getJobGroup());
     }
@@ -91,10 +90,6 @@ public abstract class DeviceAbstractQuartzJob implements Job {
             startTime = new Date();
         }
         sysJobLog.setStartTime(startTime);
-        Date stopTime = new Date();
-        sysJobLog.setStopTime(stopTime);
-        long runMs = stopTime.getTime() - startTime.getTime();
-        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
         if (e != null) {
             sysJobLog.setStatus(Constants.FAIL);
             String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
@@ -103,13 +98,18 @@ public abstract class DeviceAbstractQuartzJob implements Job {
             sysJobLog.setStatus(Constants.SUCCESS);
         }
 
+        Date stopTime = new Date();
+        sysJobLog.setStopTime(stopTime);
+        long runMs = stopTime.getTime() - startTime.getTime();
+        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
+
         // 写入数据库当中
         SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
 
-        // 清除TraceId，避免内存泄漏
-        TraceIdUtils.clearTraceId();
-
         log.info("设备定时任务执行完成: {} - {}, 耗时: {}ms", deviceJob.getJobName(), deviceJob.getJobGroup(), runMs);
+
+        // 清除 TraceContext
+        TraceContext.clear();
     }
 
     /**

fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceDisallowConcurrentExecution.java

@@ -11,6 +11,7 @@ import org.quartz.JobExecutionContext;
  */
 @DisallowConcurrentExecution
 public class DeviceDisallowConcurrentExecution extends DeviceAbstractQuartzJob {
+
     @Override
     protected void doExecute(JobExecutionContext context, DeviceJob deviceJob) throws Exception {
         DeviceJobInvoke.invokeMethod(deviceJob);

fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceJobExecution.java

@@ -9,6 +9,7 @@ import org.quartz.JobExecutionContext;
  * @author sumuxi, 2026-04-16
  */
 public class DeviceJobExecution extends DeviceAbstractQuartzJob {
+
     @Override
     protected void doExecute(JobExecutionContext context, DeviceJob deviceJob) throws Exception {
         DeviceJobInvoke.invokeMethod(deviceJob);

fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/DeviceJobInvoke.java

@@ -29,13 +29,13 @@ public class DeviceJobInvoke {
     /**
      * 获取消息推送接口
      */
-    private static IMqttMessagePublish messagePublish = SpringUtils.getBean(IMqttMessagePublish.class);
+    private static final IMqttMessagePublish messagePublish = SpringUtils.getBean(IMqttMessagePublish.class);
 
-    private static SceneMapper sceneMapper = SpringUtils.getBean(SceneMapper.class);
+    private static final SceneMapper sceneMapper = SpringUtils.getBean(SceneMapper.class);
 
-    private static FlowLogExecutor flowExecutor = SpringUtils.getBean(FlowLogExecutor.class);
+    private static final FlowLogExecutor flowExecutor = SpringUtils.getBean(FlowLogExecutor.class);
 
-    private static IDataHandler dataHandler = SpringUtils.getBean(IDataHandler.class);
+    private static final IDataHandler dataHandler = SpringUtils.getBean(IDataHandler.class);
 
     /**
      * 执行方法
@@ -44,45 +44,45 @@ public class DeviceJobInvoke {
      */
     public static void invokeMethod(DeviceJob deviceJob) throws Exception {
         if (deviceJob.getJobType() == 1) {
-            log.info("------------------------1、执行设备定时任务-----------------------------");
+            log.info("1、[执行设备定时任务]");
             List<Action> actions = JSON.parseArray(deviceJob.getActions(), Action.class);
-            List<ThingsModelSimpleItem> propertys = new ArrayList<>();
+            List<ThingsModelSimpleItem> properties = new ArrayList<>();
             List<ThingsModelSimpleItem> functions = new ArrayList<>();
-            for (int i = 0; i < actions.size(); i++) {
+            for (Action action : actions) {
                 ThingsModelSimpleItem model = new ThingsModelSimpleItem();
-                model.setId(actions.get(i).getId());
+                model.setId(action.getId());
-                model.setValue(actions.get(i).getValue());
+                model.setValue(action.getValue());
                 model.setRemark("设备定时");
-                if (actions.get(i).getType() == 1) {
+                if (action.getType() == 1) {
-                    propertys.add(model);
+                    properties.add(model);
-                } else if (actions.get(i).getType() == 2) {
+                } else if (action.getType() == 2) {
                     functions.add(model);
                 }
             }
             // 发布属性
-            if (propertys.size() > 0) {
+            if (!properties.isEmpty()) {
-                messagePublish.publishProperty(deviceJob.getProductId(), deviceJob.getSerialNumber(), propertys, 0);
+                messagePublish.publishProperty(deviceJob.getProductId(), deviceJob.getSerialNumber(), properties, 0);
             }
             // 发布功能
-            if (functions.size() > 0) {
+            if (!functions.isEmpty()) {
                 messagePublish.publishFunction(deviceJob.getProductId(), deviceJob.getSerialNumber(), functions, 0);
             }
 
         } else if (deviceJob.getJobType() == 3) {
-            log.info("------------------3、[定时执行场景联动]---------------------");
+            log.info("3、[定时执行场景联动]");
             Scene scene = sceneMapper.selectSceneBySceneId(deviceJob.getSceneId());
             // 执行场景规则,异步非阻塞
             SceneContext context = new SceneContext("", 0L, 0, null);
             String requestId = "scene/" + scene.getChainName();
             flowExecutor.execute2FutureWithRid(scene.getChainName(), null, requestId, context);
         } else if (4 == deviceJob.getJobType()) {
-            log.info("------------------4、[定时执行场景运算型变量]---------------------");
+            log.info("4、[定时执行场景运算型变量]");
             String s = dataHandler.calculateSceneModelTagValue(deviceJob.getDatasourceId());
             if (StringUtils.isEmpty(s)) {
-                log.info("------------------[定时执行场景运算型变量失败：+{}]---------------------", s);
+                log.info("[定时执行场景运算型变量失败：+{}]", s);
             }
         } else if (5 == deviceJob.getJobType()) {
-            log.info("----------------5、执行modbus轮训指令----------------------");
+            log.info("5、[执行Modbus轮训指令]");
             ModbusPollJob job = new ModbusPollJob();
             job.setType(2);
             job.setDeviceJob(deviceJob);

fastbee-iot-data/src/main/java/com/fastbee/iot/data/job/SyncDeviceStatusJob.java

@@ -38,7 +38,7 @@ public class SyncDeviceStatusJob {
      */
     public void syncDeviceStatus() {
         if (enabled) {
-            //获取所有已激活并不是禁用的设备
+            // 获取所有已激活并不是禁用的设备
             List<DeviceStatusVO> deviceStatusVOList = deviceService.selectDeviceActive();
             if (!CollectionUtils.isEmpty(deviceStatusVOList)) {
                 for (DeviceStatusVO statusVO : deviceStatusVOList) {

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceOtherListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.DeviceReportBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DeviceOtherMsgConsumer;
 import com.fastbee.mq.queue.DeviceOtherQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -26,7 +27,15 @@ public class DeviceOtherListen {
         while (true) {
             try {
                 DeviceReportBo reportBo = DeviceOtherQueue.take();
-                otherMsgConsumer.consume(reportBo);
+
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(reportBo.getTraceId());
+
+                try {
+                    otherMsgConsumer.consume(reportBo);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>emq数据转发异常");
             }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DevicePropFetchListen.java

@@ -1,6 +1,7 @@
 package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DevicePropFetchConsumer;
 import com.fastbee.iot.model.modbus.ModbusPollJob;
 import com.fastbee.mq.queue.DevicePropFetchQueue;
@@ -27,9 +28,20 @@ public class DevicePropFetchListen {
         while (true) {
             try {
                 ModbusPollJob take = DevicePropFetchQueue.take();
-                devicePropFetchConsumer.consume(take);
+
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(take.getTraceId());
+
+                try {
+                    devicePropFetchConsumer.consume(take);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>设备属性获取异常", e);
+            } finally {
+                // 确保任何情况下都清理
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceReplyListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.DeviceReportBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DeviceReplyMsgConsumer;
 import com.fastbee.mq.queue.DeviceReplyQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -27,10 +28,21 @@ public class DeviceReplyListen {
             try {
                 /*读队列消息*/
                 DeviceReportBo reportBo = DeviceReplyQueue.take();
-                /*处理消息*/
+
-                deviceReplyMsgHandler.consume(reportBo);
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(reportBo.getTraceId());
+
+                try {
+                    /*处理消息*/
+                    deviceReplyMsgHandler.consume(reportBo);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>设备回调消息监听异常", e);
+            } finally {
+                // 确保任何情况下都清理上下文
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceReportListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.DeviceReportBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DeviceReportMsgConsumer;
 import com.fastbee.mq.queue.DeviceReportQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -27,10 +28,21 @@ public class DeviceReportListen {
             try {
                 /*取出数据*/
                 DeviceReportBo reportBo = DeviceReportQueue.take();
-                /*处理数据*/
+
-                reportMsgConsumer.consume(reportBo);
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(reportBo.getTraceId());
+
+                try {
+                    /*处理数据*/
+                    reportMsgConsumer.consume(reportBo);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>设备上报数据监听异常", e);
+            } finally {
+                // 确保任何情况下都清理上下文
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceStatusListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.DeviceStatusBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DeviceStatusConsumer;
 import com.fastbee.mq.queue.DeviceStatusQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -26,10 +27,20 @@ public class DeviceStatusListen {
         try {
             while (true) {
                 DeviceStatusBo status = DeviceStatusQueue.take();
-                deviceStatusConsumer.consume(status);
+
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(status.getTraceId());
+
+                try {
+                    deviceStatusConsumer.consume(status);
+                } finally {
+                    TraceContext.clear();
+                }
             }
         } catch (Exception e) {
             log.error("设备状态监听错误", e);
+        } finally {
+            TraceContext.clear();
         }
     }
 

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/DeviceTestListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.DeviceTestReportBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.DeviceTestConsumer;
 import com.fastbee.mq.queue.DeviceTestQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -26,9 +27,19 @@ public class DeviceTestListen {
             try {
                 DeviceTestReportBo take = DeviceTestQueue.take();
 
-                deviceTestConsumer.consume(take);
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(take.getTraceId());
+
+                try {
+                    deviceTestConsumer.consume(take);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>emq数据转发异常");
+            } finally {
+                // 确保任何情况下都清理上下文
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/FunctionInvokeListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.MQSendMessageBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.consumer.FunctionInvokeConsumer;
 import com.fastbee.mq.queue.FunctionInvokeQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -26,9 +27,20 @@ public class FunctionInvokeListen {
         while (true) {
             try {
                 MQSendMessageBo sendBo = FunctionInvokeQueue.take();
-                functionInvokeConsumer.handler(sendBo);
+
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(sendBo.getTraceId());
+
+                try {
+                    functionInvokeConsumer.handler(sendBo);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("=>下发服务消费异常", e);
+            } finally {
+                // 确保任何情况下都清理上下文
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/UpGradeListener.java

@@ -4,6 +4,7 @@ package com.fastbee.iot.data.listen;
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.domain.entity.SysMenu;
 import com.fastbee.common.core.mq.ota.OtaUpgradeDelayTask;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.common.utils.StringUtils;
 import com.fastbee.iot.data.service.IOtaUpgradeService;
 import com.fastbee.mq.queue.DelayUpgradeQueue;
@@ -48,11 +49,21 @@ public class UpGradeListener implements ApplicationRunner {
                 OtaUpgradeDelayTask task = DelayUpgradeQueue.task();
                 if (StringUtils.isNotNull(task)) {
                     Date startTime = task.getStartTime();
-                    otaUpgradeService.upgrade(task);
+
-                    log.info("=>开始OTA升级时间{}", startTime);
+                    // 恢复 TraceId
+                    TraceContext.ensureTraceId(task.getTraceId());
+
+                    try {
+                        otaUpgradeService.upgrade(task);
+                        log.info("=>开始OTA升级时间{}", startTime);
+                    } finally {
+                        TraceContext.clear();
+                    }
                 }
             } catch (Exception e) {
                 log.error("=>OTA升级监听异常", e);
+            } finally {
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/listen/UpgradeListen.java

@@ -2,6 +2,7 @@ package com.fastbee.iot.data.listen;
 
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.common.core.mq.ota.OtaUpgradeBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.data.service.IMqttMessagePublish;
 import com.fastbee.mq.queue.OtaUpgradeQueue;
 import lombok.extern.slf4j.Slf4j;
@@ -28,10 +29,20 @@ public class UpgradeListen {
             try {
                 /*获取队列中的OTA升级消息*/
                 OtaUpgradeBo upgradeBo = OtaUpgradeQueue.take();
-                // OTA升级处理
+
-                functionSendService.upGradeOTA(upgradeBo);
+                // 恢复 TraceId
+                TraceContext.ensureTraceId(upgradeBo.getTraceId());
+
+                try {
+                    // OTA升级处理
+                    functionSendService.upGradeOTA(upgradeBo);
+                } finally {
+                    TraceContext.clear();
+                }
             } catch (Exception e) {
                 log.error("->OTA消息监听异常", e);
+            } finally {
+                TraceContext.clear();
             }
         }
     }

fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceJobServiceImpl.java

@@ -47,6 +47,10 @@ public class DeviceJobServiceImpl implements IDeviceJobService {
     @PostConstruct
     public void init() throws SchedulerException, TaskException {
         scheduler.clear();
+        // 打印实际类型
+//        log.info("Scheduler实际类型: {}", scheduler.getClass().getName());
+//        log.info("Scheduler元数据: {}", scheduler.getMetaData().getSummary());
+//        log.info("Scheduler class: {}", scheduler.getClass());
         // 设备定时任务
         List<DeviceJob> jobList = jobMapper.selectJobAll();
         for (DeviceJob deviceJob : jobList) {

fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/DeviceMessageServiceImpl.java

@@ -222,7 +222,7 @@ public class DeviceMessageServiceImpl implements IDeviceMessageService {
     /**
      * 变量读取
      *
-     * @param readVO
+     * @param readVO 前端入参
      */
     @Override
     public void readVariableValue(VariableReadVO readVO) {
@@ -233,7 +233,7 @@ public class DeviceMessageServiceImpl implements IDeviceMessageService {
                 deviceAndProtocol.getProtocolCode().equals(FastBeeConstant.PROTOCOL.ModbusTcp)))
             throw new ServiceException("非modbus协议请先配置主动采集协议");
         Long productId = deviceAndProtocol.getProductId();
-        //如果是子设备，则获取网关子设备的产品id和设备编号
+        // 如果是子设备，则获取网关子设备的产品id和设备编号
         Integer deviceType = deviceAndProtocol.getDeviceType();
         if (deviceType == DeviceType.SUB_GATEWAY.getCode()) {
             serialNumber = deviceAndProtocol.getGwSerialNumber();
@@ -242,7 +242,7 @@ public class DeviceMessageServiceImpl implements IDeviceMessageService {
         Integer type = readVO.getType();
         type = Objects.isNull(type) ? 1 : type;
         if (type == 1) {
-            //单个变量获取
+            // 单个变量获取
             String identifier = readVO.getIdentifier();
             ThingsModelValueItem thingModels = itslCache.getSingleThingModels(deviceAndProtocol.getProductId(), identifier);
             ModbusConfig config = thingModels.getConfig();
@@ -275,7 +275,7 @@ public class DeviceMessageServiceImpl implements IDeviceMessageService {
             job.setType(1);
             MessageProducer.sendPropFetch(job);
         } else {
-            //读取当前设备的所有变量,这里读取所有的，判断传递的设备是网关设备、网关子设备、直连设备
+            // 读取当前设备的所有变量,这里读取所有的，判断传递的设备是网关设备、网关子设备、直连设备
             DeviceType code = DeviceType.transfer(deviceType);
             List<ModbusJob> modbusJobList = modbusJobService.selectDevicesJobByDeviceType(code, readVO.getSerialNumber());
             List<String> commandList = modbusJobList.stream().map(ModbusJob::getCommand).collect(Collectors.toList());

fastbee-iot-data/src/main/java/com/fastbee/iot/data/service/impl/FirmwareTaskServiceImpl.java

@@ -6,6 +6,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fastbee.common.core.mq.ota.OtaUpgradeDelayTask;
 import com.fastbee.common.enums.OTAUpgrade;
 import com.fastbee.common.exception.ServiceException;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.common.utils.DateUtils;
 import com.fastbee.common.utils.MessageUtils;
 import com.fastbee.common.utils.StringUtils;
@@ -140,7 +141,9 @@ public class FirmwareTaskServiceImpl extends ServiceImpl<FirmwareTaskMapper, Fir
             if (DateUtils.getNowDate().after(task.getStartTime())) {
                 throw new ServiceException(MessageUtils.message("firmware.task.upgrade.failed.time.not.valid"));
             }
-            //预定升级的任务放到 延迟任务队列
+            // 预定升级的任务放到 延迟任务队列
+            // 记录当前 TraceId，供延迟任务执行时恢复
+            task.setTraceId(TraceContext.getOrCreateTraceId());
             DelayUpgradeQueue.offerTask(task);
             FirmwareTask updatePo = new FirmwareTask();
             updatePo.setId(task.getTaskId());

fastbee-mq/src/main/java/com/fastbee/mq/producer/MessageProducer.java

@@ -5,6 +5,7 @@ import com.fastbee.common.core.mq.DeviceStatusBo;
 import com.fastbee.common.core.mq.DeviceTestReportBo;
 import com.fastbee.common.core.mq.MQSendMessageBo;
 import com.fastbee.common.core.mq.ota.OtaUpgradeBo;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.iot.model.modbus.ModbusPollJob;
 import com.fastbee.mq.queue.*;
 
@@ -15,26 +16,55 @@ import com.fastbee.mq.queue.*;
  */
 public class MessageProducer {
 
+    private MessageProducer() {
+        // 工具类，禁止实例化
+    }
+
     /*发送设备获取属性消息到队列*/
     public static void sendPropFetch(ModbusPollJob deviceJob) {
+        if (deviceJob == null) {
+            return;
+        }
+        // 设置 TraceId
+        deviceJob.setTraceId(TraceContext.getOrCreateTraceId());
         DevicePropFetchQueue.offer(deviceJob);
     }
 
     /*发送设备服务下发消息到队列*/
     public static void sendFunctionInvoke(MQSendMessageBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         FunctionInvokeQueue.offer(bo);
     }
 
     /*发送设备上报消息到队列*/
     public static void sendPublishMsg(DeviceReportBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         DeviceReportQueue.offer(bo);
     }
 
     public static void sendOtherMsg(DeviceReportBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         DeviceOtherQueue.offer(bo);
     }
 
     public static void sendStatusMsg(DeviceStatusBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         DeviceStatusQueue.offer(bo);
     }
 
@@ -44,16 +74,31 @@ public class MessageProducer {
      * @param bo
      */
     public static void sendDeviceTestMsg(DeviceTestReportBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         DeviceTestQueue.offer(bo);
     }
 
     /*发送OTA消息到队列*/
     public static void sendOtaUpgradeMsg(OtaUpgradeBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         OtaUpgradeQueue.offer(bo);
     }
 
     /*发送设备回复消息到队列*/
     public static void sendDeviceReplyMsg(DeviceReportBo bo) {
+        if (bo == null) {
+            return;
+        }
+        // 设置 TraceId
+        bo.setTraceId(TraceContext.getOrCreateTraceId());
         DeviceReplyQueue.offer(bo);
     }
 

fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/mapper/NotifyLogMapper.java

@@ -58,4 +58,12 @@ public interface NotifyLogMapper {
      * @return 结果
      */
     public int deleteNotifyLogByIds(Long[] ids);
+
+    /**
+     * 删除指定天数前的通知日志
+     *
+     * @param days 保留天数
+     * @return 删除记录数
+     */
+    public int deleteNotifyLogBeforeDays(int days);
 }

fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/INotifyLogService.java

@@ -58,4 +58,11 @@ public interface INotifyLogService {
      * @return 结果
      */
     public int deleteNotifyLogById(Long id);
+
+    /**
+     * 清理通知日志
+     *
+     * @param days 保留天数
+     */
+    public void cleanNotifyLog(int days);
 }

fastbee-notify/fastbee-notify-web/src/main/java/com/fastbee/notify/service/impl/NotifyLogServiceImpl.java

@@ -132,4 +132,14 @@ public class NotifyLogServiceImpl implements INotifyLogService {
     public int deleteNotifyLogById(Long id) {
         return notifyLogMapper.deleteNotifyLogById(id);
     }
+
+    /**
+     * 清理通知日志
+     *
+     * @param days 保留天数
+     */
+    @Override
+    public void cleanNotifyLog(int days) {
+        notifyLogMapper.deleteNotifyLogBeforeDays(days);
+    }
 }

fastbee-notify/fastbee-notify-web/src/main/resources/mapper/NotifyLogMapper.xml

@@ -138,4 +138,9 @@
             #{id}
         </foreach>
     </delete>
+
+    <delete id="deleteNotifyLogBeforeDays">
+        DELETE FROM notify_log
+        WHERE create_time &lt; DATE_SUB(NOW(), INTERVAL #{days} DAY)
+    </delete>
 </mapper>

fastbee-open-api/src/main/java/com/fastbee/controller/platform/PlatformDeviceMappingController.java

@@ -73,8 +73,23 @@ public class PlatformDeviceMappingController extends BaseController {
         return success("入网成功");
     }
 
+    @PreAuthorize("@ss.hasAnyPermi('platform:deviceMapping:query,platform:deviceMapping:list')")
+    @GetMapping("/static-level/reference-points")
+    @ApiOperation("查询已配置的静力水准基准点（跨网关基准点下拉框数据源）")
+    public AjaxResult listStaticLevelReferencePoints(@RequestParam Long platformId,
+                                                     @RequestParam(required = false) Long excludeMappingId) {
+        return success(mappingService.listConfiguredReferencePoints(platformId, excludeMappingId));
+    }
+
     // ==================== 子映射管理 ====================
 
+    @PreAuthorize("@ss.hasAnyPermi('platform:deviceMapping:query,platform:deviceMapping:list')")
+    @GetMapping("/sub-mappings/batch")
+    @ApiOperation("批量查询多个设备绑定的子设备映射（列表页展开行一次拉取，避免 N 次请求）")
+    public AjaxResult listSubMappingsBatch(@RequestParam List<Long> parentIds) {
+        return success(subMappingService.selectByParentIds(parentIds));
+    }
+
     @PreAuthorize("@ss.hasAnyPermi('platform:deviceMapping:query,platform:deviceMapping:list')")
     @GetMapping("/{id}/sub-mappings")
     @ApiOperation("查询子设备映射列表")

fastbee-open-api/src/main/java/com/fastbee/controller/system/LogCleanController.java

@@ -0,0 +1,102 @@
+package com.fastbee.controller.system;
+
+import com.fastbee.common.annotation.Log;
+import com.fastbee.common.core.controller.BaseController;
+import com.fastbee.common.core.domain.AjaxResult;
+import com.fastbee.common.enums.BusinessType;
+import com.fastbee.iot.platform.service.IPlatformPushLogService;
+import com.fastbee.iot.service.IAlertLogService;
+import com.fastbee.iot.service.IEventLogService;
+import com.fastbee.notify.service.INotifyLogService;
+import com.fastbee.quartz.service.ISysJobLogService;
+import com.fastbee.system.service.ISysLogininforService;
+import com.fastbee.system.service.ISysOperLogService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 日志清理Controller
+ *
+ * @author fastbee
+ */
+@Api(tags = "系统管理：日志清理")
+@RestController
+@RequestMapping("/system/log")
+public class LogCleanController extends BaseController {
+
+    @Autowired
+    private IEventLogService eventLogService;
+
+    @Autowired
+    private ISysOperLogService operLogService;
+
+    @Autowired
+    private ISysLogininforService logininforService;
+
+    @Autowired
+    private IAlertLogService alertLogService;
+
+    @Autowired
+    private ISysJobLogService jobLogService;
+
+    @Autowired
+    private INotifyLogService notifyLogService;
+
+    @Autowired
+    private IPlatformPushLogService platformPushLogService;
+
+    /**
+     * 清理日志数据
+     *
+     * @param days 保留天数，默认15天
+     * @return 清理结果
+     */
+    @ApiOperation("清理日志数据")
+    @PreAuthorize("@ss.hasRole('admin')")
+    @Log(title = "日志清理", businessType = BusinessType.CLEAN)
+    @PostMapping("/clean")
+    public AjaxResult cleanLogs(
+            @ApiParam("保留天数，默认15天")
+            @RequestParam(value = "days", defaultValue = "15") Integer days) {
+        try {
+            logger.info("手动触发日志清理，保留最近 {} 天的记录", days);
+
+            if (days < 1) {
+                return error("保留天数必须大于等于1天");
+            }
+
+            // 清理 IoT 事件日志
+            eventLogService.cleanEventLog(days);
+
+            // 清理系统操作日志
+            operLogService.cleanOperLog(days);
+
+            // 清理登录日志
+            logininforService.cleanLogininfor(days);
+
+            // 清理设备告警日志
+            alertLogService.cleanAlertLog(days);
+
+            // 清理定时任务日志
+            jobLogService.cleanJobLog(days);
+
+            // 清理通知日志
+            notifyLogService.cleanNotifyLog(days);
+
+            platformPushLogService.cleanPushLog(days);
+
+            logger.info("日志清理完成，保留最近 {} 天的记录", days);
+            return success(String.format("日志清理完成，已删除 %d 天前的历史数据", days));
+        } catch (Exception e) {
+            logger.error("日志清理失败", e);
+            return error("日志清理失败：" + e.getMessage());
+        }
+    }
+}

fastbee-open-api/src/main/java/com/fastbee/controller/tool/ToolController.java

@@ -254,20 +254,19 @@ public class ToolController extends BaseController {
             }
 
         } catch (Exception ex) {
-            ex.printStackTrace();
             log.error("发生错误：{}", ex.getMessage(), ex);
         }
     }
 
     @ApiOperation("mqtt钩子处理")
     @PostMapping("/mqtt/webhookv5")
-    public void webHookProcessv5(@RequestBody JSONObject json) {
+    public void webHookProcessV5(@RequestBody JSONObject json) {
         try {
             String clientid = json.getString("clientid");
             String event = json.getString("event");
             String peername = json.getString("peername");  // 类似 127.0.0.1:8812
             String ipAddress = peername;
-            if (peername.indexOf(":") != -1) {
+            if (peername.contains(":")) {
                 ipAddress = peername.substring(0, peername.indexOf(":"));
             }
             log.info("webhook:{},clientid:{},peername:{}", event, clientid, peername);
@@ -310,18 +309,17 @@ public class ToolController extends BaseController {
                 // 影子模式，发布属性和功能
                 if (device.getIsShadow() == 1) {
                     ThingsModelShadow shadow = deviceService.getDeviceShadowThingsModel(device);
-                    if (shadow.getProperties().size() > 0) {
+                    if (!shadow.getProperties().isEmpty()) {
                         messagePublish.publishProperty(device.getProductId(), device.getSerialNumber(), shadow.getProperties(), 3);
                     }
-                    if (shadow.getFunctions().size() > 0) {
+                    if (!shadow.getFunctions().isEmpty()) {
                         messagePublish.publishFunction(device.getProductId(), device.getSerialNumber(), shadow.getFunctions(), 3);
                     }
                 }
 
             }
         } catch (Exception ex) {
-            ex.printStackTrace();
+            log.error("发生错误：{}", ex.getMessage());
-            log.error("发生错误：" + ex.getMessage());
         }
     }
 

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/controller/SysJobController.java

@@ -83,9 +83,9 @@ public class SysJobController extends BaseController {
             return error(StringUtils.format(MessageUtils.message("job.add.failed.cron.not.valid"), job.getJobName()));
         } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
             return error(StringUtils.format(MessageUtils.message("job.add.failed.rmi.not.valid"), job.getJobName()));
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS)) {
             return error(StringUtils.format(MessageUtils.message("job.add.failed.ldap.not.valid"), job.getJobName()));
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.HTTP, Constants.HTTPS)) {
             return error(StringUtils.format(MessageUtils.message("job.add.failed.http.not.valid"), job.getJobName()));
         } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
             return error(StringUtils.format(MessageUtils.message("job.add.failed.string.error"), job.getJobName()));
@@ -108,9 +108,9 @@ public class SysJobController extends BaseController {
             return error(StringUtils.format(MessageUtils.message("job.update.failed.cron.not.valid"), job.getJobName()));
         } else if (StringUtils.containsIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_RMI)) {
             return error(StringUtils.format(MessageUtils.message("job.update.failed.rmi.not.valid"), job.getJobName()));
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.LOOKUP_LDAP, Constants.LOOKUP_LDAPS)) {
             return error(StringUtils.format(MessageUtils.message("job.update.failed.ldap.not.valid"), job.getJobName()));
-        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), new String[]{Constants.HTTP, Constants.HTTPS})) {
+        } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.HTTP, Constants.HTTPS)) {
             return error(StringUtils.format(MessageUtils.message("job.update.failed.http.not.valid"), job.getJobName()));
         } else if (StringUtils.containsAnyIgnoreCase(job.getInvokeTarget(), Constants.JOB_ERROR_STR)) {
             return error(StringUtils.format(MessageUtils.message("job.update.failed.string.error"), job.getJobName()));

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/mapper/SysJobLogMapper.java

@@ -61,4 +61,12 @@ public interface SysJobLogMapper {
      * 清空任务日志
      */
     public void cleanJobLog();
+
+    /**
+     * 删除指定天数前的任务日志
+     *
+     * @param days 保留天数
+     * @return 删除记录数
+     */
+    public int deleteJobLogBeforeDays(int days);
 }

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/service/ISysJobLogService.java

@@ -53,4 +53,11 @@ public interface ISysJobLogService {
      * 清空任务日志
      */
     public void cleanJobLog();
+
+    /**
+     * 清理指定天数前的任务日志
+     *
+     * @param days 保留天数
+     */
+    public void cleanJobLog(int days);
 }

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/service/impl/SysJobLogServiceImpl.java

@@ -78,4 +78,14 @@ public class SysJobLogServiceImpl implements ISysJobLogService {
     public void cleanJobLog() {
         jobLogMapper.cleanJobLog();
     }
+
+    /**
+     * 清理指定天数前的任务日志
+     *
+     * @param days 保留天数
+     */
+    @Override
+    public void cleanJobLog(int days) {
+        jobLogMapper.deleteJobLogBeforeDays(days);
+    }
 }

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/util/AbstractQuartzJob.java

@@ -2,9 +2,10 @@ package com.fastbee.quartz.util;
 
 import com.fastbee.common.constant.Constants;
 import com.fastbee.common.constant.ScheduleConstants;
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
 import com.fastbee.common.utils.ExceptionUtil;
 import com.fastbee.common.utils.StringUtils;
-import com.fastbee.common.utils.TraceIdUtils;
 import com.fastbee.common.utils.bean.BeanUtils;
 import com.fastbee.common.utils.spring.SpringUtils;
 import com.fastbee.quartz.domain.SysJob;
@@ -29,7 +30,7 @@ public abstract class AbstractQuartzJob implements Job {
     /**
      * 线程本地变量
      */
-    private static ThreadLocal<Date> threadLocal = new ThreadLocal<>();
+    private static final ThreadLocal<Date> threadLocal = new ThreadLocal<>();
 
     @Override
     public void execute(JobExecutionContext context) throws JobExecutionException {
@@ -37,9 +38,7 @@ public abstract class AbstractQuartzJob implements Job {
         BeanUtils.copyBeanProp(sysJob, context.getMergedJobDataMap().get(ScheduleConstants.TASK_PROPERTIES));
         try {
             before(context, sysJob);
-            if (sysJob != null) {
+            doExecute(context, sysJob);
-                doExecute(context, sysJob);
-            }
             after(context, sysJob, null);
         } catch (Exception e) {
             log.error("任务执行异常  - ：", e);
@@ -56,8 +55,8 @@ public abstract class AbstractQuartzJob implements Job {
     protected void before(JobExecutionContext context, SysJob sysJob) {
         threadLocal.set(new Date());
 
-        // 为定时任务生成TraceId，使用统一的生成逻辑
+        // 为定时任务生成 TraceId
-        TraceIdUtils.generateTraceId();
+        TraceContext.setTraceId(TraceIdGenerator.generate());
 
         log.info("定时任务开始执行: {} - {}", sysJob.getJobName(), sysJob.getJobGroup());
     }
@@ -77,9 +76,6 @@ public abstract class AbstractQuartzJob implements Job {
         sysJobLog.setJobGroup(sysJob.getJobGroup());
         sysJobLog.setInvokeTarget(sysJob.getInvokeTarget());
         sysJobLog.setStartTime(startTime);
-        sysJobLog.setStopTime(new Date());
-        long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
-        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
         if (e != null) {
             sysJobLog.setStatus(Constants.FAIL);
             String errorMsg = StringUtils.substring(ExceptionUtil.getExceptionMessage(e), 0, 2000);
@@ -87,14 +83,17 @@ public abstract class AbstractQuartzJob implements Job {
         } else {
             sysJobLog.setStatus(Constants.SUCCESS);
         }
-
+        sysJobLog.setStopTime(new Date());
+        long runMs = sysJobLog.getStopTime().getTime() - sysJobLog.getStartTime().getTime();
+        sysJobLog.setJobMessage(sysJobLog.getJobName() + " 总共耗时：" + runMs + "毫秒");
         // 写入数据库当中
         SpringUtils.getBean(ISysJobLogService.class).addJobLog(sysJobLog);
 
-        // 清除TraceId，避免内存泄漏
-        TraceIdUtils.clearTraceId();
-
         log.info("定时任务执行完成: {} - {}, 耗时: {}ms", sysJob.getJobName(), sysJob.getJobGroup(), runMs);
+
+        // 清除 TraceContext
+        TraceContext.clear();
+
     }
 
     /**

fastbee-plugs/fastbee-quartz/src/main/java/com/fastbee/quartz/util/JobInvokeUtil.java

@@ -99,8 +99,8 @@ public class JobInvokeUtil {
         }
         String[] methodParams = methodStr.split(",(?=([^\"']*[\"'][^\"']*[\"'])*[^\"']*$)");
         List<Object[]> classs = new LinkedList<>();
-        for (int i = 0; i < methodParams.length; i++) {
+        for (String methodParam : methodParams) {
-            String str = StringUtils.trimToEmpty(methodParams[i]);
+            String str = StringUtils.trimToEmpty(methodParam);
             // String字符串类型，以'或"开头
             if (StringUtils.startsWithAny(str, "'", "\"")) {
                 classs.add(new Object[]{StringUtils.substring(str, 1, str.length() - 1), String.class});
@@ -151,7 +151,7 @@ public class JobInvokeUtil {
         Object[] classs = new Object[methodParams.size()];
         int index = 0;
         for (Object[] os : methodParams) {
-            classs[index] = (Object) os[0];
+            classs[index] = os[0];
             index++;
         }
         return classs;

fastbee-plugs/fastbee-quartz/src/main/resources/mapper/quartz/SysJobLogMapper.xml

@@ -77,6 +77,11 @@
         truncate table sys_job_log
     </update>
 
+    <delete id="deleteJobLogBeforeDays">
+        DELETE FROM sys_job_log
+        WHERE create_time &lt; DATE_SUB(NOW(), INTERVAL #{days} DAY)
+    </delete>
+
     <insert id="insertJobLog" parameterType="SysJobLog">
         insert into sys_job_log(
         <if test="jobLogId != null and jobLogId != 0">job_log_id,</if>

fastbee-protocol/fastbee-protocol-collect/src/main/java/com/fastbee/modbus/model/ModbusRtu.java

@@ -47,7 +47,7 @@ public class ModbusRtu extends Message {
     protected int start;
     @Column(length = 1, version = {0x80, 0x81}, desc = "标识位,实例设备是0x80")
     protected int mId;
-    @Column(length = 6, version = 0x80, desc = "MAC地址,6个字节")
+    @Column(length = 6, version = {0x80, 0x81}, desc = "MAC地址,6个字节")
     protected String mac;
     @Column(length = 1, version = {0x80, 0x81}, desc = "结尾,如：7E")
     protected int end;

fastbee-protocol/fastbee-protocol-collect/src/main/java/com/fastbee/modbus/pak/ModbusEndPoint.java

@@ -39,7 +39,14 @@ public class ModbusEndPoint {
 
     @PakMapping(types = 心跳包)
     public void heartbeat(DeviceReport message, Session session) {
-
+        //心跳包处理：确保设备注册并更新在线状态
+        if (!session.isRegistered()) {
+            session.register(message);
+            //记录设备信息
+            DeviceMsg deviceMsg = new DeviceMsg();
+            deviceMsg.setClientId(message.getClientId());
+            session.setAttribute(SessionKey.DeviceMsg, deviceMsg);
+        }
     }
 
 }

fastbee-record/src/main/java/com/fastbee/record/config/ThreadPoolTaskConfig.java

@@ -1,5 +1,6 @@
 package com.fastbee.record.config;
 
+import com.fastbee.common.trace.MdcTaskDecorator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -52,6 +53,10 @@ public class ThreadPoolTaskConfig {
         // 线程池对拒绝任务的处理策略
         // CallerRunsPolicy：由调用线程（提交任务的线程）处理该任务
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+
+        // 新增：配置 TaskDecorator，自动传播 TraceId
+        executor.setTaskDecorator(new MdcTaskDecorator());
+
         // 初始化
         executor.initialize();
         return executor;

fastbee-server/base-server/src/main/java/com/fastbee/base/core/hanler/ConnectionTraceHandler.java

@@ -0,0 +1,82 @@
+package com.fastbee.base.core.hanler;
+
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.util.AttributeKey;
+
+/**
+ * 连接级链路追踪处理器（TCP 专用）
+ *
+ * <p>与 {@link TraceHandler}（每报文一个 TraceId）不同，本处理器以「一次 TCP 连接」为粒度：
+ * 在连接建立（channelActive）时生成唯一 TraceId 并绑定到 Channel 的 attr 上，
+ * 该连接生命周期内的所有入站事件（读、异常、空闲等）共用同一个 TraceId，
+ * 便于把同一设备 TCP 会话的全部日志用一个 traceId 检索出来。
+ *
+ * <p>注意：
+ * <ul>
+ *   <li>Netty EventLoop 线程被多连接复用，因此每次入站事件处理前后必须 set/clear MDC，
+ *       避免 TraceId 在 EventLoop 上串线。连接级仅指「TraceId 的取值来源」，
+ *       不再每次重新生成，清理逻辑与 {@link TraceHandler} 一致。</li>
+ *   <li>TraceId 存储在 Channel.attr 中，handler 自身保持无状态，可继续用 {@code @Sharable} 单例。</li>
+ *   <li>UDP 为无连接协议，请勿复用本处理器，仍应使用 {@link TraceHandler}（每报文一个 TraceId）。</li>
+ * </ul>
+ *
+ * @author FastBee
+ */
+@ChannelHandler.Sharable
+public class ConnectionTraceHandler extends ChannelInboundHandlerAdapter {
+
+    /**
+     * 共享实例（无状态，可跨 Channel 复用）
+     */
+    public static final ConnectionTraceHandler INSTANCE = new ConnectionTraceHandler();
+
+    /**
+     * 连接级 TraceId 在 Channel 属性中的 key
+     */
+    private static final AttributeKey<String> CONN_TRACE_ID = AttributeKey.valueOf("connTraceId");
+
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) {
+        // 连接建立时生成一次连接级 TraceId，绑定到当前 Channel
+        ctx.channel().attr(CONN_TRACE_ID).set(TraceIdGenerator.generate());
+        withTrace(ctx, ctx::fireChannelActive);
+    }
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) {
+        withTrace(ctx, () -> ctx.fireChannelRead(msg));
+    }
+
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object evt) {
+        withTrace(ctx, () -> ctx.fireUserEventTriggered(evt));
+    }
+
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        withTrace(ctx, () -> ctx.fireExceptionCaught(cause));
+    }
+
+    /**
+     * 包裹一次入站事件：套用连接级 TraceId 到 MDC，执行后清理，
+     * 防止 EventLoop 线程复用导致 TraceId 串到其它连接。
+     *
+     * @param ctx  当前 Channel 上下文
+     * @param event 需要包裹的入站事件
+     */
+    private void withTrace(ChannelHandlerContext ctx, Runnable event) {
+        String traceId = ctx.channel().attr(CONN_TRACE_ID).get();
+        if (traceId != null) {
+            TraceContext.setTraceId(traceId);
+        }
+        try {
+            event.run();
+        } finally {
+            TraceContext.clear();
+        }
+    }
+}

fastbee-server/base-server/src/main/java/com/fastbee/base/core/hanler/TraceHandler.java

@@ -0,0 +1,38 @@
+package com.fastbee.base.core.hanler;
+
+import com.fastbee.common.trace.TraceContext;
+import com.fastbee.common.trace.TraceIdGenerator;
+import io.netty.channel.ChannelHandler;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+
+/**
+ * Netty 链路追踪处理器
+ *
+ * <p>放置在协议 pipeline 的最前端（编解码器之前），为每条入站报文生成独立的 TraceId，
+ * 使解码、分发、业务处理全链路的日志都携带同一个 TraceId。
+ *
+ * <p>注意：Netty EventLoop 线程会被多连接/多报文复用，
+ * 因此必须在处理结束后清理，否则会造成 TraceId 串线。
+ *
+ * @author FastBee
+ */
+@ChannelHandler.Sharable
+public class TraceHandler extends ChannelInboundHandlerAdapter {
+
+    /**
+     * 共享实例（无状态，可跨 Channel 复用）
+     */
+    public static final TraceHandler INSTANCE = new TraceHandler();
+
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) {
+        // 每条设备报文都是独立业务事件，生成新的 TraceId
+        TraceContext.setTraceId(TraceIdGenerator.generate());
+        try {
+            ctx.fireChannelRead(msg);
+        } finally {
+            TraceContext.clear();
+        }
+    }
+}

fastbee-server/iot-server-core/src/main/java/com/fastbee/server/TCPServer.java

@@ -1,5 +1,6 @@
 package com.fastbee.server;
 
+import com.fastbee.base.core.hanler.ConnectionTraceHandler;
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.server.config.NettyConfig;
 import com.fastbee.server.handler.*;
@@ -61,9 +62,12 @@ public class TCPServer extends Server {
                     @Override
                     protected void initChannel(NioSocketChannel channel) throws Exception {
                         channel.pipeline()
+                                // 第一步、链路追踪（必须位于编解码器之前，让解码日志也带 TraceId）
+                                // 连接级：同一 TCP 连接生命周期内共用一个 TraceId，便于整段会话检索
+                                .addLast(FastBeeConstant.SERVER.TRACE, ConnectionTraceHandler.INSTANCE)
                                 // 设置心跳时间
                                 .addLast(new IdleStateHandler(config.readerIdleTime, config.writerIdleTime, config.allIdleTime))
-                                // 第一步、添加粘包处理器
+                                // 第二步、添加粘包处理器
                                 .addLast(FastBeeConstant.SERVER.FRAMEDECODER, new ProtocolSniffingDecoder(config.maxFrameLength))
                                 // 第二步、添加消息适配器
                                 .addLast(FastBeeConstant.SERVER.ADAPTER, adapter)

fastbee-server/iot-server-core/src/main/java/com/fastbee/server/UDPServer.java

@@ -1,5 +1,6 @@
 package com.fastbee.server;
 
+import com.fastbee.base.core.hanler.TraceHandler;
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.server.config.NettyConfig;
 import com.fastbee.server.handler.DispatcherHandler;
@@ -52,6 +53,8 @@ public class UDPServer extends Server {
                     @Override
                     protected void initChannel(NioDatagramChannel channel) throws Exception {
                         channel.pipeline()
+                                // 链路追踪（位于编解码器之前，让解码日志也带 TraceId）
+                                .addLast(FastBeeConstant.SERVER.TRACE, TraceHandler.INSTANCE)
                                 .addLast(FastBeeConstant.SERVER.ADAPTER, adapter)
                                 .addLast(FastBeeConstant.SERVER.DECODER, decoder)
                                 .addLast(FastBeeConstant.SERVER.ENCODER, encoder)

fastbee-server/iot-server-core/src/main/java/com/fastbee/server/handler/DispatcherHandler.java

@@ -13,6 +13,7 @@ import com.fastbee.common.core.mq.DeviceTestReportBo;
 import com.fastbee.common.core.protocol.Message;
 import com.fastbee.common.core.thingsModel.ThingsModelSimpleItem;
 import com.fastbee.common.enums.ServerType;
+import com.fastbee.common.trace.TraceContext;
 import com.fastbee.common.utils.DateUtils;
 import com.fastbee.mq.producer.MessageProducer;
 import io.netty.channel.ChannelHandler;
@@ -61,6 +62,7 @@ public class DispatcherHandler extends ChannelInboundHandlerAdapter {
             s.increment();
         }
 
+        /*TraceId 由 pipeline 头部的 TraceHandler 统一生成与清理*/
         Packet packet = (Packet) msg;
         Message request = packet.message;
         // 判断是否注册
@@ -127,7 +129,16 @@ public class DispatcherHandler extends ChannelInboundHandlerAdapter {
             }
         } else {
             if (handler.async) {
-                executor.execute(() -> channelRead0(ctx, packet, handler));
+                /*异步执行：手动透传 TraceId（业务线程池非Spring管理，无 TaskDecorator）*/
+                final String traceId = TraceContext.getTraceId();
+                executor.execute(() -> {
+                    TraceContext.ensureTraceId(traceId);
+                    try {
+                        channelRead0(ctx, packet, handler);
+                    } finally {
+                        TraceContext.clear();
+                    }
+                });
             } else {
                 channelRead0(ctx, packet, handler);
             }

fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/handler/adapter/MqttMessageDelegate.java

@@ -55,6 +55,8 @@ public class MqttMessageDelegate {
             log.error("=>客户端未连接");
             throw new ServiceException("客户端未连接");
         }
+
+        /*TraceId 由 pipeline 头部的 ConnectionTraceHandler（连接级）统一生成与清理*/
         Optional.of(processor.get(messageType))
                 .ifPresent(mqttHandler -> mqttHandler.handler(ctx, message));
     }

fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/server/MqttServer.java

@@ -1,5 +1,6 @@
 package com.fastbee.mqtt.server;
 
+import com.fastbee.base.core.hanler.ConnectionTraceHandler;
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.mqtt.handler.adapter.MqttMessageAdapter;
 import com.fastbee.server.Server;
@@ -54,6 +55,8 @@ public class MqttServer extends Server {
                         channel.pipeline()
                                 .addFirst(FastBeeConstant.SERVER.IDLE
                                         , new IdleStateHandler(config.readerIdleTime, config.writerIdleTime, config.allIdleTime, TimeUnit.SECONDS))
+                                // 链路追踪（位于编解码器之前，让解码日志也带 TraceId）
+                                .addFirst(FastBeeConstant.SERVER.TRACE, ConnectionTraceHandler.INSTANCE)
                                 .addLast(FastBeeConstant.SERVER.DECODER, new MqttDecoder(1024 * 1024 * 2))
                                 .addLast(FastBeeConstant.SERVER.ENCODER, MqttEncoder.INSTANCE)
                                 .addLast(messageAdapter);

fastbee-server/mqtt-broker/src/main/java/com/fastbee/mqtt/server/WebSocketServer.java

@@ -1,5 +1,6 @@
 package com.fastbee.mqtt.server;
 
+import com.fastbee.base.core.hanler.ConnectionTraceHandler;
 import com.fastbee.common.constant.FastBeeConstant;
 import com.fastbee.mqtt.codec.WebSocketMqttCodec;
 import com.fastbee.mqtt.handler.adapter.MqttMessageAdapter;
@@ -49,6 +50,8 @@ public class WebSocketServer extends Server {
                         ch.pipeline()
                                 .addFirst(FastBeeConstant.WS.HEART_BEAT
                                         , new IdleStateHandler(0, 0, 70))
+                                /*链路追踪（位于编解码器之前，让解码日志也带 TraceId）*/
+                                .addFirst(FastBeeConstant.SERVER.TRACE, ConnectionTraceHandler.INSTANCE)
                                 /*http请求响应*/
                                 .addLast(FastBeeConstant.WS.HTTP_SERVER_CODEC, new HttpServerCodec())
                                 /*聚合header与body组成完整的Http请求，最大数据量为1Mb*/

fastbee-server/sip-server/src/main/java/com/fastbee/sip/conf/ThreadPoolTaskConfig.java

@@ -1,5 +1,6 @@
 package com.fastbee.sip.conf;
 
+import com.fastbee.common.trace.MdcTaskDecorator;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.scheduling.annotation.EnableAsync;
@@ -26,6 +27,8 @@ public class ThreadPoolTaskConfig {
         executor.setKeepAliveSeconds(keepAliveTime);
         executor.setThreadNamePrefix(threadNamePrefix);
         executor.setRejectedExecutionHandler(new ThreadPoolExecutor.CallerRunsPolicy());
+        // 配置 TaskDecorator，自动传播 TraceId
+        executor.setTaskDecorator(new MdcTaskDecorator());
         executor.initialize();
         return executor;
     }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/Device.java

@@ -101,6 +101,13 @@ public class Device extends BaseEntity {
     @TableField(exist = false)
     private Integer deviceType;
 
+    /**
+     * 设备类型列表（用于多类型过滤）
+     */
+    @ApiModelProperty("设备类型列表（用于多类型过滤，如[1,2]表示直连和网关设备）")
+    @TableField(exist = false)
+    private List<Integer> deviceTypes;
+
     /**
      * 设备状态（1-未激活，2-禁用，3-在线，4-离线）
      */

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/Product.java

@@ -130,7 +130,7 @@ public class Product extends BaseEntity {
     /**
      * 设备类型（1-直连设备、2-网关子设备、3-网关设备）
      */
-    @ApiModelProperty(value = "设备类型", notes = "（1-直连设备、2-网关子设备、3-网关设备、4-网关子设备）")
+    @ApiModelProperty(value = "设备类型", notes = "（1-直连设备、2-网关设备、3-监控设备、4-网关子设备）")
     @Excel(name = "设备类型", readConverterExp = "1=直连设备、2=网关设备、3=监控设备、4-网关子设备")
     private Integer deviceType;
     /**

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/domain/Script.java

@@ -96,6 +96,11 @@ public class Script extends BaseEntity {
 
     private String productName;
 
+    /**
+     * 设备编号列表（逗号分隔，为空表示全部设备）
+     */
+    private String serialNumbers;
+
     /**
      * 是否生效
      */

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/AlertLogMapper.java

@@ -115,4 +115,12 @@ public interface AlertLogMapper {
      * @return com.fastbee.iot.model.AlertCountVO
      */
     List<AlertCountVO> countAlertLevel(DataCenterParam dataCenterParam);
+
+    /**
+     * 删除指定天数前的告警日志
+     *
+     * @param days 保留天数
+     * @return 删除记录数
+     */
+    int deleteAlertLogBeforeDays(@Param("days") int days);
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/mapper/EventLogMapper.java

@@ -25,4 +25,12 @@ public interface EventLogMapper extends BaseMapperX<EventLog> {
 
     Long selectEventLogCount(@Param("userId") Long userId);
 
+    /**
+     * 删除指定天数前的日志
+     *
+     * @param days 保留天数
+     * @return 删除记录数
+     */
+    int deleteEventLogBeforeDays(@Param("days") int days);
+
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/ScriptCondition.java

@@ -46,6 +46,11 @@ public class ScriptCondition {
      */
     private Long productId;
 
+    /**
+     * 当前上报设备的编号（用于设备级过滤，为空不过滤）
+     */
+    private String serialNumber;
+
     /**
      * 场景ID
      */

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/model/modbus/ModbusPollJob.java

@@ -11,6 +11,9 @@ import lombok.Data;
 @Data
 public class ModbusPollJob {
 
+    /** 链路追踪ID */
+    private String traceId;
+
     private ModbusPollMsg pollMsg;
 
     private DeviceJob deviceJob;

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/adapter/dcp/DcpPlatformAdapter.java

@@ -18,6 +18,7 @@ import com.fastbee.iot.platform.flow.FlowContext;
 import com.fastbee.iot.platform.model.json.*;
 import com.fastbee.iot.platform.flow.PlatformFlowExecutor;
 import com.fastbee.iot.platform.mapper.PlatformFlowMapper;
+import com.fastbee.iot.platform.mapper.PlatformDeviceMappingMapper;
 import com.fastbee.iot.platform.mapper.PlatformInterfaceMapper;
 import com.fastbee.iot.platform.mapper.PlatformUserAuthMapper;
 import com.fastbee.iot.platform.service.IPlatformDeviceSubMappingService;
@@ -35,6 +36,7 @@ import java.time.OffsetDateTime;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
 import java.time.format.DateTimeParseException;
+import java.util.ArrayList;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.LinkedHashMap;
@@ -69,6 +71,8 @@ public class DcpPlatformAdapter {
     private PlatformInterfaceMapper interfaceMapper;
     @Autowired
     private PlatformUserAuthMapper platformUserAuthMapper;
+    @Autowired
+    private PlatformDeviceMappingMapper mappingMapper;
 
     @Autowired
     private IPlatformInstanceService instanceService;
@@ -198,7 +202,10 @@ public class DcpPlatformAdapter {
                 bufferService.saveReferenceData(platform.getId(), fieldName, reportSerialNumber, currentItem, reportIntervalSec);
                 int replayCount = replayPendingMonitorData(platform, userAuth, mapping, fieldName, currentItem,
                         reportIntervalSec, baseUrl, interfaceCode);
-                log.info("[DCP] 基准点 {} 已缓存，补推监测点 {} 条", reportSerialNumber, replayCount);
+                int crossCount = replaySiblingGatewayMonitors(platform, userAuth, mapping, fieldName, currentItem,
+                        reportIntervalSec, reportSerialNumber);
+                log.info("[DCP] 基准点 {} 已缓存，补推监测点 {} 条（其中跨网关 {} 条）",
+                        reportSerialNumber, replayCount + crossCount, crossCount);
                 return;
             }
 
@@ -294,8 +301,15 @@ public class DcpPlatformAdapter {
         throw new RuntimeException("不支持的数组组包模式 arrayMode=" + mode);
     }
 
-    /** 解析基准点序列号 */
+    /** 解析基准点序列号：跨网关配置 > 本网关基准点行 > onboard_config > 网关序列号 */
     private String resolveRefSerialNumber(PlatformDeviceSubMapping subMapping, PlatformDeviceMapping mapping) {
+        // 跨网关基准点：前端在下拉框中选择的、属于其他网关的基准点序列号
+        ExtraMappingConfig extra = mapping.getExtraMappingParsed();
+        if (extra != null && extra.getStaticLevel() != null
+                && StringUtils.hasText(extra.getStaticLevel().getReferenceSerialNumber())) {
+            return extra.getStaticLevel().getReferenceSerialNumber();
+        }
+
         try {
             PlatformDeviceSubMapping reference = subMappingService.findReference(mapping.getId());
             if (reference != null && StringUtils.hasText(reference.getSubSerialNumber())) {
@@ -315,17 +329,69 @@ public class DcpPlatformAdapter {
     }
 
     /**
-     * 基准点后到时，补推此前缓存的监测点数据。
+     * 基准点后到时，补推此前缓存的监测点数据（本网关 + 引用该基准点的其他网关）。
      */
     private int replayPendingMonitorData(PlatformInstance platform, PlatformUserAuth userAuth,PlatformDeviceMapping mapping,
                                          String fieldName, JSONObject referenceItem,
                                          int reportIntervalSec, String baseUrl, String interfaceCode) {
+        return replayMonitorsOfMapping(platform, userAuth, mapping, fieldName, referenceItem,
+                reportIntervalSec, baseUrl, interfaceCode);
+    }
+
+    /**
+     * 跨网关补推：基准点上报后，补推其他网关中引用该基准点、且已缓存等待的监测点。
+     *
+     * @param refSerialNumber 本次上报的基准点序列号
+     */
+    private int replaySiblingGatewayMonitors(PlatformInstance platform, PlatformUserAuth userAuth,
+                                             PlatformDeviceMapping refMapping, String fieldName,
+                                             JSONObject referenceItem, int reportIntervalSec,
+                                             String refSerialNumber) {
+        List<PlatformDeviceMapping> siblings = mappingMapper.selectList(Wrappers.<PlatformDeviceMapping>lambdaQuery()
+                .eq(PlatformDeviceMapping::getPlatformId, platform.getId())
+                .ne(PlatformDeviceMapping::getId, refMapping.getId())
+                .eq(PlatformDeviceMapping::getSensorType, "static_level")
+                .eq(PlatformDeviceMapping::getDeviceType, 1)
+                .eq(PlatformDeviceMapping::getNetStatus, 1));
+        if (siblings == null || siblings.isEmpty()) {
+            return 0;
+        }
+
+        int replayCount = 0;
+        for (PlatformDeviceMapping sibling : siblings) {
+            // 仅处理配置了跨网关基准点、且指向本次上报基准点的网关
+            ExtraMappingConfig extra = sibling.getExtraMappingParsed();
+            if (extra == null || extra.getStaticLevel() == null
+                    || !refSerialNumber.equals(extra.getStaticLevel().getReferenceSerialNumber())) {
+                continue;
+            }
+            PlatformInterface pushInterface = interfaceMapper.selectById(sibling.getPushInterfaceId());
+            if (pushInterface == null) {
+                log.warn("[DCP] 跨网关补推跳过：网关 {} 未配置推送接口", sibling.getSerialNumber());
+                continue;
+            }
+            String baseUrl = platform.getBaseUrl() + resolvePushPath(sibling, pushInterface);
+            String interfaceCode = resolveInterfaceCode(sibling.getSensorType(), pushInterface);
+            replayCount += replayMonitorsOfMapping(platform, userAuth, sibling, fieldName, referenceItem,
+                    reportIntervalSec, baseUrl, interfaceCode);
+        }
+        return replayCount;
+    }
+
+    /**
+     * 补推指定网关下所有已缓存的监测点：合并为一次 HTTP 请求推送，
+     * 全部成功才清空缓存，失败则整批保留缓存等待下次基准点上报。
+     */
+    private int replayMonitorsOfMapping(PlatformInstance platform, PlatformUserAuth userAuth, PlatformDeviceMapping mapping,
+                                        String fieldName, JSONObject referenceItem,
+                                        int reportIntervalSec, String baseUrl, String interfaceCode) {
         List<PlatformDeviceSubMapping> subMappings = subMappingService.selectByParentId(mapping.getId());
         if (subMappings == null || subMappings.isEmpty()) {
             return 0;
         }
 
-        int replayCount = 0;
+        JSONArray pushBodyArray = new JSONArray();
+        List<String> pushedSerials = new ArrayList<>();
         for (PlatformDeviceSubMapping monitor : subMappings) {
             if (monitor == null || !monitor.isMonitor() || !StringUtils.hasText(monitor.getSubSerialNumber())) {
                 continue;
@@ -353,23 +419,32 @@ public class DcpPlatformAdapter {
             JSONArray sensorData = new JSONArray();
             sensorData.add(referenceItem);
             sensorData.add(monitorItem);
-            JSONArray pushBody = buildArrayPushBody(mapping, bodyFields, fieldName,
+            JSONArray deviceBodyArr = buildArrayPushBody(mapping, bodyFields, fieldName,
                     sensorData, monitor.getPlatformDeviceId());
-
+            if (!deviceBodyArr.isEmpty()) {
-            PlatformPushLog logEntry = createLogEntry(platform, mapping, interfaceCode, monitor.getSubSerialNumber());
+                pushBodyArray.add(deviceBodyArr.get(0));
-            doHttpPost(platform, userAuth, mapping, baseUrl, JSON.toJSONString(pushBody), logEntry);
+                pushedSerials.add(monitor.getSubSerialNumber());
-            pushLogService.asyncSave(logEntry);
-            if (logEntry.getStatus() != null && logEntry.getStatus() == 1) {
-                bufferService.removeMonitorData(platform.getId(), fieldName, monitor.getSubSerialNumber());
-                replayCount++;
-                log.info("[DCP] 基准点后到，已补推监测点 {} deviceId={}",
-                        monitor.getSubSerialNumber(), monitor.getPlatformDeviceId());
-            } else {
-                log.warn("[DCP] 基准点后到，补推监测点 {} 失败，保留缓存等待下次基准点上报",
-                        monitor.getSubSerialNumber());
             }
         }
-        return replayCount;
+
+        if (pushBodyArray.isEmpty()) {
+            return 0;
+        }
+
+        PlatformPushLog logEntry = createLogEntry(platform, mapping, interfaceCode, mapping.getSerialNumber());
+        doHttpPost(platform, userAuth, mapping, baseUrl, JSON.toJSONString(pushBodyArray), logEntry);
+        pushLogService.asyncSave(logEntry);
+
+        if (logEntry.getStatus() != null && logEntry.getStatus() == 1) {
+            pushedSerials.forEach(serial -> bufferService.removeMonitorData(platform.getId(), fieldName, serial));
+            log.info("[DCP] 基准点后到，已合并补推监测点 {} 条 mappingId={} 序列号={}",
+                    pushedSerials.size(), mapping.getId(), String.join(",", pushedSerials));
+            return pushedSerials.size();
+        }
+
+        log.warn("[DCP] 基准点后到，合并补推 {} 条失败，整批保留缓存等待下次基准点上报 mappingId={}",
+                pushedSerials.size(), mapping.getId());
+        return 0;
     }
 
     // ==================== 普通推送 ====================

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/job/PlatformPushScheduledJob.java

@@ -223,7 +223,12 @@ public class PlatformPushScheduledJob {
         }
 
         for (PlatformDeviceSubMapping subMapping : subMappings) {
-            if (subMapping == null || subMapping.getPlatformDeviceId() == null) {
+            if (subMapping == null) {
+                continue;
+            }
+            // 基准点本身不单独推送（无平台设备ID），但仍需进入推送入口以刷新基准点缓冲，
+            // 否则跨网关/同网关的监测点配对时读不到新鲜基准点数据
+            if (subMapping.getPlatformDeviceId() == null && !subMapping.isReference()) {
                 continue;
             }
             try {

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformDeviceSubMappingMapper.java

@@ -10,6 +10,9 @@ public interface PlatformDeviceSubMappingMapper extends BaseMapperX<PlatformDevi
 
     List<PlatformDeviceSubMapping> selectByParentId(@Param("parentMappingId") Long parentMappingId);
 
+    /** 批量查询多个父映射下的所有子映射（IN 查询，列表页展开行使用） */
+    List<PlatformDeviceSubMapping> selectByParentIds(@Param("parentIds") List<Long> parentIds);
+
     PlatformDeviceSubMapping selectByParentAndSerial(@Param("parentMappingId") Long parentMappingId,
                                                      @Param("subSerialNumber") String subSerialNumber);
 

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/mapper/PlatformPushLogMapper.java

@@ -14,4 +14,5 @@ public interface PlatformPushLogMapper extends BaseMapperX<PlatformPushLog> {
 
     void cleanPushLog();
 
+    void deletePushLogBeforeDays(int days);
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformDeviceMappingService.java

@@ -5,6 +5,7 @@ import com.fastbee.iot.platform.domain.PlatformDeviceMapping;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 
 public interface IPlatformDeviceMappingService extends IService<PlatformDeviceMapping> {
 
@@ -18,4 +19,11 @@ public interface IPlatformDeviceMappingService extends IService<PlatformDeviceMa
 
     /** 更新最近已推送数据时间 */
     void updateLastPushTime(Long id, Date lastPushTime);
+
+    /**
+     * 查询已配置的静力水准基准点列表（跨网关基准点下拉框数据源）。
+     * 范围：同平台下 sensorType=static_level 的网关绑定，排除 excludeMappingId 自身，
+     * 取其子映射中 deviceRole=reference 的行。
+     */
+    List<Map<String, String>> listConfiguredReferencePoints(Long platformId, Long excludeMappingId);
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformDeviceSubMappingService.java

@@ -4,12 +4,16 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fastbee.iot.platform.domain.PlatformDeviceSubMapping;
 
 import java.util.List;
+import java.util.Map;
 
 public interface IPlatformDeviceSubMappingService extends IService<PlatformDeviceSubMapping> {
 
     /** 查询父映射下的所有子映射 */
     List<PlatformDeviceSubMapping> selectByParentId(Long parentMappingId);
 
+    /** 批量查询多个父映射下的子映射，按 parentMappingId 分组返回（列表页展开行一次拉取，避免 N 次请求） */
+    Map<Long, List<PlatformDeviceSubMapping>> selectByParentIds(List<Long> parentIds);
+
     /** 根据子设备序列号查找子映射（推送时使用） */
     List<PlatformDeviceSubMapping> selectBySubSerialNumber(String subSerialNumber);
 

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/IPlatformPushLogService.java

@@ -23,4 +23,5 @@ public interface IPlatformPushLogService extends IService<PlatformPushLog> {
      */
     void cleanPushLog();
 
+    void cleanPushLog(int days);
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformDeviceMappingServiceImpl.java

@@ -3,6 +3,8 @@ package com.fastbee.iot.platform.service.impl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fastbee.iot.domain.Device;
+import com.fastbee.iot.mapper.DeviceMapper;
 import com.fastbee.iot.platform.domain.*;
 import com.fastbee.iot.platform.flow.FlowContext;
 import com.fastbee.iot.platform.flow.PlatformFlowExecutor;
@@ -10,6 +12,8 @@ import com.fastbee.iot.platform.mapper.PlatformDeviceMappingMapper;
 import com.fastbee.iot.platform.mapper.PlatformFlowMapper;
 import com.fastbee.iot.platform.mapper.PlatformInstanceMapper;
 import com.fastbee.iot.platform.mapper.PlatformUserAuthMapper;
+import com.fastbee.iot.platform.model.json.ExtraMappingConfig;
+import com.fastbee.iot.platform.model.json.OnboardConfig;
 import com.fastbee.iot.platform.service.IPlatformDeviceMappingService;
 import com.fastbee.iot.platform.service.IPlatformDeviceSubMappingService;
 import com.fastbee.iot.platform.service.IPlatformUserAuthService;
@@ -21,6 +25,7 @@ import org.springframework.util.StringUtils;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
@@ -41,6 +46,8 @@ public class PlatformDeviceMappingServiceImpl extends ServiceImpl<PlatformDevice
     private IPlatformDeviceSubMappingService subMappingService;
     @Autowired
     private PlatformUserAuthMapper platformUserAuthMapper;
+    @Autowired
+    private DeviceMapper deviceMapper;
 
     @Override
     public List<PlatformDeviceMapping> selectList(PlatformDeviceMapping query) {
@@ -58,7 +65,25 @@ public class PlatformDeviceMappingServiceImpl extends ServiceImpl<PlatformDevice
                 .eq(query.getNetStatus() != null, PlatformDeviceMapping::getNetStatus, query.getNetStatus())
                 .eq(StringUtils.hasText(query.getEnable()), PlatformDeviceMapping::getEnable, query.getEnable())
                 .orderByDesc(PlatformDeviceMapping::getCreateTime);
-        return this.list(wrapper);
+        List<PlatformDeviceMapping> rows = this.list(wrapper);
+        // 批量补全设备名称：device_name 为冗余字段，旧数据可能为空，按 deviceId 一次 IN 查询回填，避免前端逐个查询
+        List<Long> deviceIds = rows.stream()
+                .filter(m -> m.getDeviceId() != null && !StringUtils.hasText(m.getDeviceName()))
+                .map(PlatformDeviceMapping::getDeviceId)
+                .distinct()
+                .collect(Collectors.toList());
+        if (!deviceIds.isEmpty()) {
+            List<Device> devices = deviceMapper.selectList(Wrappers.<Device>lambdaQuery()
+                    .in(Device::getDeviceId, deviceIds));
+            Map<Long, String> nameMap = devices.stream()
+                    .collect(Collectors.toMap(Device::getDeviceId, Device::getDeviceName, (a, b) -> a));
+            rows.forEach(m -> {
+                if (m.getDeviceId() != null && !StringUtils.hasText(m.getDeviceName())) {
+                    m.setDeviceName(nameMap.get(m.getDeviceId()));
+                }
+            });
+        }
+        return rows;
     }
 
     @Override
@@ -198,13 +223,30 @@ public class PlatformDeviceMappingServiceImpl extends ServiceImpl<PlatformDevice
         }
         if (references.isEmpty()) {
             if (staticLevel) {
-                throw new RuntimeException("静力水准网关入网需在子设备映射中指定一个基准点");
+                // 允许跨网关基准点：extra_mapping.staticLevel.referenceSerialNumber 指向其他网关的基准点
+                ExtraMappingConfig extra = mapping.getExtraMappingParsed();
+                if (extra != null && extra.getStaticLevel() != null
+                        && StringUtils.hasText(extra.getStaticLevel().getReferenceSerialNumber())) {
+                    log.info("网关 {} 使用跨网关基准点 {}", mapping.getSerialNumber(),
+                            extra.getStaticLevel().getReferenceSerialNumber());
+                    return null;
+                }
+                throw new RuntimeException("静力水准网关入网需在子设备映射中指定一个基准点，或在扩展配置中选择跨网关基准点");
             }
             return null;
         }
         return references.get(0);
     }
 
+    /** 子设备 sensorId：取 onboard_config.sensorId，缺失时回退序列号 */
+    private String resolveSubSensorId(PlatformDeviceSubMapping sub) {
+        OnboardConfig config = sub.getOnboardConfigParsed();
+        if (config != null && StringUtils.hasText(config.getSensorId())) {
+            return config.getSensorId();
+        }
+        return sub.getSubSerialNumber();
+    }
+
     @Override
     public void updateLastPushTime(Long id, Date lastPushTime) {
         PlatformDeviceMapping mapping = new PlatformDeviceMapping();
@@ -212,4 +254,35 @@ public class PlatformDeviceMappingServiceImpl extends ServiceImpl<PlatformDevice
         mapping.setLastPushTime(lastPushTime);
         this.updateById(mapping);
     }
+
+    @Override
+    public List<Map<String, String>> listConfiguredReferencePoints(Long platformId, Long excludeMappingId) {
+        List<PlatformDeviceMapping> gateways = this.list(Wrappers.<PlatformDeviceMapping>lambdaQuery()
+                .eq(platformId != null, PlatformDeviceMapping::getPlatformId, platformId)
+                .ne(excludeMappingId != null, PlatformDeviceMapping::getId, excludeMappingId)
+                .eq(PlatformDeviceMapping::getSensorType, "static_level")
+                .eq(PlatformDeviceMapping::getDeviceType, 1));
+        List<Map<String, String>> result = new ArrayList<>();
+        for (PlatformDeviceMapping gateway : gateways) {
+            List<PlatformDeviceSubMapping> subs = subMappingService.selectByParentId(gateway.getId());
+            if (subs == null) {
+                continue;
+            }
+            for (PlatformDeviceSubMapping sub : subs) {
+                if (sub == null || !sub.isReference() || !StringUtils.hasText(sub.getSubSerialNumber())) {
+                    continue;
+                }
+                Map<String, String> item = new java.util.LinkedHashMap<>();
+                item.put("referenceSerialNumber", sub.getSubSerialNumber());
+                item.put("referenceDeviceName", sub.getSubDeviceName());
+                // 供前端生成监测点入网参数 refSensorId，保持与历史数据一致
+                item.put("referenceSensorId", resolveSubSensorId(sub));
+                item.put("gatewaySerialNumber", gateway.getSerialNumber());
+                item.put("gatewayDeviceName", StringUtils.hasText(gateway.getDeviceName())
+                        ? gateway.getDeviceName() : gateway.getSerialNumber());
+                result.add(item);
+            }
+        }
+        return result;
+    }
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformDeviceSubMappingServiceImpl.java

@@ -8,7 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Set;
 import java.util.stream.Collectors;
 
@@ -24,6 +28,25 @@ public class PlatformDeviceSubMappingServiceImpl extends ServiceImpl<PlatformDev
         return subMappingMapper.selectByParentId(parentMappingId);
     }
 
+    @Override
+    public Map<Long, List<PlatformDeviceSubMapping>> selectByParentIds(List<Long> parentIds) {
+        if (parentIds == null || parentIds.isEmpty()) {
+            return Collections.emptyMap();
+        }
+        List<PlatformDeviceSubMapping> all = subMappingMapper.selectByParentIds(parentIds);
+        Map<Long, List<PlatformDeviceSubMapping>> grouped = new HashMap<>();
+        for (PlatformDeviceSubMapping sub : all) {
+            Long pid = sub.getParentMappingId();
+            if (pid == null) continue;
+            grouped.computeIfAbsent(pid, k -> new ArrayList<>()).add(sub);
+        }
+        // 保证请求的每个 parentId 都有 key，即便没有子映射也返回空列表，避免前端取到 undefined
+        for (Long pid : parentIds) {
+            grouped.putIfAbsent(pid, new ArrayList<>());
+        }
+        return grouped;
+    }
+
     @Override
     public List<PlatformDeviceSubMapping> selectBySubSerialNumber(String subSerialNumber) {
         return subMappingMapper.selectBySubSerialNumber(subSerialNumber);

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/platform/service/impl/PlatformPushLogServiceImpl.java

@@ -121,4 +121,9 @@ public class PlatformPushLogServiceImpl extends ServiceImpl<PlatformPushLogMappe
         pushLogMapper.cleanPushLog();
     }
 
+    @Override
+    public void cleanPushLog(int days) {
+        pushLogMapper.deletePushLogBeforeDays(days);
+    }
+
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/MqttBridge.java

@@ -44,7 +44,7 @@ public class MqttBridge extends NodeComponent {
 
             // 优先使用bridge.route，如果为空再使用context.topic
             String publishTopic = StringUtils.isNotBlank(bridge.getRoute())
-                    ? bridge.getRoute()
+                    ? cxt.placeholders(bridge.getRoute())
                     : cxt.getTopic();
 
             MqttMessage message = new MqttMessage();

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/ruleEngine/RuleProcess.java

@@ -49,6 +49,7 @@ public class RuleProcess {
                 .scriptPurpose(1)
                 .scriptEvent(event)
                 .productId(productCode.getProductId())
+                .serialNumber(serialNumber)
                 .build();
         MsgContext context = MsgContext.builder()
                 .serialNumber(serialNumber)

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IAlertLogService.java

@@ -107,4 +107,11 @@ public interface IAlertLogService {
      * @return com.fastbee.iot.model.AlertCountVO
      */
     List<AlertCountVO> countAlertLevel(DataCenterParam dataCenterParam);
+
+    /**
+     * 清理告警日志
+     *
+     * @param days 保留天数
+     */
+    void cleanAlertLog(int days);
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/IEventLogService.java

@@ -37,4 +37,11 @@ public interface IEventLogService extends IService<EventLog> {
      */
     List<HistoryModel> listHistory(EventLog eventLog);
 
+    /**
+     * 清理事件日志
+     *
+     * @param days 保留天数
+     */
+    void cleanEventLog(int days);
+
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/AlertLogServiceImpl.java

@@ -199,4 +199,14 @@ public class AlertLogServiceImpl implements IAlertLogService {
     public List<AlertCountVO> countAlertLevel(DataCenterParam dataCenterParam) {
         return alertLogMapper.countAlertLevel(dataCenterParam);
     }
+
+    /**
+     * 清理告警日志
+     *
+     * @param days 保留天数
+     */
+    @Override
+    public void cleanAlertLog(int days) {
+        alertLogMapper.deleteAlertLogBeforeDays(days);
+    }
 }

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DataRepairServiceImpl.java

@@ -210,7 +210,7 @@ public class DataRepairServiceImpl implements IDataRepairService {
     public void executeDataRepair(String serialNumber, boolean isShadow, List<DeviceLog> currentLogs) {
 
         if (CollectionUtils.isEmpty(currentLogs) || isShadow) {
-            log.debug("无数据或为影子模式，不执行数据修复: serialNumber={}, isShadow={}", serialNumber, isShadow);
+            //log.debug("无数据或为影子模式，不执行数据修复: serialNumber={}, isShadow={}", serialNumber, isShadow);
             return;
         }
 

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/DeviceServiceImpl.java

@@ -654,8 +654,7 @@ public class DeviceServiceImpl implements IDeviceService {
      */
     @Override
     @DSTransactional
-    public List<ThingsModelSimpleItem> reportDeviceThingsModelValue(ThingsModelValuesInput input, int type,
+    public List<ThingsModelSimpleItem> reportDeviceThingsModelValue(ThingsModelValuesInput input, int type, boolean isShadow) {
-            boolean isShadow) {
         String serialNumber = input.getDeviceNumber();
         String key = RedisKeyBuilder.buildTSLVCacheKey(input.getProductId(), serialNumber);
         Map<String, String> maps = new HashMap<>();
@@ -681,6 +680,9 @@ public class DeviceServiceImpl implements IDeviceService {
                             ThingsModelSimpleItem::getValue,
                             (oldValue, newValue) -> oldValue));
         }
+        // 查询设备信息
+        Device device = this.selectDeviceBySerialNumber(serialNumber);
+
         for (ThingsModelSimpleItem item : thingsModelValueRemarkItem) {
             String identity = item.getId();
             if (identity.startsWith("array_")) {
@@ -752,11 +754,9 @@ public class DeviceServiceImpl implements IDeviceService {
             valueItem.setId(identity);
             if (id.startsWith("array_")) {
                 // 查询是否有缓存，如果没有先进行缓存
-                if (!redisCache.containsKey(key)) {
+//                if (!redisCache.containsKey(key)) {
-                    Device device = this.selectDeviceBySerialNumber(serialNumber);
+//                    itslValueCache.addCacheDeviceStatus(input.getProductId(), serialNumber);
-                    this.selectDeviceByDeviceId(device.getDeviceId());
+//                }
-                }
-
                 int index = Integer.parseInt(id.substring(6, 8));
                 if (isShadow) {
                     String[] shadows = cacheIdentifier.getShadow().split(",");
@@ -797,7 +797,6 @@ public class DeviceServiceImpl implements IDeviceService {
 
             /* ★★★★★★★★★★★★★★★★★★★★★★ 存储数据 - 开始 ★★★★★★★★★★★★★★★★★★★★★★ */
             ThingsModelType modelType = ThingsModelType.getType(thingModels.getType());
-            Device device = this.selectDeviceBySerialNumber(serialNumber);
             switch (modelType) {
                 case PROP:
                     if (1 == thingModels.getIsHistory()) {

fastbee-service/fastbee-iot-service/src/main/java/com/fastbee/iot/service/impl/EventLogServiceImpl.java

@@ -64,4 +64,14 @@ public class EventLogServiceImpl extends ServiceImpl<EventLogMapper, EventLog> i
     public List<HistoryModel> listHistory(EventLog eventLog) {
         return eventLogMapper.listHistory(eventLog);
     }
+
+    /**
+     * 清理事件日志
+     *
+     * @param days 保留天数
+     */
+    @Override
+    public void cleanEventLog(int days) {
+        eventLogMapper.deleteEventLogBeforeDays(days);
+    }
 }

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/AlertLogMapper.xml

@@ -274,4 +274,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </delete>
 
+    <delete id="deleteAlertLogBeforeDays">
+        DELETE FROM iot_alert_log
+        WHERE create_time &lt; DATE_SUB(NOW(), INTERVAL #{days} DAY)
+    </delete>
+
 </mapper>

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/DeviceMapper.xml

@@ -433,6 +433,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''"> and d.device_name like concat('%', #{deviceName}, '%')</if>
             <if test="productId != null "> and d.product_id = #{productId}</if>
             <if test="deviceType != null "> and p.device_type = #{deviceType}</if>
+            <if test="deviceTypes != null and deviceTypes.size() > 0">
+                and p.device_type in
+                <foreach collection="deviceTypes" item="deviceTypeItem" open="(" separator="," close=")">
+                    #{deviceTypeItem}
+                </foreach>
+            </if>
             <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
             <if test="serialNumber != null  and serialNumber != ''"> and d.serial_number = #{serialNumber}</if>
             <if test="gwDevCode != null and gwDevCode != ''"> and d.gw_dev_code = #{gwDevCode}</if>
@@ -1014,6 +1020,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="deviceName != null  and deviceName != ''"> and d.device_name like concat('%', #{deviceName}, '%')</if>
             <if test="productId != null "> and d.product_id = #{productId}</if>
             <if test="deviceType != null "> and p.device_type = #{deviceType}</if>
+            <if test="deviceTypes != null and deviceTypes.size() > 0">
+                and p.device_type in
+                <foreach collection="deviceTypes" item="deviceTypeItem" open="(" separator="," close=")">
+                    #{deviceTypeItem}
+                </foreach>
+            </if>
             <if test="productName != null  and productName != ''"> and d.product_name like concat('%', #{productName}, '%')</if>
             <if test="serialNumber != null  and serialNumber != ''"> and d.serial_number = #{serialNumber}</if>
             <if test="gwDevCode != null and gwDevCode != ''"> and d.gw_dev_code = #{gwDevCode}</if>

fastbee-service/fastbee-iot-service/src/main/resources/mapper/iot/EventLogMapper.xml

@@ -59,4 +59,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="userId != null and userId != 0"> and user_id = #{userId}</if>
         </where>
     </select>
+
+    <delete id="deleteEventLogBeforeDays">
+        DELETE FROM iot_event_log
+        WHERE create_time &lt; DATE_SUB(NOW(), INTERVAL #{days} DAY)
+    </delete>
 </mapper>