告警中心推送告警数据代码提交；部分代码优化

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

@@ -0,0 +1,15 @@
+package com.usky.cdi;
+
+import com.usky.cdi.factory.AlarmDataSyncTaskFactory;
+import org.springframework.cloud.openfeign.FeignClient;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/12/29
+ */
+@FeignClient(contextId = "AlarmDataSyncTaskService", value = "service-cdi", fallbackFactory = AlarmDataSyncTaskFactory.class)
+public interface AlarmDataSyncTaskService {
+    void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status);
+}

service-cdi/service-cdi-api/src/main/java/com/usky/cdi/factory/AlarmDataSyncTaskFactory.java

@@ -0,0 +1,29 @@
+package com.usky.cdi.factory;
+
+import com.usky.cdi.AlarmDataSyncTaskService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.cloud.openfeign.FallbackFactory;
+import org.springframework.stereotype.Component;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/12/29
+ */
+@Component
+public class AlarmDataSyncTaskFactory implements FallbackFactory<AlarmDataSyncTaskService> {
+    private static final Logger log = LoggerFactory.getLogger(AlarmDataSyncTaskFactory.class);
+
+    @Override
+    public AlarmDataSyncTaskService create(Throwable throwable) {
+        log.error("用户服务调用失败:{}", throwable.getMessage());
+        return new AlarmDataSyncTaskService() {
+            @Override
+            public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {
+                throw new RuntimeException(throwable);
+            }
+        };
+    }
+}

service-cdi/service-cdi-biz/pom.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>service-cdi</artifactId>
         <groupId>com.usky</groupId>
@@ -10,10 +11,21 @@
     <artifactId>service-cdi-biz</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>com.usky</groupId>
-            <artifactId>common-cloud-starter</artifactId>
-        </dependency>
+        <!--        <dependency>-->
+        <!--            <groupId>com.usky</groupId>-->
+        <!--            <artifactId>common-cloud-starter</artifactId>-->
+        <!--            <exclusions>-->
+        <!--                &lt;!&ndash; 排除Nacos相关依赖 &ndash;&gt;-->
+        <!--                <exclusion>-->
+        <!--                    <groupId>com.alibaba.cloud</groupId>-->
+        <!--                    <artifactId>spring-cloud-starter-alibaba-nacos-discovery</artifactId>-->
+        <!--                </exclusion>-->
+        <!--                <exclusion>-->
+        <!--                    <groupId>com.alibaba.cloud</groupId>-->
+        <!--                    <artifactId>spring-cloud-starter-alibaba-nacos-config</artifactId>-->
+        <!--                </exclusion>-->
+        <!--            </exclusions>-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>com.usky</groupId>
@@ -61,7 +73,7 @@
             <artifactId>spring-websocket</artifactId>
             <version>5.2.8.RELEASE</version>
         </dependency>
-        
+
         <!--Redis依赖-->
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -81,6 +93,17 @@
             <version>0.2.15</version>
             <scope>compile</scope>
         </dependency>
+
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba</groupId>-->
+<!--            <artifactId>druid-spring-boot-starter</artifactId>-->
+<!--            <version>1.2.20</version>-->
+<!--        </dependency>-->
+<!--        <dependency>-->
+<!--            <groupId>com.alibaba.nacos</groupId>-->
+<!--            <artifactId>nacos-client</artifactId>-->
+<!--        </dependency>-->
+
     </dependencies>
 
     <build>

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/RuoYiSystemApplication.java

@@ -1,7 +1,5 @@
 package com.usky.cdi;
 
-
-
 import org.mybatis.spring.annotation.MapperScan;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -12,6 +10,7 @@ import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.core.env.Environment;
 import org.springframework.integration.config.EnableIntegration;
+import org.springframework.scheduling.annotation.EnableAsync;
 import org.springframework.scheduling.annotation.EnableScheduling;
 
 import java.net.InetAddress;
@@ -25,6 +24,7 @@ import java.net.UnknownHostException;
 
 //@EnableSwagger2
 @EnableScheduling
+@EnableAsync // 启用异步执行支持
 @EnableFeignClients(basePackages = "com.usky")
 @MapperScan(value = "com.usky.cdi.mapper")
 @ComponentScan("com.usky")

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

@@ -1,11 +1,7 @@
 package com.usky.cdi.controller;
 
 import com.usky.cdi.service.impl.AlarmDataTransferService;
-import com.usky.cdi.service.vo.alarm.AlarmMessage1VO;
-import com.usky.cdi.service.vo.alarm.AlarmMessage2VO;
-import com.usky.cdi.service.vo.alarm.AlarmMessage3VO;
 import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
-import com.usky.cdi.service.vo.base.EngineeringBaseVO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
@@ -28,6 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
 public class AlarmDataController {
     @Autowired
     private AlarmDataTransferService alarmDataTransferService;
+
     /**
      * 上报人防工程基础信息
      */
@@ -41,7 +38,7 @@ public class AlarmDataController {
      * 上报人防工程基础信息
      */
     @PostMapping("/alarmMessage1")
-    public String sendAlarmMessage1(@RequestBody AlarmMessage1VO vo) {
+    public String sendAlarmMessage1(@RequestBody AlarmMessageVO vo) {
         boolean success = alarmDataTransferService.sendAlarmMessage1(vo);
         return success ? "上报成功" : "上报失败";
     }
@@ -50,13 +47,13 @@ public class AlarmDataController {
      * 上报倾斜、位移、裂缝监测事件
      */
     @PostMapping("/alarmMessage2")
-    public String sendAlarmMessage2(@RequestBody AlarmMessage2VO vo) {
+    public String sendAlarmMessage2(@RequestBody AlarmMessageVO vo) {
         boolean success = alarmDataTransferService.sendAlarmMessage2(vo);
         return success ? "上报成功" : "上报失败";
     }
 
     @PostMapping("/alarmMessage3")
-    public String sendAlarmMessage3(@RequestBody AlarmMessage3VO vo) {
+    public String sendAlarmMessage3(@RequestBody AlarmMessageVO vo) {
         boolean success = alarmDataTransferService.sendEngineeringBase(vo);
         return success ? "上报成功" : "上报失败";
     }

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

@@ -0,0 +1,34 @@
+package com.usky.cdi.controller.api;
+
+import com.usky.cdi.AlarmDataSyncTaskService;
+import com.usky.cdi.service.impl.AlarmDataSyncService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 多租户定时任务API接口
+ *
+ * @author usky
+ * @since 2025-12-29
+ */
+@Slf4j
+@RestController
+public class AlarmDataSyncTaskApi implements AlarmDataSyncTaskService {
+
+    @Autowired
+    private AlarmDataSyncService alarmDataSyncService;
+
+    /**
+     * 同步告警数据
+     * tenantId: 租户ID
+     * engineeringId: 工程ID
+     * username: mqtt用户名
+     * password: mqtt密码
+     * status: 状态 0:平时 1:战时
+     */
+    @Override
+    public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {
+        alarmDataSyncService.synchronizeAlarmData(tenantId, engineeringId, username, password, status);
+    }
+}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/controller/web/BaseAlarmController.java

@@ -0,0 +1,22 @@
+package com.usky.cdi.controller.web;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 统一告警表 前端控制器
+ * </p>
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+@RestController
+@RequestMapping("/baseAlarm")
+public class BaseAlarmController {
+
+}
+

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/controller/web/DmpDeviceInfoController.java

@@ -23,7 +23,7 @@ import java.util.Map;
  * @since 2022-10-08
  */
 @RestController
-@RequestMapping("/dmpDeviceInfo")
+@RequestMapping("/cdiDmpDeviceInfo")
 public class DmpDeviceInfoController {
 
     @Autowired

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/domain/BaseAlarm.java

@@ -0,0 +1,127 @@
+package com.usky.cdi.domain;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.time.LocalDateTime;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+/**
+ * <p>
+ * 统一告警表
+ * </p>
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class BaseAlarm implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 主键ID
+     */
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 设备ID
+     */
+    private String deviceId;
+
+    /**
+     * 告警时间
+     */
+    private LocalDateTime alarmTime;
+
+    /**
+     * 告警类型
+     */
+    private String alarmType;
+
+    /**
+     * 告警对象
+     */
+    private String alarmObject;
+
+    /**
+     * 告警值
+     */
+    private String alarmData;
+
+    /**
+     * 告警属性
+     */
+    private String alarmAttribute;
+
+    /**
+     * 告警内容
+     */
+    private String alarmContent;
+
+    /**
+     * 告警等级
+     * 1 一级，2 二级，3 三级，4 四级，5 五级
+     */
+    private Integer alarmGrade;
+
+    /**
+     * 告警位置
+     */
+    private String alarmAddress;
+
+    /**
+     * 处理人
+     */
+    private String handleBy;
+
+    /**
+     * 处理时间
+     */
+    private LocalDateTime handleTime;
+
+    /**
+     * 处理内容
+     */
+    private String handleContent;
+
+    /**
+     * 处理人电话
+     */
+    private String handlePhone;
+
+    /**
+     * 处理状态;0 未处理，1 已处理
+     */
+    private Integer handleStatus;
+
+    /**
+     * 是否误报;0 非误报，1 误报
+     */
+    private Integer alarmFalse;
+
+    /**
+     * 现场照片
+     */
+    private String sitePhoto;
+
+    /**
+     * 产品编码
+     */
+    private String productCode;
+
+    /**
+     * 组织机构ID
+     */
+    private Integer deptId;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenantId;
+
+
+}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/domain/enums/AlarmType.java

@@ -0,0 +1,190 @@
+package com.usky.cdi.domain.enums;
+
+/**
+ * 告警类型枚举类
+ * 统一管理告警类型定义、分类和转换逻辑
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+public enum AlarmType {
+
+    // 水浸告警
+    WATER("701", "10.1", null, "有水"),
+
+    // 空气温度偏高告警
+    AIR_TEMP("702", "12.1", Category.THRESHOLD, "空气温度偏高"),
+
+    // 空气湿度偏高告警
+    AIR_HUMIDITY("703", "13.1", Category.THRESHOLD, "空气湿度偏高"),
+
+    // 氧气浓度偏低告警
+    OXYGEN_LOW("704", "14.1", Category.THRESHOLD, "氧气浓度偏低"),
+
+    // 二氧化碳浓度偏高告警
+    CO2_HIGH("705", "15.1", Category.THRESHOLD, "二氧化碳浓度偏高"),
+
+    // 一氧化碳浓度偏高告警
+    CO_HIGH("706", "16.1", Category.THRESHOLD, "一氧化碳浓度偏高"),
+
+    // 剩余电流偏大告警
+    RESIDUAL_CURRENT("707", "29.1", Category.THRESHOLD_LINE, "剩余电流偏大"),
+
+    // 供电电缆温度偏高告警
+    CABLE_TEMP("708", "29.2", Category.THRESHOLD_LINE, "供电电缆温度偏高"),
+
+    // 电流偏大
+    CURRENT_HIGH("709", "29.3", Category.THRESHOLD_LINE, "电流偏大"),
+
+    // 人员闯入告警
+    PERSON_INTRUSION("710", "33.1", Category.OTHER, "人员闯入告警"),
+
+    // 监测位置有位移告警
+    DISPLACEMENT("711", "37.1", Category.STRUCTURE_MONITORING, "有位移"),
+
+    // 监测位置有倾斜告警
+    TILT("712", "34.1", Category.STRUCTURE_MONITORING, "有倾斜"),
+
+    // 裂缝检测告警
+    CRACK("713", "36.1", Category.STRUCTURE_MONITORING, "有裂缝");
+
+    private final String originalCode;
+    private final String mappedCode;
+    private final Category category;
+    private final String description;
+
+    AlarmType(String originalCode, String mappedCode, Category category, String description) {
+        this.originalCode = originalCode;
+        this.mappedCode = mappedCode;
+        this.category = category;
+        this.description = description;
+    }
+
+    /**
+     * 根据原始告警类型代码获取对应的枚举值
+     */
+    public static AlarmType fromOriginalCode(String originalCode) {
+        for (AlarmType alarmType : values()) {
+            if (alarmType.getOriginalCode().equals(originalCode)) {
+                return alarmType;
+            }
+        }
+        return null;
+    }
+
+    /**
+     * 判断是否为结构监测告警类型（需要unitName映射）
+     */
+    public boolean isStructureMonitoringType() {
+        return category == Category.STRUCTURE_MONITORING;
+    }
+
+    /**
+     * 判断是否为阈值相关告警类型
+     */
+    public boolean isThresholdAlarmType() {
+        return category == Category.THRESHOLD || category == Category.THRESHOLD_LINE;
+    }
+
+    /**
+     * 判断是否为线路编号相关告警类型
+     */
+    public boolean isLineNoAlarmType() {
+        return category == Category.THRESHOLD_LINE;
+    }
+
+    /**
+     * 获取默认unitName值
+     */
+    public String getDefaultUnitName() {
+        // switch (this) {
+        //     case DISPLACEMENT:
+        //         return "监测位置";
+        //     case TILT:
+        //         return "倾斜监测点";
+        //     case CRACK:
+        //         return "裂缝检测点";
+        //     default:
+        return "防化单元";
+        // }
+    }
+
+    /**
+     * 获取默认阈值
+     */
+    public Float getDefaultThreshold() {
+        switch (this) {
+            case AIR_TEMP:
+                return 40.0f; // 35°C
+            case AIR_HUMIDITY:
+                return 95.0f; // 80%
+            case OXYGEN_LOW:
+                return 19.5f; // 19.5%
+            case CO2_HIGH:
+                return 1000.0f; // 0.5%
+            case CO_HIGH:
+                return 5.0f; // 10ppm
+            case RESIDUAL_CURRENT:
+                return 10.0f; // 300mA
+            case CABLE_TEMP:
+                return 55.0f; // 70°C
+            case CURRENT_HIGH:
+                return 10000.0f; // 10000mA
+            default:
+                return 0.0f;
+        }
+    }
+
+    /**
+     * 验证阈值是否在合理范围内
+     */
+    public boolean isValidThreshold(float value) {
+        switch (this) {
+            case AIR_TEMP:
+                return value >= -20 && value <= 80; // 温度范围 -50°C 到 100°C
+            case AIR_HUMIDITY:
+                return value >= 0 && value <= 100; // 湿度范围 0% 到 100%
+            case OXYGEN_LOW:
+                return value >= 0 && value <= 25; // 氧气浓度范围 0% 到 25%
+            case CO2_HIGH:
+                return value >= 0 && value <= 5; // 二氧化碳浓度范围 0% 到 10%
+            case CO_HIGH:
+                return value >= 0 && value <= 2000; // 一氧化碳浓度范围 0 到 1000ppm
+            case RESIDUAL_CURRENT:
+                return value >= 0 && value <= 500000; // 剩余电流范围 0 到 5000mA
+            case CABLE_TEMP:
+                return value >= -50 && value <= 200; // 电缆温度范围 -50°C 到 200°C
+            case CURRENT_HIGH:
+                return value >= 0 && value <= 100000; // 电流范围 0 到 1000A
+            default:
+                return true; // 其他类型不进行验证
+        }
+    }
+
+    /**
+     * 告警分类枚举
+     */
+    public enum Category {
+        STRUCTURE_MONITORING,    // 结构监测类型（需要unitName映射）
+        THRESHOLD,              // 阈值告警类型（需要thresholding）
+        THRESHOLD_LINE,         // 阈值+线路编号类型（需要thresholding和lineNo）
+        OTHER                   // 其他类型
+    }
+
+    // Getters
+    public String getOriginalCode() {
+        return originalCode;
+    }
+
+    public String getMappedCode() {
+        return mappedCode;
+    }
+
+    public Category getCategory() {
+        return category;
+    }
+
+    public String getDescription() {
+        return description;
+    }
+}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/mapper/BaseAlarmMapper.java

@@ -0,0 +1,18 @@
+package com.usky.cdi.mapper;
+
+import com.usky.cdi.domain.BaseAlarm;
+import com.usky.common.mybatis.core.CrudMapper;
+import org.springframework.stereotype.Repository;
+
+/**
+ * <p>
+ * 统一告警表 Mapper 接口
+ * </p>
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+@Repository
+public interface BaseAlarmMapper extends CrudMapper<BaseAlarm> {
+
+}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/BaseAlarmService.java

@@ -0,0 +1,16 @@
+package com.usky.cdi.service;
+
+import com.usky.cdi.domain.BaseAlarm;
+import com.usky.common.mybatis.core.CrudService;
+
+/**
+ * <p>
+ * 统一告警表 服务类
+ * </p>
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+public interface BaseAlarmService extends CrudService<BaseAlarm> {
+
+}

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

@@ -0,0 +1,551 @@
+package com.usky.cdi.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.usky.cdi.domain.BaseAlarm;
+import com.usky.cdi.domain.BaseBuildFacility;
+import com.usky.cdi.mapper.BaseAlarmMapper;
+import com.usky.cdi.mapper.BaseBuildFacilityMapper;
+import com.usky.cdi.mapper.DmpProductMapper;
+import com.usky.cdi.service.mqtt.MqttConnectionTool;
+import com.usky.cdi.service.util.SnowflakeIdGenerator;
+import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
+import com.usky.cdi.domain.enums.AlarmType;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.scheduling.annotation.Async;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.PostConstruct;
+import java.time.LocalDateTime;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * 多租户定时任务服务
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+@Slf4j
+@Service
+@RequiredArgsConstructor
+public class AlarmDataSyncService {
+
+    @Value("${snowflake.worker-id:3}")
+    private long workerId;
+
+    @Value("${snowflake.data-center-id:3}")
+    private long dataCenterId;
+
+    private static final String PEACETIME = "peacetime";
+    private static final String WARTIME = "wartime";
+    private static final String MQTT_TOPIC = "alarm/message";
+    private static final String ALARM_DELIVERY_KEY_PREFIX = "alarm:delivery:";
+    private final MqttConnectionTool mqttConnectionTool;
+
+    @Autowired
+    private StringRedisTemplate stringRedisTemplate;
+    @Autowired
+    private BaseAlarmMapper baseAlarmMapper;
+    @Autowired
+    private DmpProductMapper dmpProductMapper;
+    @Autowired
+    private BaseBuildFacilityMapper baseBuildFacilityMapper;
+
+    private SnowflakeIdGenerator idGenerator;
+
+    @PostConstruct
+    public void init() {
+        this.idGenerator = new SnowflakeIdGenerator(workerId, dataCenterId);
+    }
+
+    /**
+     * 获取当前时间
+     */
+    private LocalDateTime getCurrentTime() {
+        return LocalDateTime.now();
+    }
+
+    /**
+     * 生成数据包ID
+     */
+    private Long generateDataPacketID() {
+        return idGenerator.nextPacketId();
+    }
+
+    @Async
+    public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {
+        log.info("租户：{}的人防告警数据推送定时任务开始执行，平战时状态：{}", tenantId, PEACETIME.equals(status) ? "平时" : "战时");
+
+        Long startTime = System.currentTimeMillis();
+        log.info("开始时间:{}", getCurrentTime());
+
+        // 1.查询 base_alarm 表中的告警数据，筛选条件为 tenant_id = tenantId
+        LambdaQueryWrapper<BaseAlarm> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(BaseAlarm::getTenantId, tenantId)
+                .eq(BaseAlarm::getAlarmGrade, 1);
+        List<BaseAlarm> alarmList = baseAlarmMapper.selectList(queryWrapper);
+
+        if (alarmList.isEmpty()) {
+            log.warn("租户{}没有新的告警数据，任务结束", tenantId);
+            return;
+        }
+        log.info("查询到租户{}的告警数据总数：{}", tenantId, alarmList.size());
+
+        // 批量查询建筑设施数据，构建设备ID到设施的映射
+        Map<String, BaseBuildFacility> facilityMap = buildFacilityMap(alarmList, tenantId);
+
+        // 记录每一条告警数据
+        for (BaseAlarm alarm : alarmList) {
+            log.info("告警数据：ID={}, 设备ID={}, 告警类型={}, 告警时间={}, 处理状态={}, 是否误报={}",
+                    alarm.getId(), alarm.getDeviceId(), alarm.getAlarmType(),
+                    alarm.getAlarmTime(), alarm.getHandleStatus(), alarm.getAlarmFalse());
+        }
+
+        try {
+            // 2.创建MQTT连接
+            mqttConnectionTool.connectOrRefresh(username, password);
+
+            int successCount = 0;
+            int failureCount = 0;
+
+            // 3.遍历告警数据，转换为AlarmMessageVO并发送
+            for (BaseAlarm alarm : alarmList) {
+                try {
+                    // 根据告警类型映射关系转换
+                    String alarmType = convertAlarmType(alarm.getAlarmType());
+                    if (alarmType == null) {
+                        log.warn("不支持的告警类型：{}，跳过处理", alarm.getAlarmType());
+                        failureCount++;
+                        continue;
+                    }
+
+                    // 转换告警状态
+                    Integer alarmStatus = convertAlarmStatus(alarm.getHandleStatus(), alarm.getAlarmFalse(), status);
+
+                    // 构建AlarmMessageVO对象
+                    AlarmMessageVO<Integer> alarmMessageVO = new AlarmMessageVO<>();
+                    alarmMessageVO.setDataPacketID(generateDataPacketID());
+                    alarmMessageVO.setEngineeringID(engineeringId);
+                    alarmMessageVO.setAlarmID(alarm.getId());
+                    // 固定值1，人防工程级物联平台自动发现
+                    alarmMessageVO.setAlarmSource(1);
+                    alarmMessageVO.setSensorID(alarm.getDeviceId() != null ? Integer.valueOf(alarm.getDeviceId()) : null);
+                    alarmMessageVO.setAlarmType(alarmType);
+                    alarmMessageVO.setAlarmStatus(alarmStatus);
+
+                    // 设置告警时间：新增告警取 alarm_type 字段，更新数据则取 handle_time 字段
+                    String alarmTime = alarm.getHandleTime() != null ?
+                            alarm.getHandleTime().toString() : alarm.getAlarmTime().toString();
+                    alarmMessageVO.setAlarmUpdateTime(alarmTime);
+
+                    // 设置监测对象告警描述和编号
+                    alarmMessageVO.setAlarmDesc(alarm.getAlarmAttribute());
+                    alarmMessageVO.setMonitorObjNo(facilityMap.get(alarm.getDeviceId()).getFacilityNum());
+
+                    // 设置上报时间为当前时间
+                    alarmMessageVO.setPublishTime(getCurrentTime());
+
+                    // 设置告警数据字段
+                    alarmMessageVO.setSensorValue(alarm.getAlarmData());
+
+                    // 根据告警类型填充unitName、thresholding、lineNo字段
+                    populateAlarmFields(alarmMessageVO, alarm, tenantId, facilityMap);
+
+                    // 从Redis获取缓存的投递状态，检查是否有变更
+                    String deliveryKey = alarm.getDeviceId() + "_" + alarm.getId();
+                    String cachedRecord = (String) stringRedisTemplate.opsForHash().get(ALARM_DELIVERY_KEY_PREFIX + tenantId, deliveryKey);
+                    if (cachedRecord != null && !hasAlarmChanged(alarm, cachedRecord, status)) {
+                        log.info("告警数据无变化，跳过推送：设备ID={}, 告警ID={}", alarm.getDeviceId(), alarm.getId());
+                        continue;
+                    }
+
+                    // 4.将AlarmMessageVO转换为JSON字符串并发送MQTT消息
+                    String jsonMessage = JSON.toJSONString(alarmMessageVO);
+                    MqttConnectionTool.MqttGateway gateway = mqttConnectionTool.connectOrRefresh(username, password);
+                    gateway.sendToMqtt(MQTT_TOPIC, jsonMessage);
+
+                    successCount++;
+
+                    // 更新Redis中的投递记录
+                    saveDeliveryRecordToRedis(alarm, alarmStatus, status, tenantId);
+
+                    log.info("成功发送告警消息：设备ID={}, 告警类型={}, 消息内容={}",
+                            alarm.getDeviceId(), alarm.getAlarmType(), jsonMessage);
+
+                } catch (Exception e) {
+                    failureCount++;
+                    log.error("发送告警消息失败：设备ID={}, 告警类型={}, 错误信息={}",
+                            alarm.getDeviceId(), alarm.getAlarmType(), e.getMessage(), e);
+                }
+            }
+
+            // 6.打印统计信息
+            log.info("租户{}的告警数据推送任务完成", tenantId);
+            log.info("告警数据总数：{}, 成功推送：{}, 失败：{}", alarmList.size(), successCount, failureCount);
+
+        } catch (Exception e) {
+            log.error("租户{}的告警数据推送定时任务执行失败：{}", tenantId, e.getMessage(), e);
+        } finally {
+            Long endTime = System.currentTimeMillis();
+            log.info("结束时间:{}, 耗时:{}ms", getCurrentTime(), endTime - startTime);
+        }
+    }
+
+    /**
+     * 将base_alarm的alarm_type转换为AlarmMessageVO的alarmType
+     */
+    private String convertAlarmType(String alarmType) {
+        AlarmType type = AlarmType.fromOriginalCode(alarmType);
+        return type != null ? type.getMappedCode() : null;
+    }
+
+    /**
+     * 根据平时/战时状态转换告警状态
+     * 平时：handle_status=0则alarmStatus=1，handle_status=1则alarmStatus=4，alarm_false=1则alarmStatus=2
+     * 战时：handle_status=0则alarmStatus=1，handle_status=1则alarmStatus=3，alarm_false=1则alarmStatus=5
+     */
+    private Integer convertAlarmStatus(Integer handleStatus, Integer alarmFalse, String status) {
+        // 如果是误报，优先返回对应的误报状态
+        if (alarmFalse != null && alarmFalse == 1) {
+            // 平时误报=2，战时误报=5
+            return PEACETIME.equals(status) ? 2 : 5;
+        }
+
+        // 根据处理状态和平战时状态返回对应状态
+        if (handleStatus != null) {
+            if (handleStatus == 0) {
+                // 未处理/待处置
+                return 1;
+            } else if (handleStatus == 1) {
+                // 平时已办结=4，战时已处置=3
+                return PEACETIME.equals(status) ? 4 : 3;
+            }
+        }
+
+        // 默认返回未处理状态
+        return 1;
+    }
+
+    /**
+     * 批量查询建筑设施数据，构建设备ID到设施的映射
+     */
+    private Map<String, BaseBuildFacility> buildFacilityMap(List<BaseAlarm> alarmList, Integer tenantId) {
+        Map<String, BaseBuildFacility> facilityMap = new HashMap<>();
+
+        // 收集所有设备ID
+        List<String> deviceIds = alarmList.stream()
+                .map(BaseAlarm::getDeviceId)
+                .filter(id -> id != null && !id.trim().isEmpty())
+                .distinct()
+                .collect(Collectors.toList());
+
+        if (deviceIds.isEmpty()) {
+            return facilityMap;
+        }
+
+        try {
+            LambdaQueryWrapper<BaseBuildFacility> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(BaseBuildFacility::getDeviceId, deviceIds)
+                    .eq(BaseBuildFacility::getTenantId, tenantId)
+                    .eq(BaseBuildFacility::getDeleteFlag, 0);
+
+            List<BaseBuildFacility> facilities = baseBuildFacilityMapper.selectList(queryWrapper);
+
+            for (BaseBuildFacility facility : facilities) {
+                if (facility.getDeviceId() != null) {
+                    facilityMap.put(facility.getDeviceId(), facility);
+                }
+            }
+
+            log.info("批量查询建筑设施数据完成：设备ID数量={}, 匹配到设施数量={}", deviceIds.size(), facilityMap.size());
+        } catch (Exception e) {
+            log.warn("批量查询BaseBuildFacility失败：{}", e.getMessage());
+        }
+
+        return facilityMap;
+    }
+
+    /**
+     * 将投递记录保存到Redis Hash中
+     * 使用Hash结构：key=alarm:delivery:{tenantId}, field=deviceId_alarmId, value=JSON格式的投递状态
+     */
+    private void saveDeliveryRecordToRedis(BaseAlarm alarm, Integer currentAlarmStatus, String status, Integer tenantId) {
+        try {
+            String deliveryKey = ALARM_DELIVERY_KEY_PREFIX + tenantId;
+            String fieldKey = alarm.getDeviceId() + "_" + alarm.getId();
+
+            Map<String, String> recordMap = new HashMap<>();
+            recordMap.put("alarmStatus", String.valueOf(currentAlarmStatus));
+            recordMap.put("handleStatus", String.valueOf(alarm.getHandleStatus()));
+            recordMap.put("alarmFalse", String.valueOf(alarm.getAlarmFalse()));
+            recordMap.put("handleTime", alarm.getHandleTime() != null ? alarm.getHandleTime().toString() : "");
+            recordMap.put("handleBy", alarm.getHandleBy() != null ? alarm.getHandleBy() : "");
+            recordMap.put("deliveryTime", LocalDateTime.now().toString());
+
+            stringRedisTemplate.opsForHash().put(deliveryKey, fieldKey, JSON.toJSONString(recordMap));
+
+            log.debug("保存投递记录到Redis：key={}, field={}", deliveryKey, fieldKey);
+        } catch (Exception e) {
+            log.warn("保存投递记录到Redis失败：告警ID={}, 错误={}", alarm.getId(), e.getMessage());
+        }
+    }
+
+    /**
+     * 检查告警数据是否有变更
+     * 比较handleStatus、alarmFalse、handleTime、handleBy是否发生变化
+     */
+    private boolean hasAlarmChanged(BaseAlarm alarm, String cachedRecord, String status) {
+        try {
+            Map<String, String> cachedMap = JSON.parseObject(cachedRecord, Map.class);
+
+            Integer currentAlarmStatus = convertAlarmStatus(alarm.getHandleStatus(), alarm.getAlarmFalse(), status);
+            Integer cachedAlarmStatus = parseInteger(cachedMap.get("alarmStatus"));
+            Integer cachedHandleStatus = parseInteger(cachedMap.get("handleStatus"));
+            Integer cachedAlarmFalse = parseInteger(cachedMap.get("alarmFalse"));
+
+            if (!Objects.equals(currentAlarmStatus, cachedAlarmStatus)) {
+                return true;
+            }
+            if (!Objects.equals(alarm.getHandleStatus(), cachedHandleStatus)) {
+                return true;
+            }
+            if (!Objects.equals(alarm.getAlarmFalse(), cachedAlarmFalse)) {
+                return true;
+            }
+
+            String cachedHandleTime = cachedMap.get("handleTime");
+            String currentHandleTime = alarm.getHandleTime() != null ? alarm.getHandleTime().toString() : "";
+            if (!Objects.equals(currentHandleTime, cachedHandleTime)) {
+                return true;
+            }
+
+            String cachedHandleBy = cachedMap.get("handleBy");
+            String currentHandleBy = alarm.getHandleBy() != null ? alarm.getHandleBy() : "";
+            if (!Objects.equals(currentHandleBy, cachedHandleBy)) {
+                return true;
+            }
+
+            return false;
+        } catch (Exception e) {
+            log.warn("解析缓存的投递记录失败：告警ID={}, 错误={}", alarm.getId(), e.getMessage());
+            return true;
+        }
+    }
+
+    private Integer parseInteger(String value) {
+        if (value == null || value.trim().isEmpty()) {
+            return null;
+        }
+        try {
+            return Integer.parseInt(value);
+        } catch (NumberFormatException e) {
+            return null;
+        }
+    }
+
+    /**
+     * 根据告警类型填充unitName、thresholding、lineNo字段
+     */
+    private void populateAlarmFields(AlarmMessageVO<Integer> alarmMessageVO, BaseAlarm alarm, Integer tenantId,
+                                     Map<String, BaseBuildFacility> facilityMap) {
+        String originalAlarmType = alarm.getAlarmType();
+        AlarmType alarmTypeEnum = AlarmType.fromOriginalCode(originalAlarmType);
+
+        try {
+            // 根据AlarmMessageVO字段注释中的规则填充字段
+            if (alarmTypeEnum != null && alarmTypeEnum.isStructureMonitoringType()) {
+                // 倾斜/位移/裂缝告警类型 - 设置unitName
+                populateUnitName(alarmMessageVO, alarm, tenantId, facilityMap);
+            }
+            if (alarmTypeEnum != null && alarmTypeEnum.isThresholdAlarmType()) {
+                // 温湿度、气体浓度告警类型 - 设置thresholding
+                populateThresholding(alarmMessageVO, alarm);
+            }
+            if (alarmTypeEnum != null && alarmTypeEnum.isLineNoAlarmType()) {
+                // 电气相关告警类型 - 设置lineNo
+                populateLineNo(alarmMessageVO, alarm);
+            }
+        } catch (Exception e) {
+            log.warn("填充告警字段时发生异常：告警类型={}, 设备ID={}, 错误信息={}",
+                    originalAlarmType, alarm.getDeviceId(), e.getMessage());
+        }
+    }
+
+    /**
+     * 填充unitName字段（倾斜才用）
+     * 对于711、712、713类型，实现与BaseBuildFacility表中facilityDesc字段的映射
+     */
+    private void populateUnitName(AlarmMessageVO<Integer> alarmMessageVO, BaseAlarm alarm, Integer tenantId,
+                                  Map<String, BaseBuildFacility> facilityMap) {
+        String originalAlarmType = alarm.getAlarmType();
+        AlarmType alarmTypeEnum = AlarmType.fromOriginalCode(originalAlarmType);
+
+        if (alarmTypeEnum != null && alarmTypeEnum.isStructureMonitoringType()) {
+            // 从Map中获取建筑设施信息
+            BaseBuildFacility facility = facilityMap.get(alarm.getDeviceId());
+            if (facility != null && facility.getFacilityDesc() != null) {
+                alarmMessageVO.setUnitName(facility.getFacilityDesc());
+                log.debug("成功映射unitName：设备ID={}, facilityDesc={}", alarm.getDeviceId(), facility.getFacilityDesc());
+            } else {
+                // 如果没有找到对应的facilityDesc，设置默认值
+                String defaultUnitName = alarmTypeEnum.getDefaultUnitName();
+                alarmMessageVO.setUnitName(defaultUnitName);
+                log.debug("未找到facilityDesc，使用默认值：设备ID={}, 默认值={}", alarm.getDeviceId(), defaultUnitName);
+            }
+        } else {
+            // 其他情况，设置默认值
+            String defaultUnitName = alarmTypeEnum != null ? alarmTypeEnum.getDefaultUnitName() : "监测单元";
+            alarmMessageVO.setUnitName(defaultUnitName);
+        }
+    }
+
+    /**
+     * 填充thresholding字段（氧气、温湿度、一氧化碳、二氧化碳、剩余电流、供电电缆温度、电流偏大专用）
+     */
+    private void populateThresholding(AlarmMessageVO<Integer> alarmMessageVO, BaseAlarm alarm) {
+        // try {
+        //     // 从告警数据中解析阈值，如果解析失败则设置默认值
+        //     Float threshold = parseThresholdFromAlarmData(alarm.getAlarmData(), alarm.getAlarmType());
+        //     alarmMessageVO.setThresholding(threshold);
+        // } catch (Exception e) {
+        // 解析失败时设置合理的默认值
+        Float defaultThreshold = getDefaultThreshold(alarm.getAlarmType());
+        alarmMessageVO.setThresholding(defaultThreshold);
+        // log.warn("解析阈值失败，使用默认值：设备ID={}, 告警类型={}, 错误={}",
+        //         alarm.getDeviceId(), alarm.getAlarmType(), e.getMessage());
+        // }
+    }
+
+    /**
+     * 从告警数据中解析阈值
+     */
+    private Float parseThresholdFromAlarmData(String alarmData, String alarmType) {
+        if (alarmData == null || alarmData.trim().isEmpty()) {
+            return getDefaultThreshold(alarmType);
+        }
+
+        try {
+            // 尝试从告警数据中提取数值
+            String cleanedData = alarmData.replaceAll("[^\\d.]", "");
+            if (!cleanedData.isEmpty()) {
+                float parsedValue = Float.parseFloat(cleanedData);
+
+                // 添加边界检查，防止异常值
+                if (isValidThreshold(parsedValue, alarmType)) {
+                    return parsedValue;
+                } else {
+                    log.debug("阈值超出合理范围，使用默认值：alarmData={}, alarmType={}, value={}",
+                            alarmData, alarmType, parsedValue);
+                }
+            }
+        } catch (NumberFormatException e) {
+            log.debug("无法从告警数据中解析数值：alarmData={}", alarmData);
+        }
+
+        return getDefaultThreshold(alarmType);
+    }
+
+    /**
+     * 验证阈值是否在合理范围内
+     */
+    private boolean isValidThreshold(float value, String alarmType) {
+        AlarmType type = AlarmType.fromOriginalCode(alarmType);
+        return type == null || type.isValidThreshold(value);
+    }
+
+    /**
+     * 获取thresholding的默认值
+     */
+    private Float getDefaultThreshold(String alarmType) {
+        AlarmType type = AlarmType.fromOriginalCode(alarmType);
+        return type != null ? type.getDefaultThreshold() : 0.0f;
+    }
+
+    /**
+     * 填充lineNo字段（剩余电流、供电电缆温度、电流偏大专用）
+     */
+    private void populateLineNo(AlarmMessageVO<Integer> alarmMessageVO, BaseAlarm alarm) {
+        // try {
+        //     // 从设备ID或告警数据中解析线路编号
+        //     Integer lineNo = parseLineNoFromDeviceOrData(alarm.getDeviceId(), alarm.getAlarmData());
+        //     alarmMessageVO.setLineNo(lineNo);
+        // } catch (Exception e) {
+        // 解析失败时设置默认值
+        alarmMessageVO.setLineNo(1); // 默认线路1
+        // log.warn("解析线路编号失败，使用默认值：设备ID={}, 错误={}", alarm.getDeviceId(), e.getMessage());
+        // }
+    }
+
+    /**
+     * 从设备ID或告警数据中解析线路编号
+     */
+    // private Integer parseLineNoFromDeviceOrData(String deviceId, String alarmData) {
+    //     // 首先尝试从设备ID中解析
+    //     if (deviceId != null && !deviceId.trim().isEmpty()) {
+    //         // 假设设备ID格式可能包含线路信息，例如：DEV001_L1, DEV002_L2等
+    //         if (deviceId.contains("_L")) {
+    //             try {
+    //                 String linePart = deviceId.substring(deviceId.lastIndexOf("_L") + 2);
+    //                 int lineNo = Integer.parseInt(linePart);
+    //                 if (isValidLineNo(lineNo)) {
+    //                     return lineNo;
+    //                 } else {
+    //                     log.debug("线路编号超出范围，使用默认值：deviceId={}, lineNo={}", deviceId, lineNo);
+    //                 }
+    //             } catch (NumberFormatException e) {
+    //                 log.debug("无法从设备ID中解析线路编号：deviceId={}", deviceId);
+    //             }
+    //         }
+    //
+    //         // 或者尝试从设备ID末尾提取数字作为线路编号
+    //         String numbers = deviceId.replaceAll("[^\\d]", "");
+    //         if (!numbers.isEmpty()) {
+    //             try {
+    //                 int lineNo = Integer.parseInt(numbers);
+    //                 if (isValidLineNo(lineNo)) {
+    //                     return lineNo;
+    //                 } else {
+    //                     log.debug("从设备ID提取的线路编号超出范围，使用默认值：deviceId={}, lineNo={}", deviceId, lineNo);
+    //                 }
+    //             } catch (NumberFormatException e) {
+    //                 log.debug("无法从设备ID中提取有效线路编号：deviceId={}", deviceId);
+    //             }
+    //         }
+    //     }
+    //
+    //     // 然后尝试从告警数据中解析
+    //     if (alarmData != null && !alarmData.trim().isEmpty()) {
+    //         String numbers = alarmData.replaceAll("[^\\d]", "");
+    //         if (!numbers.isEmpty()) {
+    //             try {
+    //                 int lineNo = Integer.parseInt(numbers);
+    //                 if (isValidLineNo(lineNo)) {
+    //                     return lineNo;
+    //                 } else {
+    //                     log.debug("从告警数据中解析的线路编号超出范围，使用默认值：alarmData={}, lineNo={}", alarmData, lineNo);
+    //                 }
+    //             } catch (NumberFormatException e) {
+    //                 log.debug("无法从告警数据中解析线路编号：alarmData={}", alarmData);
+    //             }
+    //         }
+    //     }
+    //
+    //     // 默认返回线路1
+    //     return 1;
+    // }
+
+    /**
+     * 验证线路编号是否在有效范围内
+     */
+    private boolean isValidLineNo(int lineNo) {
+        return lineNo >= 1 && lineNo <= 20; // 限制在1-20范围内，符合实际情况
+    }
+}

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

@@ -0,0 +1,35 @@
+package com.usky.cdi.service.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.alibaba.fastjson.JSONObject;
+import com.alibaba.nacos.shaded.com.google.gson.Gson;
+import com.usky.cdi.domain.BaseAlarm;
+import com.usky.cdi.mapper.BaseAlarmMapper;
+import com.usky.cdi.service.BaseAlarmService;
+import com.usky.cdi.service.config.mqtt.MqttOutConfig;
+import com.usky.cdi.service.mqtt.MqttConnectionTool;
+import com.usky.cdi.service.util.SnowflakeIdGenerator;
+import com.usky.cdi.service.vo.alarm.AlarmMessageVO;
+import com.usky.common.mybatis.core.AbstractCrudService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.text.SimpleDateFormat;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.HashMap;
+
+/**
+ * <p>
+ * 统一告警表 服务实现类
+ * </p>
+ *
+ * @author fu
+ * @since 2025-12-29
+ */
+@Service
+public class BaseAlarmServiceImpl extends AbstractCrudService<BaseAlarmMapper, BaseAlarm> implements BaseAlarmService {
+
+}

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

@@ -0,0 +1,42 @@
+package com.usky.cdi.service.util;
+
+import com.usky.cdi.service.impl.AlarmDataSyncService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Component;
+
+/**
+ * 设备数据同步组件（包含定时任务）
+ */
+@Slf4j
+@Component
+public class DeviceAlarmDataSyncService {
+
+    private final AlarmDataSyncService alarmDataSyncService;
+
+    @Autowired
+    public DeviceAlarmDataSyncService(AlarmDataSyncService alarmDataSyncService) {
+        this.alarmDataSyncService = alarmDataSyncService;
+    }
+
+    /**
+     * 定时任务：定期执行设备数据同步上报
+     * fixedDelay：任务执行完成后固定延迟29分钟执行下一次
+     * initialDelay：初始化后立即执行第一次任务
+     */
+    // @Scheduled(fixedDelay = 1 * 60 * 1000, initialDelay = 0)
+    // public void scheduledDeviceDataSync() {
+    //     Integer tenantId = 1205;
+    //     Long engineeringId = 3101070011L;
+    //     String username = "3101070011";
+    //     String password = "5RqhJ7VG";
+    //     log.info("开始执行桃浦象屿人防设备数据同步定时任务，租户ID：{}，工程ID：{}", tenantId, engineeringId);
+    //
+    //     try {
+    //         alarmDataSyncService.synchronizeAlarmData(tenantId, engineeringId, username, password, "peacetime");
+    //     } catch (Exception e) {
+    //         log.error("定时任务执行设备数据同步失败：{}", e.getMessage(), e);
+    //     }
+    // }
+}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/vo/alarm/AlarmMessage1VO.java

@@ -1,69 +0,0 @@
-package com.usky.cdi.service.vo.alarm;
-
-import lombok.Data;
-
-@Data
-public class AlarmMessage1VO {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 数据包ID
-     */
-    private Long dataPacketID;
-
-    /**
-     * 人防工程ID
-     */
-    private Long engineeringID;
-
-    /**
-     * 事件ID
-     */
-    private Integer alarmID;
-
-    /**
-     * 事件来源
-     */
-    private Integer alarmSource;
-
-    /**
-     * 物联设施ID
-     */
-    private Integer sensorID;
-
-    /**
-     * 事件类型
-     */
-    private String alarmType;
-
-    /**
-     * 事件状态
-     */
-    private Integer alarmStatus;
-
-    /**
-     * 最新水浸状态
-     */
-    private Integer sensorValue;
-
-    /**
-     * 事件发生/更新时间
-     */
-    private String alarmUpdateTime;
-
-    /**
-     * 监测对象编号
-     */
-    private String monitorObjNo;
-
-    /**
-     * 事件描述
-     */
-    private String alarmDesc;
-
-    /**
-     * 上报时间
-     */
-    private String publishTime;
-
-}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/vo/alarm/AlarmMessage2VO.java

@@ -1,69 +0,0 @@
-package com.usky.cdi.service.vo.alarm;
-
-import lombok.Data;
-
-@Data
-public class AlarmMessage2VO {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 数据包ID
-     */
-    private Long dataPacketID;
-
-    /**
-     * 人防工程ID
-     */
-    private Long engineeringID;
-
-    /**
-     * 事件ID
-     */
-    private Integer alarmID;
-
-    /**
-     * 事件来源
-     */
-    private Integer alarmSource;
-
-    /**
-     * 防护单元
-     */
-    private String unitName;
-
-    /**
-     * 事件类型
-     */
-    private String alarmType;
-
-    /**
-     * 事件状态
-     */
-    private Integer alarmStatus;
-
-    /**
-     * 倾斜、位移、裂缝监测结果
-     */
-    private Double sensorValue;
-
-    /**
-     * 事件发生/更新时间
-     */
-    private String alarmUpdateTime;
-
-    /**
-     * 监测对象编号
-     */
-    private String monitorObjNo;
-
-    /**
-     * 事件描述
-     */
-    private String alarmDesc;
-
-    /**
-     * 上报时间
-     */
-    private String publishTime;
-
-}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/vo/alarm/AlarmMessage3VO.java

@@ -1,79 +0,0 @@
-package com.usky.cdi.service.vo.alarm;
-
-import lombok.Data;
-
-@Data
-public class AlarmMessage3VO {
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * 数据包ID
-     */
-    private Long dataPacketID;
-
-    /**
-     * 人防工程ID
-     */
-    private Long engineeringID;
-
-    /**
-     * 事件ID
-     */
-    private Integer alarmID;
-
-    /**
-     * 事件来源
-     */
-    private Integer alarmSource;
-
-    /**
-     * 物联设施ID
-     */
-    private Integer sensorID;
-
-    /**
-     * 事件类型
-     */
-    private String alarmType;
-
-    /**
-     * 事件状态
-     */
-    private Integer alarmStatus;
-
-    /**
-     * 告警时的电流
-     */
-    private Double sensorValue;
-
-    /**
-     * 告警阈值
-     */
-    private Double thresholding;
-
-    /**
-     * 线缆序号
-     */
-    private Integer lineNo;
-
-    /**
-     * 事件发生/更新时间
-     */
-    private String alarmUpdateTime;
-
-    /**
-     * 监测对象编号
-     */
-    private String monitorObjNo;
-
-    /**
-     * 事件描述
-     */
-    private String alarmDesc;
-
-    /**
-     * 上报时间
-     */
-    private String publishTime;
-
-}

service-cdi/service-cdi-biz/src/main/java/com/usky/cdi/service/vo/alarm/AlarmMessageVO.java

@@ -1,74 +1,146 @@
 package com.usky.cdi.service.vo.alarm;
 
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonInclude;
 import lombok.Data;
 
+import java.io.Serializable;
+import java.time.LocalDateTime;
+
+/**
+ *
+ * @author fyc
+ * @email yuchuan.fu@chinausky.com
+ * @date 2025/12/29
+ */
+
 @Data
-public class AlarmMessageVO {
+@JsonInclude(JsonInclude.Include.NON_NULL)   // 值为 null 的字段不序列化，向前兼容
+public class AlarmMessageVO<T extends Number> implements Serializable {
+
     private static final long serialVersionUID = 1L;
 
+    /* ========== 所有告警公有字段 ========== */
     /**
-     * 数据包ID
-     */
+     * 数据包ID 必填
+     * Int 15
+     **/
     private Long dataPacketID;
 
     /**
-     * 人防工程ID
-     */
+     * 人防工程ID 必填
+     * Int 10
+     **/
     private Long engineeringID;
 
     /**
-     * 事件ID
-     */
+     * 告警事件ID 必填
+     * Int 15
+     **/
     private Integer alarmID;
 
     /**
-     * 事件来源
-     */
+     * 事件来源 必填
+     * 1	人防工程级物联平台自动发现
+     * 2	人工巡查发现
+     **/
     private Integer alarmSource;
 
     /**
-     * 物联设施ID
-     */
+     * 物联设施ID 非必填
+     * Int 8
+     **/
     private Integer sensorID;
 
     /**
-     * 事件类型
-     */
+     * 告警类型 必填
+     * 10.1	水浸告警
+     * 12.1	空气温度偏高告警
+     * 13.1	空气湿度偏高告警
+     * 14.1	氧气浓度偏低告警
+     * 15.1	二氧化碳浓度偏高告警
+     * 16.1	一氧化碳浓度偏高告警
+     * 29.1	剩余电流偏大告警
+     * 29.2	供电电缆温度偏高告警
+     * 29.3	电流偏大
+     * 33.1	人员闯入告警
+     * 34.1	监测位置有倾斜告警
+     * 35.1	监测位置有倾斜告警
+     * 36.1	监测位置有裂缝告警
+     * 37.1	监测位置有位移告警
+     **/
     private String alarmType;
 
     /**
-     * 事件状态
-     */
+     * 告警状态 必填
+     * 平时阶段
+     * 1	未响应	新发生的告警事件的初始状态
+     * 2	已忽略	特殊情况下可以忽略本次告警事件
+     * 3	已派单	该事件以工单的形式派人进行处置
+     * 4	已办结	经人工处置后，告警事件消除
+     * 5	已消失	异常情况自动消失，系统自动消除告警事件
+     * 战时阶段
+     * 1	待处置	系统发现异常情况并上报告警事件
+     * 2	处置中	管理人员已知晓告警事件，并派人进行处
+     * 3	已处置	经过人工处置，已解决告警事件
+     * 4    已消除	未经过人工处置，但告警事件已消失（此种状态下系统会自动消除告警事件）
+     * 5	已忽略	特殊情况下可以忽略本次告警事件
+     **/
     private Integer alarmStatus;
 
     /**
-     * 最新水浸状态
-     */
-    private Double sensorValue;
-
-    /**
-     * 告警阈值
-     */
-    private Double thresholding;
-
-    /**
-     * 事件发生/更新时间
-     */
+     * 告警时间 必填
+     * 查询告警表 base_alarm 时新增告警取 alarm_type 字段，更新数据则取 handle_time 字段
+     * 时间型（带毫秒），格式为 yyyy-MM-DD hh :mm :ss.SSS
+     **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS", timezone = "GMT+8")
     private String alarmUpdateTime;
 
     /**
-     * 监测对象编号
-     */
+     * 监测对象编号 非必填
+     * Str 50
+     **/
     private String monitorObjNo;
 
     /**
-     * 事件描述
-     */
+     * 告警描述 必填
+     * Str 200
+     **/
     private String alarmDesc;
 
     /**
-     * 上报时间
-     */
-    private String publishTime;
-
+     * 上报时间 必填
+     * 获取当前时间
+     * 时间型（带毫秒），格式为 yyyy-MM-DD hh :mm :ss.SSS
+     **/
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss.SSS", timezone = "GMT+8")
+    private LocalDateTime publishTime;
+
+    /** 告警数据字段 必填、通用
+     * 水浸(Integer) 0:无水、1:有水
+     * 倾斜/位移/裂缝(Integer) 0:无位移、1:有位移
+     * 人员闯入告警 0:无闯入、1:有闯入
+     * 电流(Float)
+     **/
+    private String sensorValue;
+
+    /* ========== 私有字段 ========== */
+
+    /** 倾斜才用
+     * 单元名称 必填
+     * Str 30
+     **/
+    private String unitName;
+
+    /** 氧气、温湿度、一氧化碳、二氧化碳、剩余电流、供电电缆温度、电流偏大专用
+     * 阈值 必填
+     * Float
+     **/
+    private Float thresholding;
+
+    /** 剩余电流、供电电缆温度、电流偏大专用
+     * 线路编号 必填
+     * Int 10
+     **/
+    private Integer lineNo;
 }

service-cdi/service-cdi-biz/src/main/resources/mapper/cdi/BaseAlarmMapper.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.usky.cdi.mapper.BaseAlarmMapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.usky.cdi.domain.BaseAlarm">
+        <id column="id" property="id" />
+        <result column="device_id" property="deviceId" />
+        <result column="alarm_time" property="alarmTime" />
+        <result column="alarm_type" property="alarmType" />
+        <result column="alarm_object" property="alarmObject" />
+        <result column="alarm_data" property="alarmData" />
+        <result column="alarm_attribute" property="alarmAttribute" />
+        <result column="alarm_content" property="alarmContent" />
+        <result column="alarm_grade" property="alarmGrade" />
+        <result column="alarm_address" property="alarmAddress" />
+        <result column="handle_by" property="handleBy" />
+        <result column="handle_time" property="handleTime" />
+        <result column="handle_content" property="handleContent" />
+        <result column="handle_phone" property="handlePhone" />
+        <result column="handle_status" property="handleStatus" />
+        <result column="alarm_false" property="alarmFalse" />
+        <result column="site_photo" property="sitePhoto" />
+        <result column="product_code" property="productCode" />
+        <result column="dept_id" property="deptId" />
+        <result column="tenant_id" property="tenantId" />
+    </resultMap>
+
+</mapper>

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

@@ -1,5 +1,6 @@
 package com.ruoyi.job.task;
 
+import com.usky.cdi.AlarmDataSyncTaskService;
 import com.usky.cdi.RemotecdiTaskService;
 import com.usky.common.core.utils.StringUtils;
 import com.usky.meeting.RemoteMeetingService;
@@ -31,6 +32,9 @@ public class RyTask {
     @Autowired
     private RemotecdiTaskService remoteCdiTaskService;
 
+    @Autowired
+    private AlarmDataSyncTaskService alarmDataSyncTaskService;
+
     public void ryMultipleParams(String s, Boolean b, Long l, Double d, Integer i) {
         System.out.println(StringUtils.format("执行多参方法： 字符串类型{}，布尔类型{}，长整型{}，浮点型{}，整形{}", s, b, l, d, i));
     }
@@ -95,4 +99,9 @@ public class RyTask {
         remoteCdiTaskService.allData(engineeringId, username, password);
     }
 
+    public void synchronizeAlarmData(Integer tenantId, Long engineeringId, String username, String password, String status) {
+        System.out.println("人防告警数据推送定时任务开始执行......");
+        alarmDataSyncTaskService.synchronizeAlarmData(tenantId, engineeringId, username, password, status);
+    }
+
 }