1、抄表记录bug修复

2、采暖系统增加温度设定。

mh-admin/src/main/java/com/mh/MHRunner.java

@@ -1,14 +1,19 @@
 package com.mh;
 
+import com.mh.common.core.domain.entity.GatewayManage;
 import com.mh.common.core.domain.entity.MqttSubscription;
 import com.mh.common.utils.StringUtils;
 import com.mh.framework.mqtt.service.IMqttTopicService;
+import com.mh.framework.netty.EchoServer;
+import com.mh.system.service.device.ICollectionParamsManageService;
+import com.mh.system.service.device.IGatewayManageService;
 import com.mh.system.service.mqtt.IMqttSubscriptionService;
 import org.springframework.boot.ApplicationArguments;
 import org.springframework.boot.ApplicationRunner;
 import org.springframework.stereotype.Component;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author LJF
@@ -24,15 +29,41 @@ public class MHRunner implements ApplicationRunner {
 
     private final IMqttTopicService iMqttTopicService;
 
-    public MHRunner(IMqttSubscriptionService iMqttSubscriptionService, IMqttTopicService iMqttTopicService) {
+    private final ICollectionParamsManageService collectionParamsManageService;
+
+    private final IGatewayManageService gatewayManageService;
+
+    public MHRunner(IMqttSubscriptionService iMqttSubscriptionService, IMqttTopicService iMqttTopicService, ICollectionParamsManageService collectionParamsManageService, IGatewayManageService gatewayManageService) {
         this.iMqttSubscriptionService = iMqttSubscriptionService;
         this.iMqttTopicService = iMqttTopicService;
+        this.collectionParamsManageService = collectionParamsManageService;
+        this.gatewayManageService = gatewayManageService;
     }
 
     @Override
     public void run(ApplicationArguments args) throws Exception {
         // 初始化mqtt订阅记录
         initializeMqttSubscription();
+        // 生成DTU采集参数
+        createDtuCollectionParams();
+        // 启动netty服务端
+        startNettyServer();
+    }
+
+    private void startNettyServer() {
+        List<GatewayManage> gatewayManages = gatewayManageService.selectGwManageList(new GatewayManage());
+        if (gatewayManages != null && !gatewayManages.isEmpty()) {
+            // 根据端口号分组
+            gatewayManages.stream().collect(Collectors.groupingBy(GatewayManage::getPort)).forEach((k, v) -> {
+                // 启动网关
+                GatewayManage gatewayManage = v.getFirst();
+                new Thread(() -> new EchoServer(gatewayManage.getPort()).start()).start();
+            });
+        }
+    }
+
+    private void createDtuCollectionParams() {
+        collectionParamsManageService.createDtuCollectionParams();
     }
 
     /**

mh-admin/src/main/java/com/mh/web/controller/comprehensive/CompreReportController.java

@@ -0,0 +1,55 @@
+package com.mh.web.controller.comprehensive;
+
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.vo.EnergyQueryVO;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.system.service.report.IComprehensiveReportService;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @Classname CompreReportController
+ * Todo: 综合报表
+ * @Date 2025-10-05 13:59
+ * @Created by LJF
+ */
+@RestController
+@RequestMapping("/compre")
+public class CompreReportController extends BaseController {
+
+    private final IComprehensiveReportService proOverviewService;
+
+    public CompreReportController(IComprehensiveReportService proOverviewService) {
+        this.proOverviewService = proOverviewService;
+    }
+
+    @PostMapping("/report")
+    public TableDataInfo report(@RequestBody EnergyQueryVO vo) {
+        TableDataInfo dataTable = getDataTable(proOverviewService.report(vo));
+        // 优化分页逻辑，防止出现数组越界异常
+        List<?> rows = dataTable.getRows();
+        int total = rows.size();
+        // 如果 pageNum 小于等于0，则返回全部
+        if (vo.getPageNum() <= 0) {
+            return dataTable;
+        }
+        int pageNum = vo.getPageNum() <= 0 ? 1 : vo.getPageNum();
+        int pageSize = vo.getPageSize() <= 0 ? 10 : vo.getPageSize();
+
+        // 计算起始索引和结束索引
+        int startIndex = (pageNum - 1) * pageSize;
+        int endIndex = Math.min(startIndex + pageSize, total);
+
+        // 边界检查
+        if (startIndex >= total || startIndex < 0) {
+            dataTable.setRows(List.of()); // 返回空列表而不是抛出异常
+        } else {
+            dataTable.setRows(rows.subList(startIndex, endIndex));
+        }
+
+        return dataTable;
+    }
+
+
+}

mh-admin/src/main/java/com/mh/web/controller/device/ChillersParamsController.java

@@ -18,6 +18,7 @@ import com.mh.system.service.device.ICommunicationParamsService;
 import com.mh.system.service.energy.IEnergyService;
 import org.springframework.web.bind.annotation.*;
 
+import java.math.BigDecimal;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +52,7 @@ public class ChillersParamsController extends BaseController {
      */
     @GetMapping("/list")
     public TableDataInfo list(CollectionParamsManage collectionParamsManage) {
+        collectionParamsManage.setIsUse(0);
         List<CollectionParamsManage> list = iCollectionParamsManageService.selectCollectionParamsManageList(collectionParamsManage);
         // list中的CollectionParamsManage中的other_name去掉“号主机”之前数据
         list.forEach(item -> {
@@ -67,31 +69,35 @@ public class ChillersParamsController extends BaseController {
                     CollectionParamsManageVO2 vo = new CollectionParamsManageVO2();
                     BeanUtils.copyProperties(item, vo);
                     vo.setCurValue(item.getCurValue().setScale(2).toString());
+                    // 再根据mtType判断，如果是压缩机的，就只保留整数
+                    if (vo.getMtType().equals("9") || vo.getMtType().equals("10") || vo.getMtType().equals("11")) {
+                        vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() + "");
+                    }
                     // 判断运行状态、启停、故障、本地远程
                     switch (vo.getParamType()) {
                         case "1":   // 运行状态
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "运行" : "停止");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "运行" : "停止");
                             }
                             break;
                         case "2":   // 启停
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "启动" : "停止");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "启动" : "停止");
                             }
                             break;
                         case "5":   // 故障
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "故障" : "正常");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "故障" : "无故障");
                             }
                             break;
                         case "6":   // 手自动切换
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "手动" : "自动");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "手动" : "自动");
                             }
                             break;
                         case "22":   // 本地远程切换
                             if (!StringUtils.isEmpty(vo.getCurValue())) {
-                                vo.setCurValue(vo.getCurValue().equals("1") ? "远程" : "本地");
+                                vo.setCurValue(new BigDecimal(vo.getCurValue()).intValue() == 1 ? "远程" : "本地");
                             }
                             break;
                         default:

mh-admin/src/main/java/com/mh/web/controller/device/CollectionParamsManageController.java

@@ -88,4 +88,14 @@ public class CollectionParamsManageController extends BaseController {
         return toAjax(iCollectionParamsManageService.deleteCommunicationByIds(cpmIds));
     }
 
+    /**
+     * 删除设备采集参数管理
+     */
+    @Log(title = "设备采集参数管理")
+    @GetMapping("/list/{deviceLegerIds}")
+    public TableDataInfo queryList(@PathVariable String[] deviceLegerIds)
+    {
+        return getDataTable(iCollectionParamsManageService.selectCollectionParamsManageListByIds(deviceLegerIds));
+    }
+
 }

mh-admin/src/main/java/com/mh/web/controller/device/OperationController.java

@@ -11,6 +11,7 @@ import com.mh.common.core.domain.vo.DeviceOperateMonitorVO;
 import com.mh.common.core.page.TableDataInfo;
 import com.mh.common.enums.BusinessType;
 import com.mh.framework.mqtt.service.IMqttGatewayService;
+import com.mh.framework.netty.INettyService;
 import com.mh.system.service.device.ICollectionParamsManageService;
 import com.mh.system.service.operation.IOperationDeviceService;
 import lombok.extern.slf4j.Slf4j;
@@ -45,13 +46,16 @@ public class OperationController extends BaseController {
 
     private final IMqttGatewayService iMqttGatewayService;
 
+    private final INettyService nettyService;
+
     @Autowired
     public OperationController(ICollectionParamsManageService iCollectionParamsManageService,
                                IOperationDeviceService iOperationService,
-                               IMqttGatewayService iMqttGatewayService) {
+                               IMqttGatewayService iMqttGatewayService, INettyService nettyService) {
         this.iCollectionParamsManageService = iCollectionParamsManageService;
         this.iOperationService = iOperationService;
         this.iMqttGatewayService = iMqttGatewayService;
+        this.nettyService = nettyService;
     }
 
     /**
@@ -95,11 +99,21 @@ public class OperationController extends BaseController {
     @ControlDeviceAno(value = "设备操作")
     public AjaxResult operationDevice(@RequestBody List<OrderEntity> changeValues) {
         try {
+            // 判断id是否是DTU设备类型
+            if (!iOperationService.isAdvanTech(changeValues)) {
                 String sendOrder = iOperationService.operationDevice(changeValues);
                 String name = mhConfig.getName();
                 // 获取mqtt操作队列(后期通过mqtt队列配置发送主题)
                 log.info("发送主题：{},消息：{}", name + "/" + controlTopic, sendOrder);
                 iMqttGatewayService.publish(name + "/" + controlTopic, sendOrder, 1);
+            } else {
+                // 目前只有DTU设备需要发送4G指令
+                if (nettyService.sendOrder(changeValues)) {
+                    return AjaxResult.success();
+                } else {
+                    return AjaxResult.error();
+                }
+            }
         } catch (Exception e) {
             log.error("设备操作失败", e);
             return AjaxResult.error();

mh-admin/src/main/java/com/mh/web/controller/energy/HotWaterEnergyController.java

@@ -0,0 +1,109 @@
+package com.mh.web.controller.energy;
+
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.entity.WaterLevel;
+import com.mh.common.core.domain.entity.WaterTemp;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.system.service.energy.IEnergyQueryService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 生活热水能耗分析
+ * @date 2025-06-18 17:49:49
+ */
+@RestController
+@RequestMapping("/hot_energy")
+public class HotWaterEnergyController extends BaseController {
+
+    private final IEnergyQueryService energyQueryService;
+
+    public HotWaterEnergyController(IEnergyQueryService iEnergyQueryService) {
+        this.energyQueryService = iEnergyQueryService;
+    }
+
+    @GetMapping("/query")
+    public TableDataInfo queryEnergy(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                     @RequestParam(value = "startDate", required = false) String startDate,
+                                     @RequestParam(value = "endDate", required = false) String endDate,
+                                     @RequestParam(value = "type") int type) {
+        startPage();
+        List<?> result = energyQueryService.queryEnergyDataList(buildingId, startDate, endDate, type);
+        return getDataTable(result);
+    }
+
+    //查询日月年用量汇总
+    @GetMapping(value = "/energySum")
+    public TableDataInfo queryEnergySum(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "curDate", required = false) String curDate,
+                                        @RequestParam(value = "type", required = true) Integer type) {
+        startPage();
+        List<?> result = energyQueryService.queryEnergyDataSumList(buildingId, curDate, type);
+        return getDataTable(result);
+    }
+
+    /**
+     * 温度变化表
+     *
+     * @param buildingId
+     * @param curDate
+     * @return
+     */
+    @GetMapping("/waterTemp")
+    public TableDataInfo queryWaterTemp(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                        @RequestParam(value = "curDate", required = false) String curDate) {
+        startPage();
+        List<WaterTemp> result = energyQueryService.queryWaterTemp(buildingId, curDate);
+        return getDataTable(result);
+    }
+
+    /**
+     * 水位变化表
+     *
+     * @param buildingId
+     * @param curDate
+     * @return
+     */
+    @GetMapping("/waterLevel")
+    public TableDataInfo queryWaterLevel(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                         @RequestParam(value = "curDate", required = false) String curDate) {
+        startPage();
+        List<WaterLevel> result = energyQueryService.queryWaterLevel(buildingId, curDate);
+        return getDataTable(result);
+    }
+
+    @GetMapping("/queryDeviceDatas")
+    public TableDataInfo queryDeviceDatas(@RequestParam(value = "buildingId", required = false) String buildingId,
+                                          @RequestParam(value = "startDate", required = false) String startDate,
+                                          @RequestParam(value = "endDate", required = false) String endDate,
+                                          @RequestParam(value = "deviceType", required = false) String deviceType) {
+        startPage();
+        List<?> result = energyQueryService.queryDeviceDatas(buildingId, startDate, endDate, deviceType);
+        return getDataTable(result);
+    }
+
+    @GetMapping("/analysis/queryYear") //type=1（水），2（电），3（能耗），4（维保）
+    public TableDataInfo queryAnalysisYear(@RequestParam(value = "curDate",required = true) String curDate,
+                                        @RequestParam(value = "buildingId",required = true) String buildingId,
+                                        @RequestParam(value = "type",defaultValue = "3") int type) {
+        startPage();
+        List<?> result = energyQueryService.queryAnalysisYear(curDate, buildingId, type);
+        return getDataTable(result);
+
+    }
+
+    @GetMapping("/analysis/queryMonth") //type=1（水），2（电），3（能耗），4（维保），5（使用时间）
+    public TableDataInfo queryAnalysisMonth(@RequestParam(value = "curDate",required = true) String curDate,
+                                         @RequestParam(value = "buildingId",required = true) String buildingId,
+                                         @RequestParam(value = "type",defaultValue = "3") int type) {
+        startPage();
+        List<?> result = energyQueryService.queryAnalysisMonth(curDate, buildingId, type);
+        return getDataTable(result);
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/monitor/CoolingSystemMonitorController.java

@@ -111,4 +111,10 @@ public class CoolingSystemMonitorController extends BaseController {
         return AjaxResult.success(iCoolingSystemMonitorService.getSystemMode(systemType, paramType));
     }
 
+    @GetMapping("/getWeatherTemp")
+    public TableDataInfo getWeatherTemp(@RequestParam(name = "startTime") String startTime, @RequestParam(name = "endTime") String endTime){
+        startPage();
+        return getDataTable(iCoolingSystemMonitorService.getWeatherTemp(startTime, endTime));
+    }
+
 }

mh-admin/src/main/java/com/mh/web/controller/monitor/HeatingPumpMonitorController.java

@@ -0,0 +1,70 @@
+package com.mh.web.controller.monitor;
+
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.dto.DeviceMonitorDTO;
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.system.service.device.ICollectionParamsManageService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 三台采暖泵的监测
+ * @date 2025-09-12 09:36:33
+ */
+@RestController
+@RequestMapping("/device")
+public class HeatingPumpMonitorController extends BaseController {
+
+    private final ICollectionParamsManageService collectionParamsManageService;
+
+    public HeatingPumpMonitorController(ICollectionParamsManageService collectionParamsManageService) {
+        this.collectionParamsManageService = collectionParamsManageService;
+    }
+
+    /**
+     * 获取 alarmList 列表
+     * @param systemType 3
+     * @param type 0：代表查询报警
+     * @return
+     */
+    @RequestMapping("/heatPump/alarmList")
+    public TableDataInfo list(@RequestParam(name = "systemType") String systemType,
+                              @RequestParam(name = "type", required = false, defaultValue = "0") String type) {
+        List<?> list = collectionParamsManageService.selectHeatPumpAlarmListByParams(systemType, type, "14", "5");
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取 运行热泵统计 列表
+     * @param systemType 3
+     * @param type 0：代表查询报警
+     * @return
+     */
+    @RequestMapping("/heatPump/online")
+    public TableDataInfo online(@RequestParam(name = "systemType") String systemType,
+                              @RequestParam(name = "type", required = false, defaultValue = "0") String type) {
+        List<?> list = collectionParamsManageService.selectHeatPumpOnlineByParams(systemType, type);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取 采暖泵 列表
+     * @param systemType 3
+     * @param type 0：代表查询动画界面数据
+     * @return
+     */
+    @RequestMapping("/heatPump/list")
+    public TableDataInfo heatPumpList(@RequestParam(name = "systemType") String systemType,
+                              @RequestParam(name = "type", required = false, defaultValue = "0") String type) {
+        List<DeviceMonitorDTO> list = collectionParamsManageService.selectHotWaterBoilerListByParams(systemType, type, "14");
+        return getDataTable(list);
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/monitor/HotWaterMonitorController.java

@@ -1,14 +1,15 @@
 package com.mh.web.controller.monitor;
 
 import com.mh.common.core.controller.BaseController;
-import com.mh.common.core.domain.ColumnData;
 import com.mh.common.core.domain.ColumnFilter;
+import com.mh.common.core.domain.entity.DeviceState;
 import com.mh.common.core.domain.dto.HotWaterControlDTO;
 import com.mh.common.core.domain.dto.HotWaterNowDataDTO;
 import com.mh.common.core.domain.dto.PumpInfoDTO;
 import com.mh.common.core.domain.entity.ChillersEntity;
 import com.mh.common.core.page.TableDataInfo;
 import com.mh.system.service.device.ICollectionParamsManageService;
+import com.mh.system.service.device.IDeviceLedgerService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -30,9 +31,12 @@ public class HotWaterMonitorController extends BaseController {
 
     private final ICollectionParamsManageService iCollectionParamsManageService;
 
+    private final IDeviceLedgerService deviceLedgerService;
+
     @Autowired
-    public HotWaterMonitorController(ICollectionParamsManageService iCollectionParamsManageService) {
+    public HotWaterMonitorController(ICollectionParamsManageService iCollectionParamsManageService, IDeviceLedgerService deviceLedgerService) {
         this.iCollectionParamsManageService = iCollectionParamsManageService;
+        this.deviceLedgerService = deviceLedgerService;
     }
 
     /**
@@ -89,4 +93,16 @@ public class HotWaterMonitorController extends BaseController {
         return getDataTable(list);
     }
 
+    /**
+     * 获取设备状态信息数据
+     * @param systemType
+     * @return
+     */
+    @GetMapping("/deviceState")
+    public TableDataInfo deviceState(@RequestParam("systemType") String systemType) {
+        startPage();
+        List<DeviceState> list = deviceLedgerService.deviceState(systemType);
+        return getDataTable(list);
+    }
+
 }

mh-admin/src/main/java/com/mh/web/controller/monitor/SteamBoilerMonitorController.java

@@ -0,0 +1,57 @@
+package com.mh.web.controller.monitor;
+
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.dto.DeviceMonitorDTO;
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.system.service.device.ICollectionParamsManageService;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 蒸汽热水锅炉监测
+ * @date 2025-09-12 09:36:33
+ */
+@RestController
+@RequestMapping("/device")
+public class SteamBoilerMonitorController extends BaseController {
+
+    private final ICollectionParamsManageService collectionParamsManageService;
+
+    public SteamBoilerMonitorController(ICollectionParamsManageService collectionParamsManageService) {
+        this.collectionParamsManageService = collectionParamsManageService;
+    }
+
+    /**
+     * 获取 steamBoiler 列表
+     * @param systemType 3
+     * @param type 0：代表查询动画界面数据，1：代表查询模拟量监测数据，2：代表查询继电器数据，3：查询端口输入数据，4：代表查询报警数据
+     * @return
+     */
+    @RequestMapping("/steamBoiler/list")
+    public TableDataInfo list(@RequestParam(name = "systemType") String systemType,
+                              @RequestParam(name = "type") String type) {
+        List<CollectionParamsManage> list = collectionParamsManageService.selectSteamBoilerListByParams(systemType, type);
+        return getDataTable(list);
+    }
+
+    /**
+     * 获取 热水锅炉 列表
+     * @param systemType 3
+     * @param type 0：代表查询动画界面数据
+     * @return
+     */
+    @RequestMapping("/hotWaterBoiler/list")
+    public TableDataInfo hotWaterBoilerList(@RequestParam(name = "systemType") String systemType,
+                              @RequestParam(name = "type", required = false, defaultValue = "0") String type) {
+        List<DeviceMonitorDTO> list = collectionParamsManageService.selectHotWaterBoilerListByParams(systemType, type, "13");
+        return getDataTable(list);
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/report/ReportHeatingController.java

@@ -0,0 +1,96 @@
+package com.mh.web.controller.report;
+
+import com.alibaba.excel.EasyExcel;
+import com.github.pagehelper.PageHelper;
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.AjaxResult;
+import com.mh.common.core.domain.dto.ReportHeatingRunParamDTO;
+import com.mh.common.core.domain.dto.ReportSteamRunParamDTO;
+import com.mh.common.core.domain.entity.ReportHeatingRunParamHis;
+import com.mh.common.core.domain.entity.ReportSteamRunParamHis;
+import com.mh.common.core.page.PageDomain;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.common.core.page.TableSupport;
+import com.mh.common.utils.file.handle.ExcelFillCellMergeHandler;
+import com.mh.common.utils.file.handle.ReportSysParamHandler;
+import com.mh.common.utils.file.handle.RowHeightStyleHandler;
+import com.mh.common.utils.sql.SqlUtil;
+import com.mh.system.service.report.IReportHeatingService;
+import com.mh.system.service.report.IReportSteamService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project eemcs
+ * @description 采暖系统运行参数报表
+ * @date 2024-05-30 08:45:57
+ */
+@RestController
+@RequestMapping("/reportHeating")
+@Slf4j
+public class ReportHeatingController extends BaseController {
+
+    private final IReportHeatingService reportHeatingService;
+
+    private ReportHeatingController(IReportHeatingService reportHeatingService) {
+        this.reportHeatingService = reportHeatingService;
+    }
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody ReportHeatingRunParamHis reportHeatingRunParamHis) {
+        if (reportHeatingRunParamHis.getPageNum() != 0) {
+            PageHelper.startPage(reportHeatingRunParamHis.getPageNum(), reportHeatingRunParamHis.getPageSize());
+        }
+        List<ReportHeatingRunParamHis> list = reportHeatingService.selectHeatingList(reportHeatingRunParamHis);
+        return getDataTable(list);
+    }
+
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody ReportHeatingRunParamHis reportHeatingRunParamHis) {
+        return toAjax(reportHeatingService.updateRunParams(reportHeatingRunParamHis));
+    }
+
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody ReportHeatingRunParamHis reportSteamRunParamHis, HttpServletResponse response) {
+        // 文件名
+        try {
+            String fileName = "采暖系统运行记录表.xlsx";
+            String headTitle = "采暖系统运行记录表";
+            // 从数据库获取数据
+            List<ReportHeatingRunParamHis> list = reportHeatingService.selectHeatingList(reportSteamRunParamHis);
+            if (list != null) {
+                // 设置响应格式
+                response.setContentType("application/vdn.ms-excel;charset=utf-8");
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, StandardCharsets.UTF_8) + "\"");
+                response.setCharacterEncoding(String.valueOf(StandardCharsets.UTF_8));
+                ExcelFillCellMergeHandler mergePrevCol = new ExcelFillCellMergeHandler();
+                List<ReportHeatingRunParamDTO> infoDTOS = list.stream().map(info -> {
+                    ReportHeatingRunParamDTO deviceInfoDTO = new ReportHeatingRunParamDTO();
+                    BeanUtils.copyProperties(info, deviceInfoDTO);
+                    return deviceInfoDTO;
+                }).collect(Collectors.toList());
+
+                // 内容格式
+                EasyExcel.write(response.getOutputStream(), ReportHeatingRunParamDTO.class)
+                        .registerWriteHandler(new ReportSysParamHandler(headTitle))
+                        .registerWriteHandler(mergePrevCol)
+                        .registerWriteHandler(new RowHeightStyleHandler())
+                        .sheet(fileName.replace(".xlsx", ""))
+                        .doWrite(infoDTOS);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("下载报表异常");
+        }
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/report/ReportHotWaterController.java

@@ -0,0 +1,144 @@
+package com.mh.web.controller.report;
+
+import com.alibaba.excel.EasyExcel;
+import com.github.pagehelper.PageHelper;
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.AjaxResult;
+import com.mh.common.core.domain.dto.BFloorReportHotWaterDTO;
+import com.mh.common.core.domain.dto.ThreeFloorReportHotWaterDTO;
+import com.mh.common.core.domain.entity.ReportHotWaterParamHis;
+import com.mh.common.core.domain.entity.ReportSysRunParamHis;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.common.utils.StringUtils;
+import com.mh.common.utils.file.handle.ExcelFillCellMergeHandler;
+import com.mh.common.utils.file.handle.ReportSysParamHandler;
+import com.mh.common.utils.file.handle.RowHeightStyleHandler;
+import com.mh.system.service.report.IReportHotWaterService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 热泵系统运行参数报表
+ * @date 2024-05-30 08:45:57
+ */
+@RestController
+@RequestMapping("/reportHotWater")
+@Slf4j
+public class ReportHotWaterController extends BaseController {
+
+    private final IReportHotWaterService reportHotWaterService;
+
+    private ReportHotWaterController(IReportHotWaterService reportHotWaterService) {
+        this.reportHotWaterService = reportHotWaterService;
+    }
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis)
+    {
+        if (reportHotWaterParamHis.getPageNum() != 0) {
+            PageHelper.startPage(reportHotWaterParamHis.getPageNum(), reportHotWaterParamHis.getPageSize());
+        }
+        List<ReportHotWaterParamHis> list = reportHotWaterService.selectList(reportHotWaterParamHis);
+        return getDataTable(list);
+    }
+
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis)
+    {
+        return toAjax(reportHotWaterService.updateRunParams(reportHotWaterParamHis));
+    }
+
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody ReportHotWaterParamHis reportHotWaterParamHis, HttpServletResponse response) {
+        // 文件名
+        try {
+            String fileName =  "热水热泵运行记录表.xlsx";
+            String floorId = reportHotWaterParamHis.getFloorId();
+            String headTitle = "热水热泵运行记录表";
+            if (!StringUtils.isBlank(floorId)) {
+                if (floorId.contains("-1楼")) {
+                    fileName = "-1楼热水热泵运行记录表.xlsx";
+                    headTitle = "-1楼热水热泵运行记录表";
+                } else {
+                    fileName = "3楼热水热泵运行记录表.xlsx";
+                    headTitle = "3楼热水热泵运行记录表";
+                }
+            }
+            // 从数据库获取数据
+            List<ReportHotWaterParamHis> list = reportHotWaterService.selectList(reportHotWaterParamHis);
+            if (list != null) {
+                // 设置响应格式
+                response.setContentType("application/vdn.ms-excel;charset=utf-8");
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
+                response.setCharacterEncoding("UTF-8");
+                ExcelFillCellMergeHandler mergePrevCol = new ExcelFillCellMergeHandler();
+                int headSize = 3;
+                if (floorId.contains("-1楼")) {
+                    List<BFloorReportHotWaterDTO> infoDTOS = list.stream().map(info -> {
+                        BFloorReportHotWaterDTO deviceInfoDTO = new BFloorReportHotWaterDTO();
+                        BeanUtils.copyProperties(info, deviceInfoDTO);
+                        // 单独处理启停和运行状态
+                        deviceInfoDTO.setStatusRunHotPumpOneStr(info.getStatusRunHotPumpOne() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpOneStr(info.getStatusSwitchHotPumpOne() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunHotPumpTwoStr(info.getStatusRunHotPumpTwo() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpTwoStr(info.getStatusSwitchHotPumpTwo() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunSupplyPumpOneStr(info.getStatusRunSupplyPumpOne() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpTwoStr(info.getStatusRunSupplyPumpTwo() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpThreeStr(info.getStatusRunSupplyPumpThree() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpFourStr(info.getStatusRunSupplyPumpFour() == 1 ? "运行" : "不运行");
+                        return deviceInfoDTO;
+                    }).collect(Collectors.toList());
+
+                    // 内容格式
+                    EasyExcel.write(response.getOutputStream(), BFloorReportHotWaterDTO.class)
+                            .registerWriteHandler(new ReportSysParamHandler(headTitle))
+                            .registerWriteHandler(mergePrevCol)
+                            .registerWriteHandler(new RowHeightStyleHandler())
+                            .sheet(fileName.replace(".xlsx", ""))
+                            .doWrite(infoDTOS);
+                } else {
+                    List<ThreeFloorReportHotWaterDTO> infoDTOS = list.stream().map(info -> {
+                        ThreeFloorReportHotWaterDTO deviceInfoDTO = new ThreeFloorReportHotWaterDTO();
+                        BeanUtils.copyProperties(info, deviceInfoDTO);
+                        // 单独处理启停和运行状态
+                        deviceInfoDTO.setStatusRunHotPumpOneStr(info.getStatusRunHotPumpOne() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpOneStr(info.getStatusSwitchHotPumpOne() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunHotPumpTwoStr(info.getStatusRunHotPumpTwo() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpTwoStr(info.getStatusSwitchHotPumpTwo() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunHotPumpThreeStr(info.getStatusRunHotPumpThree() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpThreeStr(info.getStatusSwitchHotPumpThree() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunHotPumpFourStr(info.getStatusRunHotPumpFour() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusSwitchHotPumpFourStr(info.getStatusSwitchHotPumpFour() == 1 ? "开机" : "关机");
+                        deviceInfoDTO.setStatusRunSupplyPumpOneStr(info.getStatusRunSupplyPumpOne() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpTwoStr(info.getStatusRunSupplyPumpTwo() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpThreeStr(info.getStatusRunSupplyPumpThree() == 1 ? "运行" : "不运行");
+                        deviceInfoDTO.setStatusRunSupplyPumpFourStr(info.getStatusRunSupplyPumpFour() == 1 ? "运行" : "不运行");
+                        return deviceInfoDTO;
+                    }).collect(Collectors.toList());
+
+                    // 内容格式
+                    EasyExcel.write(response.getOutputStream(), ThreeFloorReportHotWaterDTO.class)
+                            .registerWriteHandler(new ReportSysParamHandler(headTitle))
+                            .registerWriteHandler(mergePrevCol)
+                            .registerWriteHandler(new RowHeightStyleHandler())
+                            .sheet(fileName.replace(".xlsx", ""))
+                            .doWrite(infoDTOS);
+                }
+
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("下载报表异常");
+        }
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/report/ReportMeterReadingsController.java

@@ -0,0 +1,131 @@
+package com.mh.web.controller.report;
+
+import com.alibaba.excel.EasyExcel;
+import com.alibaba.excel.ExcelWriter;
+import com.alibaba.excel.write.metadata.WriteSheet;
+import com.alibaba.excel.write.metadata.fill.FillWrapper;
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.dto.WeatherDataDTO;
+import com.mh.common.core.domain.entity.ReportMeterReadingsHis;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.common.utils.DateUtils;
+import com.mh.system.service.device.ICoolingSystemMonitorService;
+import com.mh.system.service.report.IMeterReadingsHisService;
+import jakarta.servlet.http.HttpServletResponse;
+import org.apache.poi.ss.usermodel.*;
+import org.springframework.core.io.ClassPathResource;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.ByteArrayOutputStream;
+import java.io.File;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URLEncoder;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 每日抄表记录查询
+ * @date 2025-10-21 16:04:09
+ */
+@RestController
+@RequestMapping("/reportMeterReadings")
+public class ReportMeterReadingsController extends BaseController {
+
+    private final IMeterReadingsHisService meterReadingsHisService;
+
+    private final ICoolingSystemMonitorService coolingSystemMonitorService;
+
+    public ReportMeterReadingsController(IMeterReadingsHisService meterReadingsHisService, ICoolingSystemMonitorService coolingSystemMonitorService) {
+        this.meterReadingsHisService = meterReadingsHisService;
+        this.coolingSystemMonitorService = coolingSystemMonitorService;
+    }
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody ReportMeterReadingsHis todayTimestamp)
+    {
+        List<ReportMeterReadingsHis> list = meterReadingsHisService.selectList(todayTimestamp);
+        return getDataTable(list);
+    }
+
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody ReportMeterReadingsHis reportMeterReadingsHis, HttpServletResponse response) {
+        // 文件名
+        try {
+            String fileName =  "节能岛改造每日能耗统计表"+ DateUtils.dateToString(reportMeterReadingsHis.getTodayTimestamp(), "yyyyMMdd")+".xlsx";
+            // 读取资源文件
+            ClassPathResource classPathResource = new ClassPathResource(File.separator + "节能岛改造每日能耗统计表.xlsx");
+            // 获取数据
+            List<ReportMeterReadingsHis> list = meterReadingsHisService.selectList(reportMeterReadingsHis);
+            // 组织并填充模板数据
+            ByteArrayOutputStream byteArrayOutputStream = compositeFill(classPathResource.getInputStream(), reportMeterReadingsHis.getTodayTimestamp(), list);
+
+            // 设置响应格式
+            response.setContentType("application/vdn.ms-excel;charset=utf-8");
+            response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
+            response.setCharacterEncoding("UTF-8");
+
+            // 将文件内容写入响应输出流，浏览器可以直接触发下载
+            response.getOutputStream().write(byteArrayOutputStream.toByteArray());
+            response.getOutputStream().flush();
+        } catch (IOException e) {
+            throw new RuntimeException("下载报表异常");
+        }
+    }
+
+    private ByteArrayOutputStream compositeFill(InputStream templateInputStream, Date todayTimestamp, List<ReportMeterReadingsHis> list) throws IOException {
+        ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
+        // 使用EasyExcel的模板填充功能，在这里指定合并单元格，这里应该是easyExcel的bug，第一列无法合并，其他列都可以，所以第一列单独用原生poi进行合并
+        try (ExcelWriter excelWriter = EasyExcel.write(byteArrayOutputStream).withTemplate(templateInputStream)
+                .build()) {
+            WriteSheet writeSheet = EasyExcel.writerSheet().build();
+            // 防止上面两个表格覆盖下面两个表格，每一行都采用新增一行的方式
+//            FillConfig fillConfig = FillConfig.builder().forceNewRow(Boolean.TRUE).build();
+            // 使用模板填充，必须使用FillWrapper，这是官方要求，并且每行两个表格只能有一个表格设置增行，否则会存在一个表格有空行，这里是造的测试数据
+            for (int i = 0; i < list.size(); i++) {
+                excelWriter.fill(new FillWrapper("data"+(i+1), List.of(list.get(i))), writeSheet);
+            }
+
+            // 设置表格外的填充数据，例如总计、日期等数据
+            HashMap<String, Object> map = new HashMap<>();
+
+            List<WeatherDataDTO> weatherTemp = (List<WeatherDataDTO>) coolingSystemMonitorService.getWeatherTemp(DateUtils.dateToString(todayTimestamp, "yyyy-MM-dd"), DateUtils.dateToString(todayTimestamp, "yyyy-MM-dd"));
+            if (!weatherTemp.isEmpty()) {
+                String maxTemp = weatherTemp.getFirst().getMaxTemp();
+                map.put("maxTemp", maxTemp);
+                String minTemp = weatherTemp.getFirst().getMinTemp();
+                map.put("minTemp", minTemp);
+            }
+
+            map.put("date", DateUtils.dateToString(todayTimestamp, "yyyy年MM月dd日"));
+            excelWriter.fill(map, writeSheet);
+
+            // 2. 获取 Workbook 并计算公式
+            Workbook workbook = excelWriter.writeContext()
+                    .writeWorkbookHolder()
+                    .getWorkbook();
+            FormulaEvaluator evaluator = workbook.getCreationHelper().createFormulaEvaluator();
+            for (Row row : workbook.getSheetAt(0)) {
+                for (Cell cell : row) {
+                    if (cell.getCellType() == CellType.FORMULA) {
+                        evaluator.evaluateFormulaCell(cell); // 单元格级计算
+                        // evaluator.evaluateAll(); // 全工作簿计算（推荐）
+                    }
+                }
+            }
+
+            // 3. 强制刷新计算结果
+            workbook.setForceFormulaRecalculation(true);
+            excelWriter.finish();
+
+        }
+
+        // 合并单元格，由于easyExcel自带的OnceAbsoluteMergeStrategy合并策略bug，这里需要用poi合并一下
+        return byteArrayOutputStream;
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/report/ReportSteamController.java

@@ -0,0 +1,156 @@
+package com.mh.web.controller.report;
+
+import com.alibaba.excel.EasyExcel;
+import com.github.pagehelper.PageHelper;
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.AjaxResult;
+import com.mh.common.core.domain.dto.ReportSteamRunParamDTO;
+import com.mh.common.core.domain.dto.ThreeFloorReportHotWaterDTO;
+import com.mh.common.core.domain.entity.ReportSteamRunParamHis;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.common.utils.file.handle.ExcelFillCellMergeHandler;
+import com.mh.common.utils.file.handle.ReportSysParamHandler;
+import com.mh.common.utils.file.handle.RowHeightStyleHandler;
+import com.mh.system.service.report.IReportSteamService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project eemcs
+ * @description 蒸汽系统运行参数报表
+ * @date 2024-05-30 08:45:57
+ */
+@RestController
+@RequestMapping("/reportSteam")
+@Slf4j
+public class ReportSteamController extends BaseController {
+
+    private final IReportSteamService reportSteamService;
+
+    private ReportSteamController(IReportSteamService reportSteamService) {
+        this.reportSteamService = reportSteamService;
+    }
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis) {
+        if (reportSteamRunParamHis.getPageNum() != 0) {
+            PageHelper.startPage(reportSteamRunParamHis.getPageNum(), reportSteamRunParamHis.getPageSize());
+        }
+        List<ReportSteamRunParamHis> list = reportSteamService.selectList(reportSteamRunParamHis);
+        return getDataTable(list);
+    }
+
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis) {
+        return toAjax(reportSteamService.updateRunParams(reportSteamRunParamHis));
+    }
+
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody ReportSteamRunParamHis reportSteamRunParamHis, HttpServletResponse response) {
+        // 文件名
+        try {
+            String fileName = "蒸汽机运行记录表.xlsx";
+            String headTitle = "蒸汽机运行记录表";
+            // 从数据库获取数据
+            List<ReportSteamRunParamHis> list = reportSteamService.selectList(reportSteamRunParamHis);
+            if (list != null) {
+                // 设置响应格式
+                response.setContentType("application/vdn.ms-excel;charset=utf-8");
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
+                response.setCharacterEncoding("UTF-8");
+                ExcelFillCellMergeHandler mergePrevCol = new ExcelFillCellMergeHandler();
+                List<ReportSteamRunParamDTO> infoDTOS = list.stream().map(info -> {
+                    ReportSteamRunParamDTO deviceInfoDTO = new ReportSteamRunParamDTO();
+                    BeanUtils.copyProperties(info, deviceInfoDTO);
+                    // 单独处理运行状态
+//                    0：上电延时
+//                    1：关机
+//                    2：待机
+//                    3：前清扫
+//                    4：预点火
+//                    5：点火
+//                    6：传火
+//                    7：工作
+//                    8：后清扫
+//                    9：故障
+//                    10：小火保持
+//                    11：自检
+//                    12：检漏
+//                    13：开点火器
+//                    14：启动等待中
+                    switch (info.getCurStatus()) {
+                        case 0:
+                            deviceInfoDTO.setCurStatus("上电延时");
+                            break;
+                        case 1:
+                            deviceInfoDTO.setCurStatus("关机");
+                            break;
+                        case 2:
+                            deviceInfoDTO.setCurStatus("待机");
+                            break;
+                        case 3:
+                            deviceInfoDTO.setCurStatus("前清扫");
+                            break;
+                        case 4:
+                            deviceInfoDTO.setCurStatus("预点火");
+                            break;
+                        case 5:
+                            deviceInfoDTO.setCurStatus("点火");
+                            break;
+                        case 6:
+                            deviceInfoDTO.setCurStatus("传火");
+                            break;
+                        case 7:
+                            deviceInfoDTO.setCurStatus("工作");
+                            break;
+                        case 8:
+                            deviceInfoDTO.setCurStatus("后清扫");
+                            break;
+                        case 9:
+                            deviceInfoDTO.setCurStatus("故障");
+                            break;
+                        case 10:
+                            deviceInfoDTO.setCurStatus("小火保持");
+                            break;
+                        case 11:
+                            deviceInfoDTO.setCurStatus("自检");
+                            break;
+                        case 12:
+                            deviceInfoDTO.setCurStatus("检漏");
+                            break;
+                        case 13:
+                            deviceInfoDTO.setCurStatus("开点火器");
+                            break;
+                        case 14:
+                            deviceInfoDTO.setCurStatus("启动等待中");
+                            break;
+                        default:
+                            deviceInfoDTO.setCurStatus("未知");
+                            break;
+                    }
+                    return deviceInfoDTO;
+                }).collect(Collectors.toList());
+
+                // 内容格式
+                EasyExcel.write(response.getOutputStream(), ReportSteamRunParamDTO.class)
+                        .registerWriteHandler(new ReportSysParamHandler(headTitle))
+                        .registerWriteHandler(mergePrevCol)
+                        .registerWriteHandler(new RowHeightStyleHandler())
+                        .sheet(fileName.replace(".xlsx", ""))
+                        .doWrite(infoDTOS);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("下载报表异常");
+        }
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/report/ReportSysController.java

@@ -0,0 +1,100 @@
+package com.mh.web.controller.report;
+
+import com.alibaba.excel.EasyExcel;
+import com.github.pagehelper.PageHelper;
+import com.mh.common.core.controller.BaseController;
+import com.mh.common.core.domain.AjaxResult;
+import com.mh.common.core.domain.dto.MaglevReportSysParamDTO;
+import com.mh.common.core.domain.entity.ReportSysRunParamHis;
+import com.mh.common.core.page.TableDataInfo;
+import com.mh.common.utils.StringUtils;
+import com.mh.common.utils.file.handle.ExcelFillCellMergeHandler;
+import com.mh.common.utils.file.handle.ReportSysParamHandler;
+import com.mh.common.utils.file.handle.RowHeightStyleHandler;
+import com.mh.system.service.report.IReportSysService;
+import jakarta.servlet.http.HttpServletResponse;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
+import org.springframework.web.bind.annotation.*;
+
+import java.io.IOException;
+import java.net.URLEncoder;
+import java.util.List;
+import java.util.stream.Collectors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 系统参数报表
+ * @date 2024-05-30 08:45:57
+ */
+@RestController
+@RequestMapping("/reportSys")
+@Slf4j
+public class ReportSysController extends BaseController {
+
+    private final IReportSysService reportSysService;
+
+    private ReportSysController(IReportSysService reportSysService) {
+        this.reportSysService = reportSysService;
+    }
+
+    @PostMapping("/list")
+    public TableDataInfo list(@RequestBody ReportSysRunParamHis reportSysRunParamHis)
+    {
+        if (reportSysRunParamHis.getPageNum() != 0) {
+            PageHelper.startPage(reportSysRunParamHis.getPageNum(), reportSysRunParamHis.getPageSize());
+        }
+        List<ReportSysRunParamHis> list = reportSysService.selectList(reportSysRunParamHis);
+        return getDataTable(list);
+    }
+
+    @PutMapping("/edit")
+    public AjaxResult edit(@RequestBody ReportSysRunParamHis reportSysRunParamHis)
+    {
+        return toAjax(reportSysService.updateSysRunParams(reportSysRunParamHis));
+    }
+
+    @PostMapping("/export")
+    public void exportExcel(@RequestBody ReportSysRunParamHis reportSysRunParamHis, HttpServletResponse response) {
+        // 文件名
+        try {
+            String fileName =  "系统参数运行日志报表.xlsx";
+            String deviceNum = (String) reportSysRunParamHis.getParams().get("deviceNum");
+            if (!StringUtils.isBlank(deviceNum)) {
+                if ("2".equals(deviceNum)) {
+                    fileName = "变频螺杆主机系统参数报表.xlsx";
+                } else {
+                    fileName = "磁悬浮主机系统参数报表.xlsx";
+                }
+            }
+            // 从数据库获取数据
+            List<ReportSysRunParamHis> list = reportSysService.selectList(reportSysRunParamHis);
+            if (list != null) {
+                // 设置响应格式
+                response.setContentType("application/vdn.ms-excel;charset=utf-8");
+                response.setHeader("Content-Disposition", "attachment; filename=\"" + URLEncoder.encode(fileName, "UTF-8") + "\"");
+                response.setCharacterEncoding("UTF-8");
+                ExcelFillCellMergeHandler mergePrevCol = new ExcelFillCellMergeHandler();
+                int headSize = 3;
+                List<MaglevReportSysParamDTO> infoDTOS = list.stream().map(info -> {
+                    MaglevReportSysParamDTO deviceInfoDTO = new MaglevReportSysParamDTO();
+                    BeanUtils.copyProperties(info, deviceInfoDTO);
+                    return deviceInfoDTO;
+                }).collect(Collectors.toList());
+
+                // 内容格式
+                EasyExcel.write(response.getOutputStream(), MaglevReportSysParamDTO.class)
+                        .registerWriteHandler(new ReportSysParamHandler("磁悬浮水冷冷水机组数据运行记录表"))
+                        .registerWriteHandler(mergePrevCol)
+                        .registerWriteHandler(new RowHeightStyleHandler())
+                        .sheet(fileName.replace(".xlsx", ""))
+                        .doWrite(infoDTOS);
+            }
+        } catch (IOException e) {
+            throw new RuntimeException("下载报表异常");
+        }
+    }
+
+}

mh-admin/src/main/java/com/mh/web/controller/space/BuildingInfoController.java

@@ -6,6 +6,7 @@ import com.mh.common.core.domain.AjaxResult;
 import com.mh.common.core.domain.entity.BuildingInfo;
 import com.mh.common.core.page.TableDataInfo;
 import com.mh.common.enums.BusinessType;
+import com.mh.system.service.energy.IEnergyQueryService;
 import com.mh.system.service.space.IBuildingInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
@@ -13,6 +14,7 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * @author LJF
@@ -28,6 +30,9 @@ public class BuildingInfoController extends BaseController {
     @Autowired
     private IBuildingInfoService buildingInfoService;
 
+    @Autowired
+    private IEnergyQueryService energyQueryService;
+
     /**
      * 获取楼栋管理列表内容数据
      */
@@ -85,4 +90,17 @@ public class BuildingInfoController extends BaseController {
         return toAjax(buildingInfoService.deleteBuildingInfoByIds(buildingIds));
     }
 
+    /**
+     * 获取楼栋管理列表内容数据
+     */
+    @GetMapping("/hot_list")
+    public TableDataInfo hotWaterList()
+    {
+        List<Map<String, Object>> list = energyQueryService.queryFloorInfo();
+        // 在当前list首个坐标加个值
+        list.addFirst(Map.of("id", "所有", "building_name", "所有"));
+        return getDataTable(list);
+    }
+
+
 }

mh-admin/src/main/java/com/mh/web/controller/space/SpaceController.java

@@ -29,4 +29,9 @@ public class SpaceController extends BaseController {
         return AjaxResult.success(houseInfoService.buildTree(systemType));
     }
 
+    @GetMapping("/floorTree")
+    public AjaxResult floorTree(@RequestParam(value = "systemType", required = false) String systemType) {
+        return AjaxResult.success(houseInfoService.buildFloorTree(systemType));
+    }
+
 }

mh-admin/src/main/java/com/mh/web/controller/system/SysLoginController.java

@@ -92,6 +92,6 @@ public class SysLoginController
     {
         Long userId = SecurityUtils.getUserId();
         List<SysMenu> menus = menuService.selectMenuTreeByUserId(userId);
-        return AjaxResult.success(menuService.buildMenus(menus));
+        return AjaxResult.success(menuService.buildMenus(menus,userId));
     }
 }

mh-admin/src/main/resources/application-dev.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 mh:
   # 名称
-  name: MH
+  name: mz
   # 版本
   version: 1.0.0
   # 版权年份
@@ -98,8 +98,8 @@ spring:
       # 主库数据源
       master:
         #添加allowMultiQueries=true 在批量更新时才不会出错
-        url: jdbc:postgresql://127.0.0.1:5432/eemcs_hw_dev
+        url: jdbc:postgresql://127.0.0.1:5432/eemcs
-#        url: jdbc:postgresql://127.0.0.1:5432/eemcs
+#        url: jdbc:postgresql://106.55.173.225:5505/eemcs
         username: postgres
         password: mh@803
       # 从库数据源

mh-admin/src/main/resources/application-prod.yml

@@ -1,7 +1,7 @@
 # 项目相关配置
 mh:
   # 名称
-  name: hw
+  name: mz
   # 版本
   version: 1.0.0
   # 版权年份
@@ -16,7 +16,7 @@ mh:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为8080
-  port: 8090
+  port: 8091
   servlet:
     # 应用的访问路径
     context-path: /
@@ -63,7 +63,7 @@ spring:
       # 端口，默认为6379
       port: 6379
       # 数据库索引
-      database: 0
+      database: 14
       # 密码
       password:
       # 连接超时时间
@@ -82,9 +82,9 @@ spring:
   rabbitmq:
     host: 127.0.0.1
     port: 5672
-    username: eemcs
+    username: eemcs_mz
     password: mh@803
-    virtual-host: /eemcs
+    virtual-host: /eemcs_mz
     listener:
       direct:
         prefetch: 2
@@ -98,7 +98,7 @@ spring:
       # 主库数据源
       master:
         #添加allowMultiQueries=true 在批量更新时才不会出错
-        url: jdbc:postgresql://127.0.0.1:5505/eemcs_hw
+        url: jdbc:postgresql://127.0.0.1:5505/eemcs
 #        url: jdbc:postgresql://127.0.0.1:5505/eemcs
         username: postgres
         password: mhtech@803
@@ -195,7 +195,7 @@ mqttSpring:
     port: 1883
     username: sa
     password: sa123
-    client-id: eemcs_hw_mqtt_pro
+    client-id: eemcs_mz_mqtt_pro
     # If the protocol is ws/wss, this value is required.
     path:
     # Topics that need to be subscribed when initially connecting to mqtt, multiple topics are divided by ",".

mh-admin/src/main/resources/logback.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <configuration>
     <!-- 日志存放路径 -->
-	<property name="log.path" value="/home/mh/hw/logs" />
+	<property name="log.path" value="/home/mh/mz/logs" />
     <!-- 日志输出格式 -->
 	<property name="log.pattern" value="%d{HH:mm:ss.SSS} [%thread] %-5level %logger{20} - [%method,%line] - %msg%n" />
 
@@ -13,27 +13,27 @@
 	</appender>
 	
 	<!-- 系统日志输出 -->
-	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">
+<!--	<appender name="file_info" class="ch.qos.logback.core.rolling.RollingFileAppender">-->
-	    <file>${log.path}/sys-info.log</file>
+<!--	    <file>${log.path}/sys-info.log</file>-->
-        <!-- 循环政策：基于时间创建日志文件 -->
+<!--        &lt;!&ndash; 循环政策：基于时间创建日志文件 &ndash;&gt;-->
-		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
+<!--		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">-->
-            <!-- 日志文件名格式 -->
+<!--            &lt;!&ndash; 日志文件名格式 &ndash;&gt;-->
-			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>
+<!--			<fileNamePattern>${log.path}/sys-info.%d{yyyy-MM-dd}.log</fileNamePattern>-->
-			<!-- 日志最大的历史 60天 -->
+<!--			&lt;!&ndash; 日志最大的历史 60天 &ndash;&gt;-->
-			<maxHistory>1</maxHistory>
+<!--			<maxHistory>1</maxHistory>-->
-		</rollingPolicy>
+<!--		</rollingPolicy>-->
-		<encoder>
+<!--		<encoder>-->
-			<pattern>${log.pattern}</pattern>
+<!--			<pattern>${log.pattern}</pattern>-->
-		</encoder>
+<!--		</encoder>-->
-		<filter class="ch.qos.logback.classic.filter.LevelFilter">
+<!--		<filter class="ch.qos.logback.classic.filter.LevelFilter">-->
-            <!-- 过滤的级别 -->
+<!--            &lt;!&ndash; 过滤的级别 &ndash;&gt;-->
-            <level>INFO</level>
+<!--            <level>INFO</level>-->
-            <!-- 匹配时的操作：接收（记录） -->
+<!--            &lt;!&ndash; 匹配时的操作：接收（记录） &ndash;&gt;-->
-            <onMatch>ACCEPT</onMatch>
+<!--            <onMatch>ACCEPT</onMatch>-->
-            <!-- 不匹配时的操作：拒绝（不记录） -->
+<!--            &lt;!&ndash; 不匹配时的操作：拒绝（不记录） &ndash;&gt;-->
-            <onMismatch>DENY</onMismatch>
+<!--            <onMismatch>DENY</onMismatch>-->
-        </filter>
+<!--        </filter>-->
-	</appender>
+<!--	</appender>-->
 	
 	<appender name="file_error" class="ch.qos.logback.core.rolling.RollingFileAppender">
 	    <file>${log.path}/sys-error.log</file>
@@ -82,7 +82,7 @@
 	
 	<!--系统操作日志-->
     <root level="info">
-        <appender-ref ref="file_info" />
+<!--        <appender-ref ref="file_info" />-->
         <appender-ref ref="file_error" />
     </root>
 	

mh-admin/src/test/java/com/mh/MHApplicationTest.java

@@ -2,6 +2,7 @@ package com.mh;
 
 import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.mh.common.core.domain.dto.ProProfileDTO;
 import com.mh.common.core.domain.entity.DeviceReport;
 import com.mh.common.core.domain.entity.SysParams;
 import com.mh.common.core.domain.entity.SysUser;
@@ -10,10 +11,15 @@ import com.mh.common.utils.DateUtils;
 import com.mh.common.utils.StringUtils;
 import com.mh.quartz.task.DealDataTask;
 import com.mh.quartz.task.GetWeatherDataTask;
+import com.mh.quartz.task.HotWaterTask;
 import com.mh.system.mapper.device.DataProcessMapper;
 import com.mh.system.service.ISysParamsService;
 import com.mh.system.service.ISysUserService;
 import com.mh.system.service.device.IDeviceQrManageService;
+import com.mh.system.service.operation.IAlarmRecordsService;
+import com.mh.system.service.overview.IProOverviewService;
+import com.mh.system.service.report.IMeterReadingsHisService;
+import com.mh.system.service.report.IReportHotWaterService;
 import jakarta.annotation.Resource;
 import org.checkerframework.checker.units.qual.A;
 import org.junit.jupiter.api.Test;
@@ -40,6 +46,118 @@ public class MHApplicationTest {
     @Autowired
     private ISysUserService sysUserService;
 
+    @Autowired
+    private HotWaterTask hotWaterTask;
+
+    @Autowired
+    private IAlarmRecordsService alarmRecordsService;
+
+    @Autowired
+    private IMeterReadingsHisService meterReadingsHisService;
+
+    @Autowired
+    private IReportHotWaterService reportHotWaterService;
+
+    @Autowired
+    private IProOverviewService proOverviewService;
+
+    @Test
+    public void testHome() throws Exception {
+        // 开始计时
+        long startTime = System.currentTimeMillis();
+        List<ProProfileDTO> proProfile = proOverviewService.getProProfile();
+        System.out.println("耗时：" + (System.currentTimeMillis() - startTime) + "ms");
+    }
+
+    @Test
+    public void reportHotWater() {
+        reportHotWaterService.execProRunParamHis();
+    }
+
+    @Test
+    public void testExecProMeterReadingsHis() {
+        meterReadingsHisService.execProMeterReadingsHis("2025-10-22");
+    }
+
+    @Test
+    public void createAlarmTask() {
+        alarmRecordsService.insertOrUpdateAlarmRecord("e1a3034edw6a9b3a79a86332886b24896");
+    }
+
+    @Test
+    public void calcAnalysisData() {
+        for (int i = 9; i < 10; i++) {
+            hotWaterTask.calcAnalysisData("2025-07-0"+i);
+        }
+    }
+
+    @Test
+    public void testDate() {
+        Date date = new Date();
+        boolean sameDay = DateUtils.isSameDay(DateUtils.stringToDate("2025-09-24 00:00:00", "yyyy-MM-dd HH:mm:ss"), date);
+        System.out.println(sameDay);
+    }
+
+    @Test
+    public void calcEnergyData() {
+
+        for (int i = 1; i < 17; i++) {
+            // i < 10,则前面添加0
+            if (i < 10) {
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 00:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 01:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 02:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 03:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 04:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 05:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 06:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 07:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 08:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 09:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 10:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 11:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 12:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 13:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 14:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 15:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 16:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 17:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 18:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 19:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 20:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 21:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 22:00:00");
+                hotWaterTask.calcEnergyData("2025-10-0"+i+" 23:00:00");
+            } else {
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 00:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 01:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 02:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 03:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 04:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 05:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 06:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 07:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 08:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 09:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 10:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 11:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 12:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 13:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 14:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 15:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 16:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 17:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 18:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 19:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 20:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 21:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 22:00:00");
+                hotWaterTask.calcEnergyData("2025-10-" + i + " 23:00:00");
+            }
+        }
+
+    }
+
     @Test
     public void test() throws Exception {
         SysUser sysUser = sysUserService.selectUserById(1L);

mh-common/pom.xml

@@ -159,6 +159,12 @@
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.4.8-jre</version>
+            <scope>compile</scope>
+        </dependency>
 
         <!-- https://mvnrepository.com/artifact/com.github.binarywang/weixin-java-mp -->
         <dependency>

mh-common/src/main/java/com/mh/common/constant/Constants.java

@@ -80,6 +80,8 @@ public class Constants {
      */
     public static final String SUPER_ADMIN = "mhtech";
 
+    public static final String SUPER_ADMIN_TWO = "18675333710";
+
     /**
      * 角色权限分隔符
      */
@@ -183,10 +185,12 @@ public class Constants {
     public static final String CLOSE_HOST = "close_host_device_id";     // 关闭主机的设备id
     public static final String OPEN_VALVE = "open_valve_device_id";     // 开启蝶阀的设备id
     public static final String CHILLERS = "chillers";
+    public static final String BOILER = "boiler";                       // 锅炉
     public static final String OTHER = "other";
     public static final String DEVICE = "devices";
     public static final String CHILLERS_TYPE = "0";                     // 主机类型设备
     public static final String OTHER_TYPE = "1";                        // 其他设备
+    public static final String BOILER_TYPE = "12";                        // 锅炉设备
     public static boolean CONTROL_WEB_FLAG = false;
     public static boolean SEND_STATUS = false;                          // 指令发送状态
     public static boolean FLAG = false;

mh-common/src/main/java/com/mh/common/constant/EnergyType.java

@@ -0,0 +1,25 @@
+package com.mh.common.constant;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description
+ * @date 2025-06-18 16:32:56
+ */
+public enum EnergyType {
+    HOUR("hour"),
+    DAY("day"),
+    MONTH("month"),
+    YEAR("year");
+
+    private final String code;
+
+    EnergyType(String code) {
+        this.code = code;
+    }
+
+    public String getCode() {
+        return code;
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/BFloorReportHotWaterDTO.java

@@ -0,0 +1,170 @@
+package com.mh.common.core.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+//import java.math.String;
+
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 三楼热水系统参数报表
+ * @date 2024-05-30 11:00:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 14)
+@ContentFontStyle(fontHeightInPoints = 13)
+@ContentRowHeight(25)
+@ContentStyle(
+        horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+        borderBottom = BorderStyleEnum.THIN,
+        borderLeft = BorderStyleEnum.THIN,
+        borderRight = BorderStyleEnum.THIN,
+        borderTop = BorderStyleEnum.THIN
+)
+@ColumnWidth(10)
+public class BFloorReportHotWaterDTO {
+
+    /**
+     * 当前时间
+     */
+    @ColumnWidth(17)
+    @ExcelProperty(value = {"${deviceType}", "时间", "时间"}, index = 0)
+    private String curTime;
+
+//    /**
+//     * 班次
+//     */
+//    @ColumnWidth(10)
+//    @ExcelProperty(value = {"${deviceType}", "班次", "班次"}, index = 1)
+//    private String classes;
+
+    /**
+     * 设定温度℃
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设定温度℃"}, index = 1)
+    private BigDecimal tempSetHotPumpOne;
+
+    /**
+     * 实际温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "实际温度℃"}, index = 2)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpOne;
+
+    /**
+     * 设备开关机
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设备开关机"}, index = 3)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpOneStr;
+
+    /**
+     * 设备运行状态
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设备运行状态"}, index = 4)
+    @ColumnWidth(10)
+    private String statusRunHotPumpOneStr;
+
+    /**
+     * 设定温度℃
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设定温度℃"}, index = 5)
+    private BigDecimal tempSetHotPumpTwo;
+
+    /**
+     * 实际温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "实际温度℃"}, index = 6)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpTwo;
+
+    /**
+     * 设备开关机
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设备开关机"}, index = 7)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpTwoStr;
+
+    /**
+     * 设备运行状态
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设备运行状态"}, index = 8)
+    @ColumnWidth(10)
+    private String statusRunHotPumpTwoStr;
+
+    // 高区/裙楼设定压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "裙楼变频泵", "设定压力bar"}, index = 9)
+    @ColumnWidth(10)
+    private BigDecimal presSetSupplyPumpAreaOne;
+
+    // 高区/裙楼实际压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "裙楼变频泵", "实际压力bar"}, index = 10)
+    @ColumnWidth(10)
+    private BigDecimal presRealSupplyPumpAreaOne;
+
+    // 高区/裙楼1号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "裙楼变频泵", "1号泵运行状态"}, index = 11)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpOneStr;
+
+    // 高区/裙楼2号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "裙楼变频泵", "2号泵运行状态"}, index = 12)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpTwoStr;
+
+    // 中区/中厨设定压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "中厨变频泵", "设定压力bar"}, index = 13)
+    @ColumnWidth(10)
+    private BigDecimal presSetSupplyPumpAreaTwo;
+
+    // 中区/中厨实际压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "中厨变频泵", "实际压力bar"}, index = 14)
+    @ColumnWidth(10)
+    private BigDecimal presRealSupplyPumpAreaTwo;
+
+    // 中区/中厨1号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "中厨变频泵", "1号泵运行状态"}, index = 15)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpThreeStr;
+
+    // 中区/中厨2号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "中厨变频泵", "2号泵运行状态"}, index = 16)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpFourStr;
+
+    // 高区/裙楼液位（米）
+    @ExcelProperty(value = {"${deviceType}", "水箱液位", "裙楼液位%"}, index = 17)
+    @ColumnWidth(10)
+    private BigDecimal levelWaterTankOne;
+
+    // 中区/中厨液位（米）
+    @ExcelProperty(value = {"${deviceType}", "水箱液位", "中厨液位%"}, index = 18)
+    @ColumnWidth(10)
+    private BigDecimal levelWaterTankTwo;
+
+    // 巡查记录人
+    @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 19)
+    @ColumnWidth(20)
+    private String recorder;
+
+    // 备注信息
+    @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 20)
+    @ColumnWidth(20)
+    private String remark;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/CompreReportDTO.java

@@ -0,0 +1,74 @@
+package com.mh.common.core.domain.dto;
+
+import java.util.StringJoiner;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 综合系统能耗查询DTO
+ * @date 2025-10-09 10:17:26
+ */
+public class CompreReportDTO {
+
+    private String time;
+
+    private String electValue;
+
+    private String coldValue;
+
+    private String hotValue;
+
+    private String steamValue;
+
+    public String getTime() {
+        return time;
+    }
+
+    public void setTime(String time) {
+        this.time = time;
+    }
+
+    public String getElectValue() {
+        return electValue;
+    }
+
+    public void setElectValue(String electValue) {
+        this.electValue = electValue;
+    }
+
+    public String getColdValue() {
+        return coldValue;
+    }
+
+    public void setColdValue(String coldValue) {
+        this.coldValue = coldValue;
+    }
+
+    public String getHotValue() {
+        return hotValue;
+    }
+
+    public void setHotValue(String hotValue) {
+        this.hotValue = hotValue;
+    }
+
+    public String getSteamValue() {
+        return steamValue;
+    }
+
+    public void setSteamValue(String steamValue) {
+        this.steamValue = steamValue;
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", CompreReportDTO.class.getSimpleName() + "[", "]")
+                .add("time='" + time + "'")
+                .add("electValue='" + electValue + "'")
+                .add("coldValue='" + coldValue + "'")
+                .add("hotValue='" + hotValue + "'")
+                .add("steamValue='" + steamValue + "'")
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/DataResultDTO.java

@@ -0,0 +1,68 @@
+package com.mh.common.core.domain.dto;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+import java.util.Date;
+
+@Data
+public class DataResultDTO {
+
+    private Long id;
+
+    private String buildingId;
+
+    private String buildingName;
+
+    private String deviceNum;
+
+    private String deviceName;
+
+    private String deviceCode;
+
+    private String deviceType;
+
+    private BigDecimal lastValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date lastTime;
+
+    private double curValue;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curTime;
+
+    private BigDecimal usedValue;
+
+    private int ratio;
+
+    private BigDecimal calcValue;
+
+    private int grade;
+
+    private String registerAddr;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("id", id)
+                .append("buildingId", buildingId)
+                .append("buildingName", buildingName)
+                .append("deviceNum", deviceNum)
+                .append("deviceName", deviceName)
+                .append("deviceCode", deviceCode)
+                .append("deviceType", deviceType)
+                .append("lastValue", lastValue)
+                .append("lastTime", lastTime)
+                .append("curValue", curValue)
+                .append("curTime", curTime)
+                .append("usedValue", usedValue)
+                .append("ratio", ratio)
+                .append("calcValue", calcValue)
+                .append("grade", grade)
+                .append("registerAddr", registerAddr)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/HotWaterNowDataDTO.java

@@ -22,8 +22,10 @@ public class HotWaterNowDataDTO {
     private String waterTemp;     //水箱水温
     private String runState;      //运行状态
     private String isFault;       //是否故障
-    private String levelSet;      //水位设置
+    private String levelSet1;      //水位设置
-    private String waterLevel;    //实际水位
+    private String levelSet2;      //水位设置
+    private String waterLevel1;    //实际水位
+    private String waterLevel2;    //实际水位
     private String tankId;        //水箱编号
     private String tankName;      //水箱名称
     private String envTemp;       //环境温度
@@ -36,6 +38,14 @@ public class HotWaterNowDataDTO {
 
     private String freq2;               // 供水频率2
 
+    private String upWaterState3;       // 供水3泵状态
+
+    private String freq3;               // 供水频率3
+
+    private String upWaterState4;       // 供水4泵状态
+
+    private String freq4;               // 供水频率4
+
     private String useWaterState;      // 补水状态
 
     private String backWaterState;     // 回水状态

mh-common/src/main/java/com/mh/common/core/domain/dto/MaglevReportSysParamDTO.java

@@ -0,0 +1,284 @@
+package com.mh.common.core.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelIgnore;
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+//import java.math.String;
+
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 磁悬浮主机系统参数报表
+ * @date 2024-05-30 11:00:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 14)
+@ContentFontStyle(fontHeightInPoints = 13)
+@ContentRowHeight(25)
+@ContentStyle(
+        horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+        borderBottom = BorderStyleEnum.THIN,
+        borderLeft = BorderStyleEnum.THIN,
+        borderRight = BorderStyleEnum.THIN,
+        borderTop = BorderStyleEnum.THIN
+)
+@ColumnWidth(10)
+public class MaglevReportSysParamDTO {
+
+    /**
+     * 当前时间
+     */
+    @ColumnWidth(17)
+    @ExcelProperty(value = {"${deviceType}", "时间", "时间"}, index = 0)
+    private String curTime;
+
+//    /**
+//     * 班次
+//     */
+//    @ColumnWidth(10)
+//    @ExcelProperty(value = {"${deviceType}", "班次", "班次"}, index = 1)
+//    private String classes;
+
+    /**
+     * 冷冻水进水温度℃
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "冷冻水进水温度℃"}, index = 1)
+    private BigDecimal tempInChillerWater;
+
+    /**
+     * 冷冻水出水温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "冷冻水出水温度℃"}, index = 2)
+    @ColumnWidth(10)
+    private BigDecimal tempOutChillerWater;
+
+    /**
+     * 设计流量%
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "设计流量%"}, index = 3)
+    @ColumnWidth(10)
+    private BigDecimal designFlow;
+
+    /**
+     * 蒸发器压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "蒸发器压力kpa"}, index = 4)
+    @ColumnWidth(10)
+    private BigDecimal pressEvapSaturation;
+
+    /**
+     * 蒸发器饱和温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "蒸发器饱和温度℃"}, index = 5)
+    @ColumnWidth(10)
+    private BigDecimal tempEvapSaturation;
+
+    /**
+     * 趋近温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸发器", "趋近温度℃"}, index = 6)
+    @ColumnWidth(10)
+    private BigDecimal tempEvapApproaching;
+
+    /**
+     * 冷却水进水温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷凝器", "冷却水进水温度℃"}, index = 7)
+    @ColumnWidth(10)
+    private BigDecimal tempInCoolingWater;
+
+    /**
+     * 冷却水出水温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷凝器", "冷却水出水温度℃"}, index = 8)
+    @ColumnWidth(10)
+    private BigDecimal tempOutCoolingWater;
+
+    /**
+     * 冷凝器压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷凝器", "冷凝器压力kpa"}, index = 9)
+    @ColumnWidth(10)
+    private BigDecimal pressCondenserSaturation;
+
+    /**
+     * 冷凝器饱和温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷凝器", "冷凝器饱和温度℃"}, index = 10)
+    @ColumnWidth(10)
+    private BigDecimal tempCondenserSaturation;
+
+    /**
+     * 冷凝器趋近温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷凝器", "趋近温度℃"}, index = 11)
+    @ColumnWidth(10)
+    private BigDecimal tempCondenserApproaching;
+
+    /**
+     * 冷冻水设定值
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "冷冻水设定值℃"}, index = 12)
+    @ColumnWidth(10)
+    private BigDecimal setChillerWater;
+
+    /**
+     * 冷水机需求%
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "冷水机需求%"}, index = 13)
+    @ColumnWidth(10)
+    private BigDecimal setLoad;
+
+    /**
+     * 总电流A
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "总电流A"}, index = 14)
+    @ColumnWidth(10)
+    private BigDecimal currentTotal;
+
+    /**
+     * 总输入功率kw
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "总输入功率kw"}, index = 15)
+    @ColumnWidth(10)
+    private BigDecimal inputPowerTotal;
+
+    /**
+     * 压缩比
+     */
+//    @ExcelProperty(value = {"${deviceType}", "系统", "压缩比"}, index = 16)
+//    @ColumnWidth(10)
+//    private BigDecimal ratioComp;
+
+    /**
+     * 压缩比1
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "1#压缩机压缩比"}, index = 16)
+    @ColumnWidth(10)
+    private BigDecimal ratioCompOne;
+
+    /**
+     * 压缩比2
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "2#压缩机压缩比"}, index = 17)
+    @ColumnWidth(10)
+    private BigDecimal ratioCompTwo;
+
+    /**
+     * 压缩比3
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "3#压缩机压缩比"}, index = 18)
+    @ColumnWidth(10)
+    private BigDecimal ratioCompThree;
+
+    /**
+     * 膨胀阀开度%
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "膨胀阀开度%"}, index = 19)
+    @ColumnWidth(10)
+    private BigDecimal openExv;
+
+    /**
+     * 运行中的压缩机数量
+     */
+    @ExcelProperty(value = {"${deviceType}", "系统", "运行中的压缩机数量"}, index = 20)
+    @ColumnWidth(10)
+    private Integer runCompNum;
+
+    /**
+     * 冷冻水泵频率hz
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷冻泵", "冷冻水泵频率hz"}, index = 21)
+    @ColumnWidth(10)
+    private BigDecimal frequencyChiller;
+
+    /**
+     * 冷冻水进水压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷冻泵", "冷冻水进水压力kpa"}, index = 22)
+    @ColumnWidth(10)
+    private BigDecimal pressInChillerWater;
+
+    /**
+     * 冷冻水出水压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷冻泵", "冷冻水出水压力kpa"}, index = 23)
+    @ColumnWidth(10)
+    private BigDecimal pressOutChillerWater;
+
+    /**
+     * 冷却水泵频率hz
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷却泵", "冷却水泵频率hz"}, index = 24)
+    @ColumnWidth(10)
+    private BigDecimal frequencyCooling;
+
+    /**
+     * 冷却水进水压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷却泵", "冷却水进水压力kpa"}, index = 25)
+    @ColumnWidth(10)
+    private BigDecimal pressInCoolingWater;
+
+    /**
+     * 冷却水出水压力kpa
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷却泵", "冷却水出水压力kpa"}, index = 26)
+    @ColumnWidth(10)
+    private BigDecimal pressOutCoolingWater;
+
+    /**
+     * 冷却塔频率hz
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷却塔", "冷却塔频率hz"}, index = 27)
+    private BigDecimal frequencyCoolingTower;
+
+    /**
+     * 冷却塔运行数量（原注释可能有误，根据列名调整）
+     */
+    @ExcelProperty(value = {"${deviceType}", "冷却塔", "冷却塔运行数量"}, index = 28)
+    private Integer runCoolingTower;
+
+    /**
+     * 室外温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "室外温度℃", "室外温度℃"}, index = 29)
+    @ColumnWidth(10)
+    private BigDecimal tempOutdoor;
+
+    /**
+     * 室外湿度%
+     */
+    @ExcelProperty(value = {"${deviceType}", "室外湿度%", "室外湿度%"}, index = 30)
+    @ColumnWidth(10)
+    private BigDecimal humidityOutdoor;
+
+    /**
+     * 恒压补水罐压力
+     */
+    @ExcelProperty(value = {"${deviceType}", "恒压补水罐压力MPa", "恒压补水罐压力MPa"}, index = 31)
+    @ColumnWidth(10)
+    private BigDecimal pressConstantWaterTank;
+
+    /**
+     * 巡查记录人
+     */
+    @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 32)
+    @ColumnWidth(20)
+    private String recorder;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/ReportHeatingRunParamDTO.java

@@ -0,0 +1,179 @@
+package com.mh.common.core.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 采暖系统参数报表
+ * @date 2024-05-30 11:00:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 14)
+@ContentFontStyle(fontHeightInPoints = 13)
+@ContentRowHeight(20)
+@ContentStyle(
+        horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+        borderBottom = BorderStyleEnum.THIN,
+        borderLeft = BorderStyleEnum.THIN,
+        borderRight = BorderStyleEnum.THIN,
+        borderTop = BorderStyleEnum.THIN
+)
+@ColumnWidth(10)
+public class ReportHeatingRunParamDTO {
+
+    /**
+     * 当前时间
+     */
+    @ColumnWidth(17)
+    @ExcelProperty(value = {"${deviceType}", "时间"}, index = 0)
+    private String curTime;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "运行状态"}, index = 1)
+    private String runStatusBoilerOne;
+
+    /**
+     * 设定温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "设定温度(℃)"}, index = 2)
+    @ColumnWidth(10)
+    private BigDecimal tempSetBoilerOne;
+    /**
+     * 出水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "出水温度(℃)"}, index = 3)
+    @ColumnWidth(10)
+    private BigDecimal tempOutBoilerOne;
+
+    /**
+     * 回水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "回水温度(℃)"}, index = 4)
+    @ColumnWidth(10)
+    private BigDecimal tempInBoilerOne;
+
+    /**
+     * 炉水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "炉水温度(℃)"}, index = 5)
+    @ColumnWidth(10)
+    private BigDecimal tempWaterBoilerOne;
+
+    /**
+     * 烟道温度（℃）
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号采暖设备", "烟道温度(℃)"}, index = 6)
+    @ColumnWidth(10)
+    private BigDecimal tempFlueGasBoilerOne;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "运行状态"}, index = 7)
+    private String runStatusBoilerTwo;
+
+    /**
+     * 设定温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "设定温度(℃)"}, index = 8)
+    @ColumnWidth(10)
+    private BigDecimal tempSetBoilerTwo;
+
+    /**
+     * 出水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "出水温度(℃)"}, index = 9)
+    @ColumnWidth(10)
+    private BigDecimal tempOutBoilerTwo;
+
+    /**
+     * 回水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "回水温度(℃)"}, index = 10)
+    @ColumnWidth(10)
+    private BigDecimal tempInBoilerTwo;
+
+    /**
+     * 炉水温度
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "炉水温度(℃)"}, index = 11)
+    @ColumnWidth(10)
+    private BigDecimal tempWaterBoilerTwo;
+
+    /**
+     * 烟道温度（℃）
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号采暖设备", "烟道温度(℃)"}, index = 12)
+    @ColumnWidth(10)
+    private BigDecimal tempFlueGasBoilerTwo;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "运行状态"}, index = 13)
+    private String runStatusPumpOne;
+
+    /**
+     * 频率
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "1号采暖泵", "频率(Hz)"}, index = 14)
+    private BigDecimal frequencyPumpOne;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "运行状态"}, index = 15)
+    private String runStatusPumpTwo;
+
+    /**
+     * 频率
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "2号采暖泵", "频率(Hz)"}, index = 16)
+    private BigDecimal frequencyPumpTwo;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "运行状态"}, index = 17)
+    private String runStatusPumpThree;
+
+    /**
+     * 频率
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "3号采暖泵", "频率(Hz)"}, index = 18)
+    private BigDecimal frequencyPumpThree;
+
+    // 巡查记录人
+    @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 19)
+    @ColumnWidth(20)
+    private String recorder;
+
+    // 备注信息
+    @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 20)
+    @ColumnWidth(20)
+    private String remark;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/ReportSteamRunParamDTO.java

@@ -0,0 +1,135 @@
+package com.mh.common.core.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 蒸汽机系统参数报表
+ * @date 2024-05-30 11:00:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 14)
+@ContentFontStyle(fontHeightInPoints = 13)
+@ContentRowHeight(20)
+@ContentStyle(
+        horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+        borderBottom = BorderStyleEnum.THIN,
+        borderLeft = BorderStyleEnum.THIN,
+        borderRight = BorderStyleEnum.THIN,
+        borderTop = BorderStyleEnum.THIN
+)
+@ColumnWidth(10)
+public class ReportSteamRunParamDTO {
+
+    /**
+     * 当前时间
+     */
+    @ColumnWidth(17)
+    @ExcelProperty(value = {"${deviceType}", "时间"}, index = 0)
+    private String curTime;
+
+    /**
+     * 当前状态
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "当前状态", "当前状态"}, index = 1)
+    private String curStatus;
+
+    /**
+     * 火焰强度
+     */
+    @ExcelProperty(value = {"${deviceType}", "火焰强度", "火焰强度"}, index = 2)
+    @ColumnWidth(10)
+    private BigDecimal flameIntensity;
+
+    /**
+     * 烟气温度（℃）
+     */
+    @ExcelProperty(value = {"${deviceType}", "烟气温度（℃）", "烟气温度（℃）"}, index = 3)
+    @ColumnWidth(10)
+    private BigDecimal tempFlueGas;
+
+    /**
+     * 火焰百分比（%）
+     */
+    @ExcelProperty(value = {"${deviceType}", "火焰百分比（%）", "火焰百分比（%）"}, index = 4)
+    @ColumnWidth(10)
+    private BigDecimal percentFlameIntensity;
+
+    /**
+     * 液位（%）
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "液位（%）", "液位（%）"}, index = 5)
+    private BigDecimal waterLevel;
+
+    /**
+     * 蒸汽温度（℃）
+     */
+    @ExcelProperty(value = {"${deviceType}", "蒸汽温度（℃）", "蒸汽温度（℃）"}, index = 6)
+    @ColumnWidth(10)
+    private BigDecimal tempCur;
+
+    /**
+     * 当前压力（Mpa）
+     */
+    @ExcelProperty(value = {"${deviceType}", "当前压力（Mpa）", "当前压力（Mpa）"}, index = 7)
+    @ColumnWidth(10)
+    private BigDecimal pressCur;
+
+    /**
+     * 压力设定值（Mpa）
+     */
+    @ExcelProperty(value = {"${deviceType}", "压力设定值（Mpa）", "压力设定值（Mpa）"}, index = 8)
+    @ColumnWidth(10)
+    private BigDecimal pressSet;
+
+    // 启动压差（Mpa）
+    @ExcelProperty(value = {"${deviceType}", "启动压差（Mpa）", "启动压差（Mpa）"}, index = 9)
+    @ColumnWidth(10)
+    private BigDecimal pressStartDiff;
+
+    // 停止压差（Mpa）
+    @ExcelProperty(value = {"${deviceType}", "停止压差（Mpa）", "停止压差（Mpa）"}, index = 10)
+    @ColumnWidth(10)
+    private BigDecimal pressShutdownDiff;
+
+    // 瞬时压力（Mpa）
+    @ExcelProperty(value = {"${deviceType}", "瞬时压力（Mpa）", "瞬时压力（Mpa）"}, index = 11)
+    @ColumnWidth(10)
+    private BigDecimal pressInstance;
+
+    // 瞬时流量（t/h）
+    @ExcelProperty(value = {"${deviceType}", "瞬时流量（t/h）", "瞬时流量（t/h）"}, index = 12)
+    @ColumnWidth(10)
+    private BigDecimal flowInstance;
+
+    // 累积流量（t）
+    @ExcelProperty(value = {"${deviceType}", "累积流量（t）", "累积流量（t）"}, index = 13)
+    @ColumnWidth(10)
+    private BigDecimal flowTotal;
+
+    // 巡查记录人
+    @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 14)
+    @ColumnWidth(20)
+    private String recorder;
+
+    // 备注信息
+    @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 15)
+    @ColumnWidth(20)
+    private String remark;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/ThreeFloorReportHotWaterDTO.java

@@ -0,0 +1,210 @@
+package com.mh.common.core.domain.dto;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.*;
+import com.alibaba.excel.enums.poi.BorderStyleEnum;
+import com.alibaba.excel.enums.poi.HorizontalAlignmentEnum;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import lombok.experimental.Accessors;
+
+import java.math.BigDecimal;
+
+//import java.math.String;
+
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 三楼热水系统参数报表
+ * @date 2024-05-30 11:00:12
+ */
+@Data
+@NoArgsConstructor
+@Accessors(chain = true)
+@HeadRowHeight(25)
+@HeadFontStyle(fontHeightInPoints = 14)
+@ContentFontStyle(fontHeightInPoints = 13)
+@ContentRowHeight(25)
+@ContentStyle(
+        horizontalAlignment = HorizontalAlignmentEnum.CENTER,
+        borderBottom = BorderStyleEnum.THIN,
+        borderLeft = BorderStyleEnum.THIN,
+        borderRight = BorderStyleEnum.THIN,
+        borderTop = BorderStyleEnum.THIN
+)
+@ColumnWidth(10)
+public class ThreeFloorReportHotWaterDTO {
+
+    /**
+     * 当前时间
+     */
+    @ColumnWidth(17)
+    @ExcelProperty(value = {"${deviceType}", "时间", "时间"}, index = 0)
+    private String curTime;
+
+//    /**
+//     * 班次
+//     */
+//    @ColumnWidth(10)
+//    @ExcelProperty(value = {"${deviceType}", "班次", "班次"}, index = 1)
+//    private String classes;
+
+    /**
+     * 设定温度℃
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设定温度℃"}, index = 1)
+    private BigDecimal tempSetHotPumpOne;
+
+    /**
+     * 实际温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "实际温度℃"}, index = 2)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpOne;
+
+    /**
+     * 设备开关机
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设备开关机"}, index = 3)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpOneStr;
+
+    /**
+     * 设备运行状态
+     */
+    @ExcelProperty(value = {"${deviceType}", "1号热泵", "设备运行状态"}, index = 4)
+    @ColumnWidth(10)
+    private String statusRunHotPumpOneStr;
+
+    /**
+     * 设定温度℃
+     */
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设定温度℃"}, index = 5)
+    private BigDecimal tempSetHotPumpTwo;
+
+    /**
+     * 实际温度℃
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "实际温度℃"}, index = 6)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpTwo;
+
+    /**
+     * 设备开关机
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设备开关机"}, index = 7)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpTwoStr;
+
+    /**
+     * 设备运行状态
+     */
+    @ExcelProperty(value = {"${deviceType}", "2号热泵", "设备运行状态"}, index = 8)
+    @ColumnWidth(10)
+    private String statusRunHotPumpTwoStr;
+
+    // 3号热泵设定温度（℃）
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "3号热泵", "设定温度℃"}, index = 9)
+    private BigDecimal tempSetHotPumpThree;
+
+    // 3号热泵实际温度（℃）
+    @ExcelProperty(value = {"${deviceType}", "3号热泵", "实际温度℃"}, index = 10)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpThree;
+
+    // 3号热泵启停状态
+    @ExcelProperty(value = {"${deviceType}", "3号热泵", "设备开关机"}, index = 11)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpThreeStr;
+
+    // 3号热泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "3号热泵", "设备运行状态"}, index = 12)
+    @ColumnWidth(10)
+    private String statusRunHotPumpThreeStr;
+
+    // 4号热泵设定温度（℃）
+    @ColumnWidth(10)
+    @ExcelProperty(value = {"${deviceType}", "4号热泵", "设定温度℃"}, index = 13)
+    private BigDecimal tempSetHotPumpFour;
+
+    // 4号热泵实际温度（℃）
+    @ExcelProperty(value = {"${deviceType}", "4号热泵", "实际温度℃"}, index = 14)
+    @ColumnWidth(10)
+    private BigDecimal tempRealHotPumpFour;
+
+    // 4号热泵启停状态
+    @ExcelProperty(value = {"${deviceType}", "4号热泵", "设备开关机"}, index = 15)
+    @ColumnWidth(10)
+    private String statusSwitchHotPumpFourStr;
+
+    // 4号热泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "4号热泵", "设备运行状态"}, index = 16)
+    @ColumnWidth(10)
+    private String statusRunHotPumpFourStr;
+
+    // 高区/高区设定压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "高区变频泵", "设定压力bar"}, index = 17)
+    @ColumnWidth(10)
+    private BigDecimal presSetSupplyPumpAreaOne;
+
+    // 高区/高区实际压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "高区变频泵", "实际压力bar"}, index = 18)
+    @ColumnWidth(10)
+    private BigDecimal presRealSupplyPumpAreaOne;
+
+    // 高区/高区1号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "高区变频泵", "1号泵运行状态"}, index = 19)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpOneStr;
+
+    // 高区/高区2号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "高区变频泵", "2号泵运行状态"}, index = 20)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpTwoStr;
+
+    // 中区/中区设定压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "中区变频泵", "设定压力bar"}, index = 21)
+    @ColumnWidth(10)
+    private BigDecimal presSetSupplyPumpAreaTwo;
+
+    // 中区/中区实际压力（bar）
+    @ExcelProperty(value = {"${deviceType}", "中区变频泵", "实际压力bar"}, index = 22)
+    @ColumnWidth(10)
+    private BigDecimal presRealSupplyPumpAreaTwo;
+
+    // 中区/中区1号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "中区变频泵", "1号泵运行状态"}, index = 23)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpThreeStr;
+
+    // 中区/中区2号泵运行状态
+    @ExcelProperty(value = {"${deviceType}", "中区变频泵", "2号泵运行状态"}, index = 24)
+    @ColumnWidth(10)
+    private String statusRunSupplyPumpFourStr;
+
+    // 高区/高区液位（米）
+    @ExcelProperty(value = {"${deviceType}", "水箱液位", "高区液位%"}, index = 25)
+    @ColumnWidth(10)
+    private BigDecimal levelWaterTankOne;
+
+    // 中区/中区液位（米）
+    @ExcelProperty(value = {"${deviceType}", "水箱液位", "中区液位%"}, index = 26)
+    @ColumnWidth(10)
+    private BigDecimal levelWaterTankTwo;
+
+    // 巡查记录人
+    @ExcelProperty(value = {"${deviceType}", "巡查记录人", "巡查记录人"}, index = 27)
+    @ColumnWidth(20)
+    private String recorder;
+
+    // 备注信息
+    @ExcelProperty(value = {"${deviceType}", "备注", "备注"}, index = 28)
+    @ColumnWidth(20)
+    private String remark;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/dto/WeatherDataDTO.java

@@ -0,0 +1,63 @@
+package com.mh.common.core.domain.dto;
+
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 天气温度历史记录查询
+ * @date 2025-06-16 11:21:48
+ */
+@Data
+public class WeatherDataDTO {
+
+    /**
+     * 时间
+     */
+    private String weatherDate;
+
+    /**
+     * 日期和星期
+     */
+    private String dateAndWeek;
+
+    /**
+     * 最高温度
+     */
+    private String maxTemp;
+
+    /**
+     * 最低温度
+     */
+    private String minTemp;
+
+    /**
+     * 天气
+     */
+    private String weatherConditions;
+
+    /**
+     * 风向
+     */
+    private String windDirection;
+
+    /**
+     * 风速
+     */
+    private String windPower;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("weatherDate", weatherDate)
+                .append("dateAndWeek", dateAndWeek)
+                .append("maxTemp", maxTemp)
+                .append("minTemp", minTemp)
+                .append("weatherConditions", weatherConditions)
+                .append("windDirection", windDirection)
+                .append("windPower", windPower)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/AlarmRecords.java

@@ -86,13 +86,26 @@ public class AlarmRecords implements Serializable {
     /**
      * 是否发送通知 0：未发送 1：已发送
      */
-    private Integer isSend;
+    private int isSend;
 
-    public Integer getIsSend() {
+    /**
+     * 推送次数，大于3次不再推送
+     */
+    private int sendNum;
+
+    public int getSendNum() {
+        return sendNum;
+    }
+
+    public void setSendNum(int sendNum) {
+        this.sendNum = sendNum;
+    }
+
+    public int getIsSend() {
         return isSend;
     }
 
-    public void setIsSend(Integer isSend) {
+    public void setIsSend(int isSend) {
         this.isSend = isSend;
     }
 

mh-common/src/main/java/com/mh/common/core/domain/entity/AnalysisMonth.java

@@ -0,0 +1,46 @@
+package com.mh.common.core.domain.entity;
+
+import lombok.Data;
+
+@Data
+public class AnalysisMonth {
+
+    private Long id;
+    private String curDate;
+    private String itemType;
+    private String day01;
+    private String day02;
+    private String day03;
+    private String day04;
+    private String day05;
+    private String day06;
+    private String day07;
+    private String day08;
+    private String day09;
+    private String day10;
+    private String day11;
+    private String day12;
+    private String day13;
+    private String day14;
+    private String day15;
+    private String day16;
+    private String day17;
+    private String day18;
+    private String day19;
+    private String day20;
+    private String day21;
+    private String day22;
+    private String day23;
+    private String day24;
+    private String day25;
+    private String day26;
+    private String day27;
+    private String day28;
+    private String day29;
+    private String day30;
+    private String day31;
+    private String day32;
+    private String totalValue;
+    private String buildingId;
+    private String buildingName;
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/AnalysisYear.java

@@ -0,0 +1,27 @@
+package com.mh.common.core.domain.entity;
+
+import lombok.Data;
+
+@Data
+public class AnalysisYear {
+
+    private Long id;
+    private String curDate;
+    private String itemType;
+    private String month01;
+    private String month02;
+    private String month03;
+    private String month04;
+    private String month05;
+    private String month06;
+    private String month07;
+    private String month08;
+    private String month09;
+    private String month10;
+    private String month11;
+    private String month12;
+    private String totalValue;
+    private String buildingId;
+    private String buildingName;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/CollectionParamsManage.java

@@ -14,6 +14,7 @@ import org.apache.commons.lang3.builder.ToStringBuilder;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.Map;
+import java.util.StringJoiner;
 
 /**
  * @author LJF
@@ -144,6 +145,11 @@ public class CollectionParamsManage extends BaseEntity {
      */
     private String communicationType;
 
+    /**
+     * 通信质量
+     */
+    private String quality;
+
     /**
      * 读取响应的寄存器大小（创建指令的时候需要）
      */
@@ -192,42 +198,49 @@ public class CollectionParamsManage extends BaseEntity {
      */
     private String terminalDeviceType;
 
+    /**
+     * 价格
+     */
+    private BigDecimal price;
+
     @Override
     public String toString() {
-        return new ToStringBuilder(this)
+        return new StringJoiner(", ", CollectionParamsManage.class.getSimpleName() + "[", "]")
-                .append("id", id)
+                .add("id='" + id + "'")
-                .append("deviceLedgerId", deviceLedgerId)
+                .add("deviceLedgerId='" + deviceLedgerId + "'")
-                .append("mtType", mtType)
+                .add("mtType='" + mtType + "'")
-                .append("mtNum", mtNum)
+                .add("mtNum='" + mtNum + "'")
-                .append("mtCode", mtCode)
+                .add("mtCode='" + mtCode + "'")
-                .append("registerAddr", registerAddr)
+                .add("registerAddr='" + registerAddr + "'")
-                .append("funcCode", funcCode)
+                .add("funcCode='" + funcCode + "'")
-                .append("identifyCode", identifyCode)
+                .add("identifyCode='" + identifyCode + "'")
-                .append("mtCaliberPulse", mtCaliberPulse)
+                .add("mtCaliberPulse='" + mtCaliberPulse + "'")
-                .append("mtRange", mtRange)
+                .add("mtRange=" + mtRange)
-                .append("mtRatio", mtRatio)
+                .add("mtRatio=" + mtRatio)
-                .append("mtInitValue", mtInitValue)
+                .add("mtInitValue=" + mtInitValue)
-                .append("digits", digits)
+                .add("digits=" + digits)
-                .append("dataType", dataType)
+                .add("dataType=" + dataType)
-                .append("curValue", curValue)
+                .add("curValue=" + curValue)
-                .append("curTime", curTime)
+                .add("curTime=" + curTime)
-                .append("mtIsSum", mtIsSum)
+                .add("mtIsSum=" + mtIsSum)
-                .append("unit", unit)
+                .add("unit='" + unit + "'")
-                .append("orderNum", orderNum)
+                .add("orderNum=" + orderNum)
-                .append("gatewayId", gatewayId)
+                .add("gatewayId='" + gatewayId + "'")
-                .append("communicationParamId", communicationParamId)
+                .add("communicationParamId='" + communicationParamId + "'")
-                .append("protocolType", protocolType)
+                .add("protocolType='" + protocolType + "'")
-                .append("communicationType", communicationType)
+                .add("communicationType='" + communicationType + "'")
-                .append("registerSize", registerSize)
+                .add("quality='" + quality + "'")
-                .append("isUse", isUse)
+                .add("registerSize=" + registerSize)
-                .append("otherName", otherName)
+                .add("isUse=" + isUse)
-                .append("grade", grade)
+                .add("otherName='" + otherName + "'")
-                .append("searchValue", searchValue)
+                .add("grade=" + grade)
-                .append("params", params)
+                .add("searchValue='" + searchValue + "'")
-                .append("paramType", paramType)
+                .add("params=" + params)
-                .append("systemType", systemType)
+                .add("paramType='" + paramType + "'")
-                .append("collectionType", collectionType)
+                .add("systemType='" + systemType + "'")
-                .append("terminalDeviceType", terminalDeviceType)
+                .add("collectionType='" + collectionType + "'")
+                .add("terminalDeviceType='" + terminalDeviceType + "'")
+                .add("price=" + price)
                 .toString();
     }
 }

mh-common/src/main/java/com/mh/common/core/domain/entity/CpmSpaceRelation.java

@@ -30,6 +30,14 @@ public class CpmSpaceRelation extends BaseEntity {
     @TableId(value = "id", type = IdType.ASSIGN_UUID)
     private String id;
 
+    /** 删除标志（0代表存在 2代表删除） */
+    private String delFlag;
+
+    /**
+     * 台账id
+     */
+    private String ledgerId;
+
     /**
      * 采集参数id
      */
@@ -76,6 +84,7 @@ public class CpmSpaceRelation extends BaseEntity {
     public String toString() {
         return new ToStringBuilder(this)
                 .append("id", id)
+                .append("ledgerId", ledgerId)
                 .append("cpmId", cpmId)
                 .append("areaId", areaId)
                 .append("buildingId", buildingId)

mh-common/src/main/java/com/mh/common/core/domain/entity/DeviceState.java

@@ -0,0 +1,84 @@
+package com.mh.common.core.domain.entity;
+
+import com.alibaba.fastjson2.annotation.JSONField;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.util.Date;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @date 2025-02-14 09:30:47
+ * @description 设备统计状态表
+ */
+@Data
+public class DeviceState {
+
+    /**
+     * 当前时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curDate;
+
+    /**
+     * 设备数目
+     */
+    private int deviceNum;
+
+    /**
+     * 电表数目
+     */
+    private int electNum;
+
+    /**
+     * 水表数目
+     */
+    private int waterNum;
+
+    /**
+     * 泵数目
+     */
+    private int pumpNum;
+
+    /**
+     * 压力表数目
+     */
+    private int pressureNum;
+
+    /**
+     * 在线设备数目
+     */
+    private int onlineNum;
+
+    /**
+     * 离线设备数目
+     */
+    private int offlineNum;
+
+    /**
+     * 故障设备数目
+     */
+    private int faultNum;
+
+    /**
+     * 上次故障数目
+     */
+    private int lastFaultNum;
+
+    /**
+     * 故障环比
+     */
+    private String faultP;
+
+    /**
+     * 热泵正在运行的数目
+     */
+    private int pumpOnline;
+
+    /**
+     * 其他设备数目
+     */
+    private int otherNum;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyDay.java

@@ -0,0 +1,89 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_day")
+public class EnergyDay {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 产热量
+     */
+    private BigDecimal hotWaterValue;
+
+    /**
+     * 使用用量
+     */
+    private BigDecimal useHotWater;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 入住人数
+     */
+    private int checkInCount;
+
+    /**
+     * 人均用电
+     */
+    private BigDecimal perElect;
+
+    /**
+     * 人均用水
+     */
+    private BigDecimal perWater;
+
+    /**
+     * 更新标志
+     */
+    private String updateFlag;
+
+    /**
+     * 建筑名称
+     */
+    private String buildingName;
+
+    /**
+     * 当前电表读数
+     */
+    private BigDecimal electCurValue;
+
+    /**
+     * 当前水表读数
+     */
+    private BigDecimal wtCurValue;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyDaySum.java

@@ -0,0 +1,74 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_day_sum")
+public class EnergyDaySum {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 补水
+     */
+    private BigDecimal fillWater;
+
+    /**
+     * 补水与昨日比
+     */
+    private String fillWaterP;
+
+    /**
+     * 用水
+     */
+    private BigDecimal waterValue;
+
+    /**
+     * 用水与昨日比
+     */
+    private String waterP;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 用电与昨日比
+     */
+    private String electP;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 单耗与昨日比
+     */
+    private String electWaterP;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyHour.java

@@ -0,0 +1,220 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@TableName("energy_hour")
+public class EnergyHour {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 产热量
+     */
+    private BigDecimal hotWaterValue;
+
+    /**
+     * 使用用量
+     */
+    private BigDecimal useHotWater;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 入住人数
+     */
+    private int checkInCount;
+
+    /**
+     * 人均用电
+     */
+    private BigDecimal perElect;
+
+    /**
+     * 人均用水
+     */
+    private BigDecimal perWater;
+
+    /**
+     * 更新标志
+     */
+    private String updateFlag;
+
+    /**
+     * 建筑名称
+     */
+    private String buildingName;
+
+    /**
+     * 当前电表读数
+     */
+    private BigDecimal electCurValue;
+
+    /**
+     * 当前水表读数
+     */
+    private BigDecimal wtCurValue;
+
+    public String getId() {
+        return id;
+    }
+
+    public void setId(String id) {
+        this.id = id;
+    }
+
+    public String getCurDate() {
+        return curDate;
+    }
+
+    public void setCurDate(String curDate) {
+        this.curDate = curDate;
+    }
+
+    public String getBuildingId() {
+        return buildingId;
+    }
+
+    public void setBuildingId(String buildingId) {
+        this.buildingId = buildingId;
+    }
+
+    public BigDecimal getHotWaterValue() {
+        return hotWaterValue;
+    }
+
+    public void setHotWaterValue(BigDecimal hotWaterValue) {
+        this.hotWaterValue = hotWaterValue;
+    }
+
+    public BigDecimal getUseHotWater() {
+        return useHotWater;
+    }
+
+    public void setUseHotWater(BigDecimal useHotWater) {
+        this.useHotWater = useHotWater;
+    }
+
+    public BigDecimal getElectValue() {
+        return electValue;
+    }
+
+    public void setElectValue(BigDecimal electValue) {
+        this.electValue = electValue;
+    }
+
+    public BigDecimal getElectWater() {
+        return electWater;
+    }
+
+    public void setElectWater(BigDecimal electWater) {
+        this.electWater = electWater;
+    }
+
+    public int getCheckInCount() {
+        return checkInCount;
+    }
+
+    public void setCheckInCount(int checkInCount) {
+        this.checkInCount = checkInCount;
+    }
+
+    public BigDecimal getPerElect() {
+        return perElect;
+    }
+
+    public void setPerElect(BigDecimal perElect) {
+        this.perElect = perElect;
+    }
+
+    public BigDecimal getPerWater() {
+        return perWater;
+    }
+
+    public void setPerWater(BigDecimal perWater) {
+        this.perWater = perWater;
+    }
+
+    public String getUpdateFlag() {
+        return updateFlag;
+    }
+
+    public void setUpdateFlag(String updateFlag) {
+        this.updateFlag = updateFlag;
+    }
+
+    public String getBuildingName() {
+        return buildingName;
+    }
+
+    public void setBuildingName(String buildingName) {
+        this.buildingName = buildingName;
+    }
+
+    public BigDecimal getElectCurValue() {
+        return electCurValue;
+    }
+
+    public void setElectCurValue(BigDecimal electCurValue) {
+        this.electCurValue = electCurValue;
+    }
+
+    public BigDecimal getWtCurValue() {
+        return wtCurValue;
+    }
+
+    public void setWtCurValue(BigDecimal wtCurValue) {
+        this.wtCurValue = wtCurValue;
+    }
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("id", id)
+                .append("curDate", curDate)
+                .append("buildingId", buildingId)
+                .append("hotWaterValue", hotWaterValue)
+                .append("useHotWater", useHotWater)
+                .append("electValue", electValue)
+                .append("electWater", electWater)
+                .append("checkInCount", checkInCount)
+                .append("perElect", perElect)
+                .append("perWater", perWater)
+                .append("updateFlag", updateFlag)
+                .append("buildingName", buildingName)
+                .append("electCurValue", electCurValue)
+                .append("wtCurValue", wtCurValue)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyMonth.java

@@ -0,0 +1,89 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_month")
+public class EnergyMonth {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 产热量
+     */
+    private BigDecimal hotWaterValue;
+
+    /**
+     * 使用用量
+     */
+    private BigDecimal useHotWater;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 入住人数
+     */
+    private int checkInCount;
+
+    /**
+     * 人均用电
+     */
+    private BigDecimal perElect;
+
+    /**
+     * 人均用水
+     */
+    private BigDecimal perWater;
+
+    /**
+     * 更新标志
+     */
+    private String updateFlag;
+
+    /**
+     * 建筑名称
+     */
+    private String buildingName;
+
+    /**
+     * 当前电表读数
+     */
+    private BigDecimal electCurValue;
+
+    /**
+     * 当前水表读数
+     */
+    private BigDecimal wtCurValue;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyMonthSum.java

@@ -0,0 +1,74 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_month_sum")
+public class EnergyMonthSum {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 补水
+     */
+    private BigDecimal fillWater;
+
+    /**
+     * 补水与昨日比
+     */
+    private String fillWaterP;
+
+    /**
+     * 用水
+     */
+    private BigDecimal waterValue;
+
+    /**
+     * 用水与昨日比
+     */
+    private String waterP;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 用电与昨日比
+     */
+    private String electP;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 单耗与昨日比
+     */
+    private String electWaterP;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyYear.java

@@ -0,0 +1,89 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_year")
+public class EnergyYear {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 产热量
+     */
+    private BigDecimal hotWaterValue;
+
+    /**
+     * 使用用量
+     */
+    private BigDecimal useHotWater;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 入住人数
+     */
+    private int checkInCount;
+
+    /**
+     * 人均用电
+     */
+    private BigDecimal perElect;
+
+    /**
+     * 人均用水
+     */
+    private BigDecimal perWater;
+
+    /**
+     * 更新标志
+     */
+    private String updateFlag;
+
+    /**
+     * 建筑名称
+     */
+    private String buildingName;
+
+    /**
+     * 当前电表读数
+     */
+    private BigDecimal electCurValue;
+
+    /**
+     * 当前水表读数
+     */
+    private BigDecimal wtCurValue;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/EnergyYearSum.java

@@ -0,0 +1,74 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水时间能耗实体类
+ * @date 2025-06-18 14:28:30
+ */
+@Data
+@TableName("energy_month_sum")
+public class EnergyYearSum {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 时间
+     */
+    private String curDate;
+
+    /**
+     * 建筑id
+     */
+    private String buildingId;
+
+    /**
+     * 补水
+     */
+    private BigDecimal fillWater;
+
+    /**
+     * 补水与昨日比
+     */
+    private String fillWaterP;
+
+    /**
+     * 用水
+     */
+    private BigDecimal waterValue;
+
+    /**
+     * 用水与昨日比
+     */
+    private String waterP;
+
+    /**
+     * 用电量
+     */
+    private BigDecimal electValue;
+
+    /**
+     * 用电与昨日比
+     */
+    private String electP;
+
+    /**
+     * 单耗
+     */
+    private BigDecimal electWater;
+
+    /**
+     * 单耗与昨日比
+     */
+    private String electWaterP;
+
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/GatewayManage.java

@@ -35,6 +35,7 @@ public class GatewayManage extends BaseEntity {
     private int communicationType;                  // 通讯类型
     private int grade;                              // 标志位(连接状态) 0：正常；1：不在线；2：异常
     private Integer status;                             // (连接状态) 0：正常；1：不在线；2：异常
+    private String heartBeat;                       // 心跳包
 
     @JsonIgnore
     @TableField(exist = false)
@@ -47,6 +48,14 @@ public class GatewayManage extends BaseEntity {
     @JsonInclude(JsonInclude.Include.NON_EMPTY)
     private Map<String, Object> params;
 
+    public String getHeartBeat() {
+        return heartBeat;
+    }
+
+    public void setHeartBeat(String heartBeat) {
+        this.heartBeat = heartBeat;
+    }
+
     public Integer getStatus() {
         return status;
     }

mh-common/src/main/java/com/mh/common/core/domain/entity/HouseInfo.java

@@ -12,6 +12,7 @@ import lombok.Setter;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 
 import java.math.BigDecimal;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -92,6 +93,20 @@ public class HouseInfo extends BaseEntity {
 
     private int orderNum;
 
+    /**
+     * 台账id
+     */
+//    @JsonIgnore
+    @TableField(exist = false)
+    private List<String> ledgerId;
+
+    /**
+     * 采集节点id
+     */
+//    @JsonIgnore
+    @TableField(exist = false)
+    private List<String> cpmId;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this)

mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHeatingRunParamHis.java

@@ -0,0 +1,217 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.mh.common.core.domain.BaseEntity;
+import lombok.Data;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 采暖系统运行记录表
+ * @date 2025-10-21 10:26:12
+ */
+@Data
+@TableName("report_heating_run_param_his")  // 指定数据库表名
+public class ReportHeatingRunParamHis extends BaseEntity {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    // 日期
+    @TableField("cur_date")  // 字段映射（可选，若字段名与属性名不一致时需指定）
+    private LocalDate curDate;
+
+    // 时间
+    @TableField("cur_time")
+    private String curTime;  // 字符串类型直接映射
+
+    // 班次
+    @TableField("classes")
+    private String classes;
+
+    // 锅炉1状态
+    @TableField("cur_status_boiler_one")
+    private Integer curStatusBoilerOne;
+
+    // 锅炉1状态
+    @TableField(exist = false)
+    private String runStatusBoilerOne;
+
+    // 锅炉1出水温度（℃）
+    @TableField("temp_out_boiler_one")
+    private BigDecimal tempOutBoilerOne;  // 精度要求高时使用BigDecimal
+
+    // 锅炉1设定温度（℃）
+    @TableField("temp_set_boiler_one")
+    private BigDecimal tempSetBoilerOne;  // 精度要求高时使用BigDecimal
+
+    // 锅炉1回水温度（℃）
+    @TableField("temp_in_boiler_one")
+    private BigDecimal tempInBoilerOne;
+
+    // 锅炉1炉水温度（℃）
+    @TableField("temp_water_boiler_one")
+    private BigDecimal tempWaterBoilerOne;
+
+    // 锅炉1烟道温度（℃）
+    @TableField("temp_flue_gas_boiler_one")
+    private BigDecimal tempFlueGasBoilerOne;
+
+    // 锅炉2状态
+    @TableField("cur_status_boiler_two")
+    private Integer curStatusBoilerTwo;
+
+    // 锅炉2状态
+    @TableField(exist = false)
+    private String runStatusBoilerTwo;
+
+    // 锅炉2设定温度（℃）
+    @TableField("temp_set_boiler_two")
+    private BigDecimal tempSetBoilerTwo;  // 精度要求高时使用BigDecimal
+
+    // 锅炉2出水温度（℃）
+    @TableField("temp_out_boiler_two")
+    private BigDecimal tempOutBoilerTwo;
+
+    // 锅炉2回水温度（℃)
+    @TableField("temp_in_boiler_two")
+    private BigDecimal tempInBoilerTwo;
+
+    // 锅炉2炉水温度（℃）
+    @TableField("temp_water_boiler_two")
+    private BigDecimal tempWaterBoilerTwo;
+
+    // 锅炉2烟道温度（℃）
+    @TableField("temp_flue_gas_boiler_two")
+    private BigDecimal tempFlueGasBoilerTwo;
+
+    // 采暖泵1状态
+    @TableField("cur_status_pump_one")
+    private Integer curStatusPumpOne;
+
+    // 采暖泵1状态
+    @TableField(exist = false)
+    private String runStatusPumpOne;
+
+    // 采暖泵1频率（Hz）
+    @TableField("frequency_pump_one")
+    private BigDecimal frequencyPumpOne;
+
+    // 采暖泵2状态
+    @TableField("cur_status_pump_two")
+    private Integer curStatusPumpTwo;
+
+    // 采暖泵2状态
+    @TableField(exist = false)
+    private String runStatusPumpTwo;
+
+    // 采暖泵2频率（Hz）
+    @TableField("frequency_pump_two")
+    private BigDecimal frequencyPumpTwo;
+
+    // 采暖泵3状态
+    @TableField("cur_status_pump_three")
+    private Integer curStatusPumpThree;
+
+    // 采暖泵3状态
+    @TableField(exist = false)
+    private String runStatusPumpThree;
+
+    // 采暖泵3频率（Hz）
+    @TableField("frequency_pump_three")
+    private BigDecimal frequencyPumpThree;
+
+    // 巡查记录人
+    @TableField("recorder")
+    private String recorder;
+
+    // 备注
+    @TableField("remark")
+    private String remark;
+
+    // 创建时间（自动填充）
+    @TableField(value = "create_date", fill = FieldFill.INSERT)  // 插入时自动填充
+    private LocalDateTime createDate;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    /** 创建者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonIgnore
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageNum;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageSize;
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ReportHeatingRunParamHis.class.getSimpleName() + "[", "]")
+                .add("id='" + id + "'")
+                .add("curDate=" + curDate)
+                .add("curTime='" + curTime + "'")
+                .add("classes='" + classes + "'")
+                .add("curStatusBoilerOne=" + curStatusBoilerOne)
+                .add("tempOutBoilerOne=" + tempOutBoilerOne)
+                .add("tempInBoilerOne=" + tempInBoilerOne)
+                .add("tempWaterBoilerOne=" + tempWaterBoilerOne)
+                .add("tempFlueGasBoilerOne=" + tempFlueGasBoilerOne)
+                .add("curStatusBoilerTwo=" + curStatusBoilerTwo)
+                .add("tempOutBoilerTwo=" + tempOutBoilerTwo)
+                .add("tempInBoilerTwo=" + tempInBoilerTwo)
+                .add("tempWaterBoilerTwo=" + tempWaterBoilerTwo)
+                .add("tempFlueGasBoilerTwo=" + tempFlueGasBoilerTwo)
+                .add("curStatusPumpOne=" + curStatusPumpOne)
+                .add("frequencyPumpOne=" + frequencyPumpOne)
+                .add("curStatusPumpTwo=" + curStatusPumpTwo)
+                .add("frequencyPumpTwo=" + frequencyPumpTwo)
+                .add("curStatusPumpThree=" + curStatusPumpThree)
+                .add("frequencyPumpThree=" + frequencyPumpThree)
+                .add("recorder='" + recorder + "'")
+                .add("remark='" + remark + "'")
+                .add("createDate=" + createDate)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/ReportHotWaterParamHis.java

@@ -0,0 +1,232 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.mh.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Date;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 生活热水供水热泵运行情况
+ * @date 2025-10-22 17:40:03
+ */
+@Setter
+@Getter
+@TableName("report_hot_water_param_his")
+public class ReportHotWaterParamHis extends BaseEntity implements Serializable {
+
+    // 主键
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    // 楼层ID
+    private String floorId;
+
+    // 记录日期
+    private LocalDate curDate;
+
+    // 记录时间（varchar格式）
+    private String curTime;
+
+    // 班次
+    private String classes;
+
+    // 1号热泵设定温度（℃）
+    private BigDecimal tempSetHotPumpOne;
+
+    // 1号热泵实际温度（℃）
+    private BigDecimal tempRealHotPumpOne;
+
+    // 1号热泵启停状态（0-关闭，1-开启）
+    private Integer statusSwitchHotPumpOne;
+
+    // 1号热泵运行状态（0-故障，1-正常）
+    private Integer statusRunHotPumpOne;
+
+    // 2号热泵设定温度（℃）
+    private BigDecimal tempSetHotPumpTwo;
+
+    // 2号热泵实际温度（℃）
+    private BigDecimal tempRealHotPumpTwo;
+
+    // 2号热泵启停状态
+    private Integer statusSwitchHotPumpTwo;
+
+    // 2号热泵运行状态
+    private Integer statusRunHotPumpTwo;
+
+    // 3号热泵设定温度（℃）
+    private BigDecimal tempSetHotPumpThree;
+
+    // 3号热泵实际温度（℃）
+    private BigDecimal tempRealHotPumpThree;
+
+    // 3号热泵启停状态
+    private Integer statusSwitchHotPumpThree;
+
+    // 3号热泵运行状态
+    private Integer statusRunHotPumpThree;
+
+    // 4号热泵设定温度（℃）
+    private BigDecimal tempSetHotPumpFour;
+
+    // 4号热泵实际温度（℃）
+    private BigDecimal tempRealHotPumpFour;
+
+    // 4号热泵启停状态
+    private Integer statusSwitchHotPumpFour;
+
+    // 4号热泵运行状态
+    private Integer statusRunHotPumpFour;
+
+    // 高区/裙楼设定压力（MPa）
+    private BigDecimal presSetSupplyPumpAreaOne;
+
+    // 高区/裙楼实际压力（MPa）
+    private BigDecimal presRealSupplyPumpAreaOne;
+
+    // 高区/裙楼1号泵运行状态
+    private Integer statusRunSupplyPumpOne;
+
+    // 高区/裙楼2号泵运行状态
+    private Integer statusRunSupplyPumpTwo;
+
+    // 中区/中厨设定压力（MPa）
+    private BigDecimal presSetSupplyPumpAreaTwo;
+
+    // 中区/中厨实际压力（MPa）
+    private BigDecimal presRealSupplyPumpAreaTwo;
+
+    // 中区/中厨1号泵运行状态
+    private Integer statusRunSupplyPumpThree;
+
+    // 中区/中厨2号泵运行状态
+    private Integer statusRunSupplyPumpFour;
+
+    // 高区/裙楼液位（米）
+    private BigDecimal levelWaterTankOne;
+
+    // 中区/中厨液位（米）
+    private BigDecimal levelWaterTankTwo;
+
+    // 巡查记录人
+    private String recorder;
+
+    // 备注信息
+    private String remark;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    /** 创建者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonIgnore
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageNum;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageSize;
+
+    // 无参构造
+    public ReportHotWaterParamHis() {
+    }
+
+    // Getter/Setter 方法（此处省略，实际开发中建议使用 Lombok @Data）
+
+    // 业务方法示例：判断热泵1是否正常运行
+    public boolean isHotPump1Normal() {
+        return statusRunHotPumpOne != null && statusRunHotPumpOne == 1;
+    }
+
+    // 业务方法示例：获取当前压力差值（高区）
+    public BigDecimal getHighAreaPressureDiff() {
+        return presRealSupplyPumpAreaOne.subtract(presSetSupplyPumpAreaOne);
+    }
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ReportHotWaterParamHis.class.getSimpleName() + "[", "]")
+                .add("id='" + id + "'")
+                .add("floorId='" + floorId + "'")
+                .add("curDate=" + curDate)
+                .add("curTime='" + curTime + "'")
+                .add("classes='" + classes + "'")
+                .add("tempSetHotPumpOne=" + tempSetHotPumpOne)
+                .add("tempRealHotPumpOne=" + tempRealHotPumpOne)
+                .add("statusSwitchHotPumpOne=" + statusSwitchHotPumpOne)
+                .add("statusRunHotPumpOne=" + statusRunHotPumpOne)
+                .add("tempSetHotPumpTwo=" + tempSetHotPumpTwo)
+                .add("tempRealHotPumpTwo=" + tempRealHotPumpTwo)
+                .add("statusSwitchHotPumpTwo=" + statusSwitchHotPumpTwo)
+                .add("statusRunHotPumpTwo=" + statusRunHotPumpTwo)
+                .add("tempSetHotPumpThree=" + tempSetHotPumpThree)
+                .add("tempRealHotPumpThree=" + tempRealHotPumpThree)
+                .add("statusSwitchHotPumpThree=" + statusSwitchHotPumpThree)
+                .add("statusRunHotPumpThree=" + statusRunHotPumpThree)
+                .add("tempSetHotPumpFour=" + tempSetHotPumpFour)
+                .add("tempRealHotPumpFour=" + tempRealHotPumpFour)
+                .add("statusSwitchHotPumpFour=" + statusSwitchHotPumpFour)
+                .add("statusRunHotPumpFour=" + statusRunHotPumpFour)
+                .add("presSetSupplyPumpAreaOne=" + presSetSupplyPumpAreaOne)
+                .add("presRealSupplyPumpAreaOne=" + presRealSupplyPumpAreaOne)
+                .add("statusRunSupplyPumpOne=" + statusRunSupplyPumpOne)
+                .add("statusRunSupplyPumpTwo=" + statusRunSupplyPumpTwo)
+                .add("presSetSupplyPumpAreaTwo=" + presSetSupplyPumpAreaTwo)
+                .add("presRealSupplyPumpAreaTwo=" + presRealSupplyPumpAreaTwo)
+                .add("statusRunSupplyPumpThree=" + statusRunSupplyPumpThree)
+                .add("statusRunSupplyPumpFour=" + statusRunSupplyPumpFour)
+                .add("levelWaterTankOne=" + levelWaterTankOne)
+                .add("levelWaterTankTwo=" + levelWaterTankTwo)
+                .add("recorder='" + recorder + "'")
+                .add("remark='" + remark + "'")
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/ReportMeterReadingsHis.java

@@ -0,0 +1,114 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.math.BigDecimal;
+import java.util.Date;
+import java.util.StringJoiner;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 设备抄表记录表
+ * @date 2025-10-21 10:26:12
+ */
+@Setter
+@Getter
+public class ReportMeterReadingsHis {
+
+    @TableId(value = "id", type = IdType.ASSIGN_UUID)
+    private String id;
+
+    /**
+     * 设备类型
+     */
+    private String mtType;
+
+    /**
+     * 设备位置
+     */
+    private String location;
+
+    /**
+     * 设备编号
+     */
+    private String mtNum;
+
+    /**
+     * 昨日抄表读数
+     */
+    private BigDecimal yesterdayReading;
+
+    /**
+     * 昨日抄表时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date yesterdayTimestamp;
+
+    /**
+     * 当日抄表读数
+     */
+    private BigDecimal todayReading;
+
+    /**
+     * 当日抄表时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date todayTimestamp;
+
+    /**
+     * 设备倍率
+     */
+    private int mtRatio;
+
+    /**
+     * 当日总读数*设备倍率
+     */
+    private BigDecimal total;
+
+    /**
+     * 当日单价
+     */
+    private BigDecimal unitPrice;
+
+    /**
+     * 当日金额
+     */
+    private BigDecimal cost;
+
+    /**
+     * 记录创建时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /**
+     * 排序序号
+     */
+    private int sortOrder;
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ReportMeterReadingsHis.class.getSimpleName() + "[", "]")
+                .add("id='" + id + "'")
+                .add("mtType='" + mtType + "'")
+                .add("location='" + location + "'")
+                .add("mtNum='" + mtNum + "'")
+                .add("yesterdayReading=" + yesterdayReading)
+                .add("yesterdayTimestamp=" + yesterdayTimestamp)
+                .add("todayReading=" + todayReading)
+                .add("todayTimestamp=" + todayTimestamp)
+                .add("mtRatio=" + mtRatio)
+                .add("total=" + total)
+                .add("unitPrice=" + unitPrice)
+                .add("cost=" + cost)
+                .add("createTime=" + createTime)
+                .add("sortOrder=" + sortOrder)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSteamRunParamHis.java

@@ -0,0 +1,170 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.mh.common.core.domain.BaseEntity;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serial;
+import java.io.Serializable;
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Map;
+import java.util.StringJoiner;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 生活热水供水热泵运行情况
+ * @date 2025-10-22 17:40:03
+ */
+@Setter
+@Getter
+@TableName("report_steam_run_param_his")
+public class ReportSteamRunParamHis extends BaseEntity implements Serializable {
+
+    // 主键
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    // 记录日期
+    private LocalDate curDate;
+
+    // 记录时间（varchar格式）
+    private String curTime;
+
+    // 班次
+    private String classes;
+
+    // 蒸汽机状态字
+    private Integer curStatus;
+
+    // 运行状态
+//    @JsonIgnore
+    @TableField(exist = false)
+    private String runStatus;
+
+    // 火焰强度
+    private BigDecimal flameIntensity;
+
+    // 烟气温度（℃）
+    private BigDecimal tempFlueGas;
+
+    // 火焰百分比（%）
+    private BigDecimal percentFlameIntensity;
+
+    // 液位（%）
+    private BigDecimal waterLevel;
+
+    // 蒸汽温度（℃）
+    private BigDecimal tempCur;
+
+    // 当前压力（Mpa）
+    private BigDecimal pressCur;
+
+    // 压力设定值（Mpa）
+    private BigDecimal pressSet;
+
+    // 启动压差（Mpa）
+    private BigDecimal pressStartDiff;
+
+    // 停止压差（Mpa）
+    private BigDecimal pressShutdownDiff;
+
+    // 瞬时压力（Mpa）
+    private BigDecimal pressInstance;
+
+    // 瞬时流量（t/h）
+    private BigDecimal flowInstance;
+
+    // 累积流量（t）
+    private BigDecimal flowTotal;
+
+    // 巡查记录人
+    private String recorder;
+
+    // 备注信息
+    private String remark;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    /** 创建者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @JsonIgnore
+    @TableField(exist = false)
+    private String updateBy;
+
+    /** 更新时间 */
+    @JsonIgnore
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageNum;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageSize;
+
+    @Override
+    public String toString() {
+        return new StringJoiner(", ", ReportSteamRunParamHis.class.getSimpleName() + "[", "]")
+                .add("id='" + id + "'")
+                .add("curDate=" + curDate)
+                .add("curTime='" + curTime + "'")
+                .add("classes='" + classes + "'")
+                .add("curStatus=" + curStatus)
+                .add("flameIntensity=" + flameIntensity)
+                .add("tempFlueGas=" + tempFlueGas)
+                .add("percentFlameIntensity=" + percentFlameIntensity)
+                .add("waterLevel=" + waterLevel)
+                .add("tempCur=" + tempCur)
+                .add("pressCur=" + pressCur)
+                .add("pressSet=" + pressSet)
+                .add("pressStartDiff=" + pressStartDiff)
+                .add("pressShutdownDiff=" + pressShutdownDiff)
+                .add("pressInstance=" + pressInstance)
+                .add("flowInstance=" + flowInstance)
+                .add("flowTotal=" + flowTotal)
+                .add("recorder='" + recorder + "'")
+                .add("remark='" + remark + "'")
+                .add("searchValue='" + searchValue + "'")
+                .add("params=" + params)
+                .add("createBy='" + createBy + "'")
+                .add("createTime=" + createTime)
+                .add("updateBy='" + updateBy + "'")
+                .add("updateTime=" + updateTime)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/ReportSysRunParamHis.java

@@ -0,0 +1,310 @@
+package com.mh.common.core.domain.entity;
+
+import com.alibaba.excel.annotation.ExcelProperty;
+import com.alibaba.excel.annotation.write.style.ColumnWidth;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonInclude;
+import com.mh.common.core.domain.BaseEntity;
+import lombok.*;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+import org.springframework.data.annotation.Id;
+
+import java.math.BigDecimal;
+import java.time.LocalDate;
+import java.util.Date;
+import java.util.Map;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 系统参数设备运行历史记录
+ * @date 2025-08-12 10:44:36
+ */
+@Data
+@TableName("report_sys_run_param_his")
+public class ReportSysRunParamHis extends BaseEntity {
+
+    /**
+     * 自增主键
+     */
+    @Id
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 主机id
+     */
+    private String deviceNum;
+
+    /**
+     * 日期
+     */
+    private LocalDate curDate;
+
+    /**
+     * 时间（格式建议与数据库存储一致，如 "HH:mm:ss" 或 "yyyy-MM-dd HH:mm:ss"）
+     */
+    private String curTime;
+
+//    /**
+//     * 班次
+//     */
+//    private String classes;
+
+    /**
+     * 冷冻水进水温度℃
+     */
+    private BigDecimal tempInChillerWater;
+
+    /**
+     * 冷冻水出水温度℃
+     */
+    private BigDecimal tempOutChillerWater;
+
+    /**
+     * 设计流量%（修正列名，原 "design flow" 含空格）
+     */
+    private BigDecimal designFlow;
+
+    /**
+     * 蒸发器压力kpa--磁悬浮
+     */
+    private BigDecimal pressEvapSaturation;
+
+    /**
+     * 蒸发器饱和温度℃
+     */
+    private BigDecimal tempEvapSaturation;
+
+    /**
+     * 蒸发器趋近温度℃
+     */
+    private BigDecimal tempEvapApproaching;
+
+    /**
+     * 冷却水进水温度℃
+     */
+    private BigDecimal tempInCoolingWater;
+
+    /**
+     * 冷却水出水温度℃
+     */
+    private BigDecimal tempOutCoolingWater;
+
+    /**
+     * 冷凝器压力kpa--磁悬浮
+     */
+    private BigDecimal pressCondenserSaturation;
+
+    /**
+     * 冷凝器饱和温度℃
+     */
+    private BigDecimal tempCondenserSaturation;
+
+    /**
+     * 冷凝器趋近温度℃
+     */
+    private BigDecimal tempCondenserApproaching;
+
+    /**
+     * 冷冻水设定值℃
+     */
+    private BigDecimal setChillerWater;
+
+    /**
+     * 冷水机需求%
+     */
+    private BigDecimal setLoad;
+
+    /**
+     * 总电流%
+     */
+    private BigDecimal currentTotal;
+
+    /**
+     * 总输入功率kw
+     */
+    private BigDecimal inputPowerTotal;
+
+    /**
+     * 压缩比1
+     */
+    private BigDecimal ratioCompOne;
+
+    /**
+     * 压缩比1
+     */
+    private BigDecimal ratioCompTwo;
+
+    /**
+     * 压缩比1
+     */
+    private BigDecimal ratioCompThree;
+
+    /**
+     * 膨胀阀开度%
+     */
+    private BigDecimal openExv;
+
+    /**
+     * 运行中的压缩机数量
+     */
+    private Integer runCompNum;
+
+    /**
+     * 冷冻水泵频率hz
+     */
+    private BigDecimal frequencyChiller;
+
+    /**
+     * 冷冻水出水压力kpa
+     */
+    private BigDecimal pressOutChillerWater;
+
+    /**
+     * 冷冻水进水压力kpa
+     */
+    private BigDecimal pressInChillerWater;
+
+    /**
+     * 冷却水泵频率hz
+     */
+    private BigDecimal frequencyCooling;
+
+    /**
+     * 冷却水出水压力kpa
+     */
+    private BigDecimal pressOutCoolingWater;
+
+    /**
+     * 冷却水进水压力kpa
+     */
+    private BigDecimal pressInCoolingWater;
+
+    /**
+     * 冷却塔水泵频率hz
+     */
+    private BigDecimal frequencyCoolingTower;
+
+    /**
+     * 冷却塔运行数量（原注释可能有误，根据列名调整）
+     */
+    private Integer runCoolingTower;
+
+    /**
+     * 恒压补水罐压力
+     */
+    private BigDecimal pressConstantWaterTank;
+
+    /**
+     * 室外温度℃
+     */
+    private BigDecimal tempOutdoor;
+
+    /**
+     * 室外湿度%
+     */
+    private BigDecimal humidityOutdoor;
+
+    /**
+     * 巡查记录人
+     */
+    private String recorder;
+
+    /**
+     * 备注
+     */
+    private String remark;
+
+    @JsonIgnore
+    @TableField(exist = false)
+    private String searchValue;
+
+    /**
+     * 请求参数
+     */
+    @TableField(exist = false)
+    @JsonInclude(JsonInclude.Include.NON_EMPTY)
+    private Map<String, Object> params;
+
+    /** 创建者 */
+    @TableField(exist = false)
+    private String createBy;
+
+    /** 创建时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private String updateBy;
+
+    /** 更新时间 */
+    @TableField(exist = false)
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageNum;
+
+    /** 更新者 */
+    @TableField(exist = false)
+    private int pageSize;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("id", id)
+                .append("deviceNum", deviceNum)
+                .append("curDate", curDate)
+                .append("curTime", curTime)
+                .append("tempInChillerWater", tempInChillerWater)
+                .append("tempOutChillerWater", tempOutChillerWater)
+                .append("designFlow", designFlow)
+                .append("pressEvapSaturation", pressEvapSaturation)
+                .append("tempEvapSaturation", tempEvapSaturation)
+                .append("tempEvapApproaching", tempEvapApproaching)
+                .append("tempInCoolingWater", tempInCoolingWater)
+                .append("tempOutCoolingWater", tempOutCoolingWater)
+                .append("pressCondenserSaturation", pressCondenserSaturation)
+                .append("tempCondenserSaturation", tempCondenserSaturation)
+                .append("tempCondenserApproaching", tempCondenserApproaching)
+                .append("setChillerWater", setChillerWater)
+                .append("setLoad", setLoad)
+                .append("currentTotal", currentTotal)
+                .append("inputPowerTotal", inputPowerTotal)
+                .append("ratioCompOne", ratioCompOne)
+                .append("ratioCompTwo", ratioCompTwo)
+                .append("ratioCompThree", ratioCompThree)
+                .append("openExv", openExv)
+                .append("runCompNum", runCompNum)
+                .append("frequencyChiller", frequencyChiller)
+                .append("pressOutChillerWater", pressOutChillerWater)
+                .append("pressInChillerWater", pressInChillerWater)
+                .append("frequencyCooling", frequencyCooling)
+                .append("pressOutCoolingWater", pressOutCoolingWater)
+                .append("pressInCoolingWater", pressInCoolingWater)
+                .append("frequencyCoolingTower", frequencyCoolingTower)
+                .append("runCoolingTower", runCoolingTower)
+                .append("pressConstantWaterTank", pressConstantWaterTank)
+                .append("tempOutdoor", tempOutdoor)
+                .append("humidityOutdoor", humidityOutdoor)
+                .append("recorder", recorder)
+                .append("remark", remark)
+                .append("searchValue", searchValue)
+                .append("params", params)
+                .append("createBy", createBy)
+                .append("createTime", createTime)
+                .append("updateBy", updateBy)
+                .append("updateTime", updateTime)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/SysRole.java

@@ -91,7 +91,7 @@ public class SysRole extends BaseEntity
 
     public static boolean isAdmin(Long roleId)
     {
-        return roleId != null && 1L == roleId;
+        return roleId != null && (1L == roleId || 10005L == roleId);
     }
 
     @NotBlank(message = "角色名称不能为空")

mh-common/src/main/java/com/mh/common/core/domain/entity/SysUser.java

@@ -121,7 +121,7 @@ public class SysUser extends BaseEntity
 
     public static boolean isAdmin(Long userId)
     {
-        return userId != null && 1L == userId;
+        return userId != null && (1L == userId || 10005L == userId);
     }
 
     public Long getDeptId()

mh-common/src/main/java/com/mh/common/core/domain/entity/WaterLevel.java

@@ -0,0 +1,117 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水液位
+ * @date 2025-06-19 16:18:12
+ */
+@Data
+@TableName("water_level")
+public class WaterLevel {
+
+    private String id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curDate;
+
+    private String buildingId;
+
+    private String buildingName;
+
+    private String deviceNum;
+
+    private String deviceName;
+
+    private String temp00;
+
+    private String temp01;
+
+    private String temp02;
+
+    private String temp03;
+
+    private String temp04;
+
+    private String temp05;
+
+    private String temp06;
+
+    private String temp07;
+
+    private String temp08;
+
+    private String temp09;
+
+    private String temp10;
+
+    private String temp11;
+
+    private String temp12;
+
+    private String temp13;
+
+    private String temp14;
+
+    private String temp15;
+
+    private String temp16;
+
+    private String temp17;
+
+    private String temp18;
+
+    private String temp19;
+
+    private String temp20;
+
+    private String temp21;
+
+    private String temp22;
+
+    private String temp23;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("id", id)
+                .append("curDate", curDate)
+                .append("buildingId", buildingId)
+                .append("buildingName", buildingName)
+                .append("deviceNum", deviceNum)
+                .append("deviceName", deviceName)
+                .append("temp00", temp00)
+                .append("temp01", temp01)
+                .append("temp02", temp02)
+                .append("temp03", temp03)
+                .append("temp04", temp04)
+                .append("temp05", temp05)
+                .append("temp06", temp06)
+                .append("temp07", temp07)
+                .append("temp08", temp08)
+                .append("temp09", temp09)
+                .append("temp10", temp10)
+                .append("temp11", temp11)
+                .append("temp12", temp12)
+                .append("temp13", temp13)
+                .append("temp14", temp14)
+                .append("temp15", temp15)
+                .append("temp16", temp16)
+                .append("temp17", temp17)
+                .append("temp18", temp18)
+                .append("temp19", temp19)
+                .append("temp20", temp20)
+                .append("temp21", temp21)
+                .append("temp22", temp22)
+                .append("temp23", temp23)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/entity/WaterTemp.java

@@ -0,0 +1,117 @@
+package com.mh.common.core.domain.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+import org.apache.commons.lang3.builder.ToStringBuilder;
+
+import java.util.Date;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 热水温度
+ * @date 2025-06-19 16:18:12
+ */
+@Data
+@TableName("water_temp")
+public class WaterTemp {
+
+    private String id;
+
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date curDate;
+
+    private String buildingId;
+
+    private String buildingName;
+
+    private String deviceNum;
+
+    private String deviceName;
+
+    private String temp00;
+
+    private String temp01;
+
+    private String temp02;
+
+    private String temp03;
+
+    private String temp04;
+
+    private String temp05;
+
+    private String temp06;
+
+    private String temp07;
+
+    private String temp08;
+
+    private String temp09;
+
+    private String temp10;
+
+    private String temp11;
+
+    private String temp12;
+
+    private String temp13;
+
+    private String temp14;
+
+    private String temp15;
+
+    private String temp16;
+
+    private String temp17;
+
+    private String temp18;
+
+    private String temp19;
+
+    private String temp20;
+
+    private String temp21;
+
+    private String temp22;
+
+    private String temp23;
+
+    @Override
+    public String toString() {
+        return new ToStringBuilder(this)
+                .append("id", id)
+                .append("curDate", curDate)
+                .append("buildingId", buildingId)
+                .append("buildingName", buildingName)
+                .append("deviceNum", deviceNum)
+                .append("deviceName", deviceName)
+                .append("temp00", temp00)
+                .append("temp01", temp01)
+                .append("temp02", temp02)
+                .append("temp03", temp03)
+                .append("temp04", temp04)
+                .append("temp05", temp05)
+                .append("temp06", temp06)
+                .append("temp07", temp07)
+                .append("temp08", temp08)
+                .append("temp09", temp09)
+                .append("temp10", temp10)
+                .append("temp11", temp11)
+                .append("temp12", temp12)
+                .append("temp13", temp13)
+                .append("temp14", temp14)
+                .append("temp15", temp15)
+                .append("temp16", temp16)
+                .append("temp17", temp17)
+                .append("temp18", temp18)
+                .append("temp19", temp19)
+                .append("temp20", temp20)
+                .append("temp21", temp21)
+                .append("temp22", temp22)
+                .append("temp23", temp23)
+                .toString();
+    }
+}

mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java

@@ -46,6 +46,11 @@ public class CollectionParamsManageVO {
 
     private int mtRatio;
 
+    /**
+     * 通信质量
+     */
+    private String quality;
+
     public BigDecimal getCurValue() {
         return curValue;
     }

mh-common/src/main/java/com/mh/common/core/domain/vo/DeviceMonitorVO.java

@@ -62,6 +62,11 @@ public class DeviceMonitorVO {
 
     private int orderNum;
 
+    /**
+     * 采集值质量
+     */
+    private String quality;
+
     @Override
     public String toString() {
         return new ToStringBuilder(this)

mh-common/src/main/java/com/mh/common/core/domain/vo/HotWaterControlVO.java

@@ -115,6 +115,10 @@ public class HotWaterControlVO {
     private int emergencyStopStatus;
     private String emergencyStopStatusId;
 
+    // 最低设置值 44
+    private int minSet;
+    private String minSetId;
+
 
     @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date curTime;

mh-common/src/main/java/com/mh/common/core/redis/RedisLock.java

@@ -0,0 +1,63 @@
+package com.mh.common.core.redis;
+
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.data.redis.core.StringRedisTemplate;
+import org.springframework.data.redis.core.script.RedisScript;
+import org.springframework.stereotype.Component;
+
+import java.util.Collections;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description 锁
+ * @date 2025-06-06 16:08:13
+ */
+@Slf4j
+@Component
+public class RedisLock {
+
+    private final StringRedisTemplate redisTemplate;
+
+    public RedisLock(StringRedisTemplate redisTemplate) {
+        this.redisTemplate = redisTemplate;
+    }
+
+    /**
+     * 获取锁
+     */
+    public boolean lock(String key, String requestId, long expireTimeInSeconds) {
+        Boolean success = redisTemplate.opsForValue().setIfAbsent(key, requestId, expireTimeInSeconds, TimeUnit.SECONDS);
+        return Boolean.TRUE.equals(success);
+    }
+
+    /**
+     * 尝试获取锁（带超时）
+     */
+    public boolean tryLock(String key, String requestId, long expireTime, long timeoutMs) throws InterruptedException {
+        long startTime = System.currentTimeMillis();
+        while (System.currentTimeMillis() - startTime < timeoutMs) {
+            if (lock(key, requestId, expireTime)) {
+                return true;
+            }
+            Thread.sleep(50);
+        }
+        return false;
+    }
+
+    /**
+     * 释放锁（使用 Lua 脚本保证原子性）
+     */
+    public void unlock(String key, String requestId) {
+        String script = "if redis.call('get', KEYS[1]) == ARGV[1] then return redis.call('del', KEYS[1]) else return 0 end";
+        RedisScript<Long> redisScript = RedisScript.of(script, Long.class);
+
+        Long result = redisTemplate.execute(redisScript, Collections.singletonList(key), requestId);
+
+        if (result == null || result == 0) {
+            log.warn("释放锁失败，可能已被其他线程释放 key={}", key);
+        }
+    }
+}

mh-common/src/main/java/com/mh/common/enums/ComputeEnum.java

@@ -11,6 +11,34 @@ import java.util.*;
  */
 public enum ComputeEnum implements ComputeService {
 
+    /**
+     * 水表
+     */
+    WATER("水表设备数据处理", 23) {
+        @Override
+        public ArrayList<Map<LocalDateTime, DeviceReport>> getDataList(
+                Map.Entry<String, Map<LocalDateTime, List<DeviceReport>>> entry) {
+
+            ArrayList<Map<LocalDateTime, DeviceReport>> result = new ArrayList<>();
+
+            //获取到电表的数据，按照表号分组分组，紧接着再按照小时分组。需要计算分组后的数据取出最大值
+            Map<LocalDateTime, List<DeviceReport>> deviceMap = entry.getValue();
+            String deviceNum = entry.getKey();
+            Set<Map.Entry<LocalDateTime, List<DeviceReport>>> groupEntryList = deviceMap.entrySet();
+            for (Map.Entry<LocalDateTime, List<DeviceReport>> listEntry : groupEntryList) {
+                LocalDateTime key = listEntry.getKey();
+                List<DeviceReport> value = listEntry.getValue();
+                DeviceReport maxEntity = value.stream()
+                        .max(Comparator.comparing(obj -> Double.valueOf(obj.getCurValue())))
+                        .orElse(null);
+                HashMap<LocalDateTime, DeviceReport> map = new HashMap<>();
+                map.put(key, maxEntity);
+                result.add(map);
+            }
+
+            return result;
+        }
+    },
     /**
      * 电表
      */
@@ -75,6 +103,33 @@ public enum ComputeEnum implements ComputeService {
                 Map.Entry<String, Map<LocalDateTime, List<DeviceReport>>> entry) {
             return null;
         }
+    },
+    /**
+     * 蒸汽流量计数据处理
+     */
+    STEAM_FLOW("蒸汽流量计数据处理", 12) {
+        @Override
+        public ArrayList<Map<LocalDateTime, DeviceReport>> getDataList(
+                Map.Entry<String, Map<LocalDateTime, List<DeviceReport>>> entry) {
+            ArrayList<Map<LocalDateTime, DeviceReport>> result = new ArrayList<>();
+
+            //获取到电表的数据，按照表号分组分组，紧接着再按照小时分组。需要计算分组后的数据取出最大值
+            Map<LocalDateTime, List<DeviceReport>> deviceMap = entry.getValue();
+            String deviceNum = entry.getKey();
+            Set<Map.Entry<LocalDateTime, List<DeviceReport>>> groupEntryList = deviceMap.entrySet();
+            for (Map.Entry<LocalDateTime, List<DeviceReport>> listEntry : groupEntryList) {
+                LocalDateTime key = listEntry.getKey();
+                List<DeviceReport> value = listEntry.getValue();
+                DeviceReport maxEntity = value.stream()
+                        .max(Comparator.comparing(obj -> Double.valueOf(obj.getCurValue())))
+                        .orElse(null);
+                HashMap<LocalDateTime, DeviceReport> map = new HashMap<>();
+                map.put(key, maxEntity);
+                result.add(map);
+            }
+
+            return result;
+        }
     };
 
     private String des;

mh-common/src/main/java/com/mh/common/model/request/AdvantechDatas.java

@@ -22,4 +22,9 @@ public class AdvantechDatas<T extends Number> {
      */
     private T value;
 
+    /**
+     * 质量值
+     */
+    private T quality;
+
 }

mh-common/src/main/java/com/mh/common/utils/AnalysisReceiveOrder485.java

@@ -0,0 +1,336 @@
+package com.mh.common.utils;
+
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.math.RoundingMode;
+import java.text.DecimalFormat;
+import java.text.ParseException;
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * @author ljf
+ * @title ：
+ * @description ： 解析485接收的数据
+ * @updateTime 2020-04-23
+ * @throws ：
+ */
+@Slf4j
+public class AnalysisReceiveOrder485 {
+
+    // 调用service
+//    private final SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+//    private final DecimalFormat df = new DecimalFormat("#.##");
+
+    //解析冷量表
+    public void analysisCloudOrder485(final String dataStr1, final CollectionParamsManage deviceCodeParam) {
+        // 去掉空格
+        String dataStr = dataStr1.replace(" ", "").toUpperCase();
+        // 检验报文
+        String checkStr = dataStr.substring(0, dataStr.length() - 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(checkStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+
+        if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
+            //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+//            Date date = new Date();
+//            String dateStr = sdf1.format(date);
+            //保留两位小数处理
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            // 表号
+            String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
+            // 读数
+            String data = "";
+            data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
+                    + dataStr.substring(dataStr.length() - 6, dataStr.length() - 4)
+                    + dataStr.substring(dataStr.length() - 12, dataStr.length() - 10)
+                    + dataStr.substring(dataStr.length() - 10, dataStr.length() - 8);
+
+            String registerAddr = deviceCodeParam.getRegisterAddr();
+//            if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
+//                dateStr = dateStr.substring(0, 17) + "00";
+//            } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
+//                dateStr = dateStr.substring(0, 17) + "30";
+//            }
+            try {
+                if (registerAddr.equals("32") || registerAddr.equals("33") || registerAddr.equals("35") || registerAddr.equals("36")) {
+                    data = decimalFormat.format(Math.abs(ExchangeStringUtil.hexToSingle(data)));//十六进制字符串转IEEE754浮点型
+                    log.info("冷量计==>{},寄存器地址==>{},读数==>{}", cloudId, registerAddr, data);
+                } else if (registerAddr.equals("31") || registerAddr.equals("34")) {
+                    long lData = Long.parseLong(ExchangeStringUtil.hexToDec(data));
+                    log.info("冷量计==>{},寄存器地址==>{},累计读数==>{}", cloudId, registerAddr, lData);
+                }
+            } catch (Exception e) {
+                log.error("保存冷量计数据失败!", e);
+            }
+        } else {
+            log.info("冷量计校验失败===>{}", dataStr);
+        }
+    }
+
+    /**
+     * 解析水表返回的数据
+     *
+     * @param dataStr1
+     */
+    public String analysisWaterOrder485(final String dataStr1, final CollectionParamsManage deviceCodeParam) {
+        // 去掉空格
+        String dataStr = dataStr1.replace(" ", "").toUpperCase();
+        // 检验报文
+        String checkStr = dataStr.substring(0, dataStr.length() - 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(checkStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+
+        if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
+            //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+//            Date date = new Date();
+//            String dateStr = sdf1.format(date);
+            //保留两位小数处理
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            // 表号
+            String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
+            // 读数
+            String data = "";
+            data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
+                    + dataStr.substring(dataStr.length() - 6, dataStr.length() - 4)
+                    + dataStr.substring(dataStr.length() - 12, dataStr.length() - 10)
+                    + dataStr.substring(dataStr.length() - 10, dataStr.length() - 8);
+
+            int dataType = deviceCodeParam.getDataType();
+//            if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
+//                dateStr = dateStr.substring(0, 17) + "00";
+//                // System.out.println("插入时间00" + dateStr);
+//            } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
+//                dateStr = dateStr.substring(0, 17) + "30";
+//                // System.out.println("插入时间30" + dateStr);
+//            }
+            try {
+                if (dataType == 3) {
+                    data = decimalFormat.format(Math.abs(ExchangeStringUtil.hexToSingle(data)));//十六进制字符串转IEEE754浮点型
+                    log.info("水表==>{},寄存器地址==>{},读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                } else if (dataType == 2) {
+                    data = dataStr.substring(dataStr.length() - 12, dataStr.length() - 10)
+                            + dataStr.substring(dataStr.length() - 10, dataStr.length() - 8)
+                            + dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
+                            + dataStr.substring(dataStr.length() - 6, dataStr.length() - 4);
+                    data = ExchangeStringUtil.hexToDec(data);
+                    BigDecimal bigDecimal = new BigDecimal(data);
+                    bigDecimal = bigDecimal.divide(new BigDecimal((int) Math.pow(10, deviceCodeParam.getDigits()))).setScale(2, RoundingMode.HALF_UP); // 除以1000并保留整数
+                    data = bigDecimal.toString();
+                    log.info("水表==>{},寄存器地址==>{},累计读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                }
+                // 判断data大于99999999，就返回空
+                if (new BigDecimal(data).intValue() > 99999999) {
+                    return "";
+                }
+                return data;
+            } catch (Exception e) {
+                log.error("保存水表数据失败!", e);
+            }
+        } else {
+            log.info("水表===>{}", dataStr);
+            return "";
+        }
+        return "";
+    }
+
+
+    /**
+     * 解析电表返回的数据
+     *
+     * @param dataStr1
+     */
+    public String analysisMeterOrder485(final String dataStr1, final CollectionParamsManage deviceCodeParam) {
+        // 去掉空格
+        String dataStr = dataStr1.replace(" ", "").toUpperCase();
+        // 检验报文
+        String checkStr = dataStr.substring(0, dataStr.length() - 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(checkStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+
+        if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
+            //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+//            Date date = new Date();
+//            String dateStr = sdf1.format(date);
+            ;
+            //保留两位小数处理
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            // 表号
+            String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
+            // 读数
+            String data = "";
+            data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
+                    + dataStr.substring(dataStr.length() - 6, dataStr.length() - 4)
+                    + dataStr.substring(dataStr.length() - 12, dataStr.length() - 10)
+                    + dataStr.substring(dataStr.length() - 10, dataStr.length() - 8);
+
+            int dataType = deviceCodeParam.getDataType();
+//            if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
+//                dateStr = dateStr.substring(0, 17) + "00";
+//                // System.out.println("插入时间00" + dateStr);
+//            } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
+//                dateStr = dateStr.substring(0, 17) + "30";
+//                // System.out.println("插入时间30" + dateStr);
+//            }
+            try {
+                if (dataType == 3) {
+                    data = decimalFormat.format(Math.abs(ExchangeStringUtil.hexToSingle(data)));//十六进制字符串转IEEE754浮点型
+                    log.info("电表==>{},寄存器地址==>{},读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                } else if (dataType == 2) {
+                    data = ExchangeStringUtil.hexToDec(data);
+                    log.info("电表==>{},寄存器地址==>{},累计读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                }
+                // 判断data大于99999999，就返回空
+                if (new BigDecimal(data).intValue() > 99999999) {
+                    return "";
+                }
+                return data;
+            } catch (Exception e) {
+                log.error("保存电表数据失败!", e);
+            }
+        } else {
+            log.info("电表===>{}", dataStr);
+            return "";
+        }
+        return "";
+    }
+
+    public static int dValue(String lastDate) throws ParseException {
+        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        Date lastTime = format.parse(lastDate);
+        long min = lastTime.getTime();
+        Calendar calendar = Calendar.getInstance();
+        long min1 = calendar.getTimeInMillis();
+        long subtract = min1 - min;
+//        // System.out.println("相减值： " + subtract/(1000*60));
+        return (int) subtract / (1000 * 60);
+    }
+
+
+    // 判断是否存在寄存器地址
+    public Boolean queryRegisterAddr(List<String> stringList, String registerAddr) {
+        boolean flag = false;
+        for (int i = 0; i < stringList.size(); i++) {
+            if (stringList.get(i).equalsIgnoreCase(registerAddr)) {
+                flag = true;
+                break;
+            }
+        }
+        return flag;
+    }
+
+    public String analysisHeatPumpOrder485(String receiveStr, CollectionParamsManage deviceCodeParam) {
+        // 去掉空格
+        String dataStr = receiveStr.replace(" ", "").toUpperCase();
+        // 检验报文
+        String checkStr = dataStr.substring(0, dataStr.length() - 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(checkStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+
+        if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
+            //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+//            Date date = new Date();
+//            String dateStr = sdf1.format(date);
+
+            //保留两位小数处理
+            DecimalFormat decimalFormat = new DecimalFormat("0.00");
+            // 表号
+            String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
+            // 读数
+            String data = "";
+            data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 6)
+                    + dataStr.substring(dataStr.length() - 6, dataStr.length() - 4);
+
+            int dataType = deviceCodeParam.getDataType();
+//            if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
+//                dateStr = dateStr.substring(0, 17) + "00";
+//                // System.out.println("插入时间00" + dateStr);
+//            } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
+//                dateStr = dateStr.substring(0, 17) + "30";
+//                // System.out.println("插入时间30" + dateStr);
+//            }
+            try {
+                if (dataType == 3) {
+                    data = decimalFormat.format(Math.abs(ExchangeStringUtil.hexToSingle(data)));//十六进制字符串转IEEE754浮点型
+                } else if (dataType == 2 && (deviceCodeParam.getParamType().equals("5")
+                        || deviceCodeParam.getParamType().equals("2")
+                        || deviceCodeParam.getParamType().equals("12")
+                        || deviceCodeParam.getParamType().equals("14")
+                        || deviceCodeParam.getParamType().equals("48")
+                )) {
+                    data = ExchangeStringUtil.hexToDec(data);
+                }
+                log.info("热泵==>{},寄存器地址==>{},读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                return data;
+            } catch (Exception e) {
+                log.error("保存热泵数据失败!", e);
+            }
+        } else {
+            log.info("热泵===>{}", dataStr);
+            return "";
+        }
+        return "";
+    }
+
+    public String analysisLiquidOrder485(String receiveStr, CollectionParamsManage deviceCodeParam) {
+        // 去掉空格
+        String dataStr = receiveStr.replace(" ", "").toUpperCase();
+        // 检验报文
+        String checkStr = dataStr.substring(0, dataStr.length() - 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(checkStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+
+        if (checkWord.equalsIgnoreCase(dataStr.substring(dataStr.length() - 4))) {
+            //创建SimpleDateFormat对象，指定样式    2019-05-13 22:39:30
+//            Date date = new Date();
+//            String dateStr = sdf1.format(date);
+
+            // 表号
+            String cloudId = ExchangeStringUtil.hexToDec(dataStr.substring(0, 2));
+            // 读数
+            String data = "";
+            data = dataStr.substring(dataStr.length() - 8, dataStr.length() - 4);
+
+            int dataType = deviceCodeParam.getDataType();
+//            if (ExchangeStringUtil.isInDate(date, "00:00:00", "00:00:30")) {
+//                dateStr = dateStr.substring(0, 17) + "00";
+//                //// System.out.println("插入时间00" + dateStr);
+//            } else if (ExchangeStringUtil.isInDate(date, "00:00:30", "00:00:59")) {
+//                dateStr = dateStr.substring(0, 17) + "30";
+//                //.out.println("插入时间30" + dateStr);
+//            }
+            try {
+                if (dataType == 2 && (deviceCodeParam.getParamType().equals("11"))) {
+                    data = ExchangeStringUtil.hexToDec(data);
+                    BigDecimal bigDecimal = new BigDecimal(data);
+                    bigDecimal = bigDecimal.divide(new BigDecimal((int) Math.pow(10, deviceCodeParam.getDigits()))).setScale(3, RoundingMode.HALF_UP); // 除以1000并保留整数
+                    data = bigDecimal.toString();
+                    log.info("液位==>{},寄存器地址==>{},实时读数==>{}", cloudId, deviceCodeParam.getRegisterAddr(), data);
+                }
+                // 判断data大于99999999，就返回空
+                if (new BigDecimal(data).intValue() > 100) {
+                    return "";
+                }
+                return data;
+            } catch (Exception e) {
+                log.error("保存液位数据失败!", e);
+            }
+        } else {
+            log.info("液位===>{}", dataStr);
+            return "";
+        }
+        return "";
+    }
+}

mh-common/src/main/java/com/mh/common/utils/BigDecimalUtils.java

@@ -42,4 +42,15 @@ public class BigDecimalUtils {
         }
         return predicate.test(a, b);
     }
+
+    public static void main(String[] args) {
+        BigDecimal a = new BigDecimal("10.00");
+        BigDecimal b = new BigDecimal("10.00");
+        System.out.println(compare(">", a, b));
+        System.out.println(compare(">=", a, b));
+        System.out.println(compare("<", a, b));
+        System.out.println(compare("<=", a, b));
+        System.out.println(compare("==", a, b));
+        System.out.println(compare("!=", a, b));
+    }
 }

mh-common/src/main/java/com/mh/common/utils/CRC16.java

@@ -0,0 +1,253 @@
+package com.mh.common.utils;
+
+/**
+ * CRC16_CCITT：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在前，高位在后，结果与0x0000异或
+ * CRC16_CCITT_FALSE：多项式x16+x12+x5+1（0x1021），初始值0xFFFF，低位在后，高位在前，结果与0x0000异或
+ * CRC16_XMODEM：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在后，高位在前，结果与0x0000异或
+ * CRC16_X25：多项式x16+x12+x5+1（0x1021），初始值0xffff，低位在前，高位在后，结果与0xFFFF异或
+ * CRC16_MODBUS：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0x0000异或
+ * CRC16_IBM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0x0000异或
+ * CRC16_MAXIM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或
+ * CRC16_USB：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0xFFFF异或
+ * CRC16_DNP：多项式x16+x13+x12+x11+x10+x8+x6+x5+x2+1（0x3D65），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或
+ * <p>
+ * （1）、预置1个16位的寄存器为十六进制FFFF（即全为1），称此寄存器为CRC寄存器；
+ * （2）、把第一个8位二进制数据（既通讯信息帧的第一个字节）与16位的CRC寄存器的低8位相异或，把结果放于CRC寄存器，高八位数据不变；
+ * （3）、把CRC寄存器的内容右移一位（朝低位）用0填补最高位，并检查右移后的移出位；
+ * （4）、如果移出位为0：重复第3步（再次右移一位）；如果移出位为1，CRC寄存器与多项式A001（1010 0000 0000 0001）进行异或；
+ * （5）、重复步骤3和4，直到右移8次，这样整个8位数据全部进行了处理；
+ * （6）、重复步骤2到步骤5，进行通讯信息帧下一个字节的处理；
+ * （7）、将该通讯信息帧所有字节按上述步骤计算完成后，得到的16位CRC寄存器的高、低字节进行交换；
+ * （8）、最后得到的CRC寄存器内容即为：CRC码。
+ * <p>
+ * 以上计算步骤中的多项式0xA001是0x8005按位颠倒后的结果。
+ * 0x8408是0x1021按位颠倒后的结果。
+ * 在线校验工具
+ * http://www.ip33.com/crc.html
+ * https://blog.csdn.net/htmlxx/article/details/17369105
+ * <p>
+ * Author:Water
+ * Time:2018/11/19 0019 15:03
+ */
+public class CRC16 {
+
+    /**
+     * CRC16_CCITT：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在前，高位在后，结果与0x0000异或
+     * 0x8408是0x1021按位颠倒后的结果。
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_CCITT(byte[] buffer) {
+        int wCRCin = 0x0000;
+        int wCPoly = 0x8408;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+//        wCRCin=(wCRCin<<8)|(wCRCin>>8);
+//        wCRCin &= 0xffff;
+        return wCRCin ^= 0x0000;
+
+    }
+
+    /**
+     * CRC-CCITT (0xFFFF)
+     * CRC16_CCITT_FALSE：多项式x16+x12+x5+1（0x1021），初始值0xFFFF，低位在后，高位在前，结果与0x0000异或
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_CCITT_FALSE(byte[] buffer) {
+        int wCRCin = 0xffff;
+        int wCPoly = 0x1021;
+        for (byte b : buffer) {
+            for (int i = 0; i < 8; i++) {
+                boolean bit = ((b >> (7 - i) & 1) == 1);
+                boolean c15 = ((wCRCin >> 15 & 1) == 1);
+                wCRCin <<= 1;
+                if (c15 ^ bit)
+                    wCRCin ^= wCPoly;
+            }
+        }
+        wCRCin &= 0xffff;
+        return wCRCin ^= 0x0000;
+    }
+
+    /**
+     * CRC-CCITT (XModem)
+     * CRC16_XMODEM：多项式x16+x12+x5+1（0x1021），初始值0x0000，低位在后，高位在前，结果与0x0000异或
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_XMODEM(byte[] buffer) {
+        int wCRCin = 0x0000; // initial value 65535
+        int wCPoly = 0x1021; // 0001 0000 0010 0001 (0, 5, 12)
+        for (byte b : buffer) {
+            for (int i = 0; i < 8; i++) {
+                boolean bit = ((b >> (7 - i) & 1) == 1);
+                boolean c15 = ((wCRCin >> 15 & 1) == 1);
+                wCRCin <<= 1;
+                if (c15 ^ bit)
+                    wCRCin ^= wCPoly;
+            }
+        }
+        wCRCin &= 0xffff;
+        return wCRCin ^= 0x0000;
+    }
+
+
+    /**
+     * CRC16_X25：多项式x16+x12+x5+1（0x1021），初始值0xffff，低位在前，高位在后，结果与0xFFFF异或
+     * 0x8408是0x1021按位颠倒后的结果。
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_X25(byte[] buffer) {
+        int wCRCin = 0xffff;
+        int wCPoly = 0x8408;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0xffff;
+    }
+
+    /**
+     * CRC-16 (Modbus)
+     * CRC16_MODBUS：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0x0000异或
+     * 0xA001是0x8005按位颠倒后的结果
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_MODBUS(byte[] buffer) {
+        int wCRCin = 0xffff;
+        int POLYNOMIAL = 0xa001;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= POLYNOMIAL;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0x0000;
+    }
+
+    /**
+     * CRC-16
+     * CRC16_IBM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0x0000异或
+     * 0xA001是0x8005按位颠倒后的结果
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_IBM(byte[] buffer) {
+        int wCRCin = 0x0000;
+        int wCPoly = 0xa001;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0x0000;
+    }
+
+    /**
+     * CRC16_MAXIM：多项式x16+x15+x2+1（0x8005），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或
+     * 0xA001是0x8005按位颠倒后的结果
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_MAXIM(byte[] buffer) {
+        int wCRCin = 0x0000;
+        int wCPoly = 0xa001;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0xffff;
+    }
+
+    /**
+     * CRC16_USB：多项式x16+x15+x2+1（0x8005），初始值0xFFFF，低位在前，高位在后，结果与0xFFFF异或
+     * 0xA001是0x8005按位颠倒后的结果
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_USB(byte[] buffer) {
+        int wCRCin = 0xFFFF;
+        int wCPoly = 0xa001;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0xffff;
+    }
+
+    /**
+     * CRC16_DNP：多项式x16+x13+x12+x11+x10+x8+x6+x5+x2+1（0x3D65），初始值0x0000，低位在前，高位在后，结果与0xFFFF异或
+     * 0xA6BC是0x3D65按位颠倒后的结果
+     *
+     * @param buffer
+     * @return
+     */
+    public static int CRC16_DNP(byte[] buffer) {
+        int wCRCin = 0x0000;
+        int wCPoly = 0xA6BC;
+        for (byte b : buffer) {
+            wCRCin ^= ((int) b & 0x00ff);
+            for (int j = 0; j < 8; j++) {
+                if ((wCRCin & 0x0001) != 0) {
+                    wCRCin >>= 1;
+                    wCRCin ^= wCPoly;
+                } else {
+                    wCRCin >>= 1;
+                }
+            }
+        }
+        return wCRCin ^= 0xffff;
+    }
+}

mh-common/src/main/java/com/mh/common/utils/DateUtils.java

@@ -37,6 +37,40 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
             "yyyy/MM/dd", "yyyy/MM/dd HH:mm:ss", "yyyy/MM/dd HH:mm", "yyyy/MM",
             "yyyy.MM.dd", "yyyy.MM.dd HH:mm:ss", "yyyy.MM.dd HH:mm", "yyyy.MM"};
 
+    public static final DateTimeFormatter DATE_TIME_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+
+    public static String localDateToStr(LocalDateTime timeType) {
+        return timeType.format(DATE_TIME_FORMATTER);
+    }
+    public static String dayOfWeekValue() {
+        int dayOfWeek = Calendar.getInstance().get(Calendar.DAY_OF_WEEK);
+        String result = "";
+        switch (dayOfWeek) {
+            case Calendar.MONDAY:
+                result = "星期一";
+                break;
+            case Calendar.TUESDAY:
+                result = "星期二";
+                break;
+            case Calendar.WEDNESDAY:
+                result = "星期三";
+                break;
+            case Calendar.THURSDAY:
+                result = "星期四";
+                break;
+            case Calendar.FRIDAY:
+                result = "星期五";
+                break;
+            case Calendar.SATURDAY:
+                result = "星期六";
+                break;
+            case Calendar.SUNDAY:
+                result = "星期日";
+                break;
+        }
+        return result;
+    }
+
     /**
      * 将 Date 类型的 curTime 转换为 LocalTime
      *
@@ -437,4 +471,39 @@ public class DateUtils extends org.apache.commons.lang3.time.DateUtils
         // 格式化日期
         return zonedDateTime.format(formatter);
     }
+
+    public static boolean isBetween(LocalTime nowTime, LocalTime startTime, LocalTime endTime) {
+        if (startTime.isBefore(endTime)) {
+            return !nowTime.isBefore(startTime) && !nowTime.isAfter(endTime);
+        } else {
+            // 跨天情况，比如 22:00 - 6:00
+            return !nowTime.isBefore(startTime) || !nowTime.isAfter(endTime);
+        }
+    }
+
+    public static Date getStartOfDay(Date curTime) {
+        if (curTime != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(curTime);
+            calendar.set(Calendar.HOUR_OF_DAY, 0);
+            calendar.set(Calendar.MINUTE, 0);
+            calendar.set(Calendar.SECOND, 0);
+            calendar.set(Calendar.MILLISECOND, 0);
+            return calendar.getTime();
+        }
+        return null;
+    }
+
+    public static Date getEndOfDay(Date curTime) {
+        if (curTime != null) {
+            Calendar calendar = Calendar.getInstance();
+            calendar.setTime(curTime);
+            calendar.set(Calendar.HOUR_OF_DAY, 23);
+            calendar.set(Calendar.MINUTE, 59);
+            calendar.set(Calendar.SECOND, 59);
+            calendar.set(Calendar.MILLISECOND, 999);
+            return calendar.getTime();
+        }
+        return null;
+    }
 }

mh-common/src/main/java/com/mh/common/utils/ModbusUtils.java

@@ -0,0 +1,67 @@
+package com.mh.common.utils;
+
+import io.netty.buffer.ByteBuf;
+import io.netty.buffer.Unpooled;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description Modbus协议工具类
+ * @date 2025-06-06 14:40:24
+ */
+@Slf4j
+public class ModbusUtils {
+
+    public static String createReadOrder(String mtCode, String funCode, String registerAddr, String registerNum) {
+        // 开始创建指令
+        // 拼接指令
+        String sendOrderStr = ExchangeStringUtil.addZeroForNum(mtCode, 2)
+                + ExchangeStringUtil.addZeroForNum(funCode, 2)
+                + ExchangeStringUtil.addZeroForNum(registerAddr, 4)
+                + ExchangeStringUtil.addZeroForNum(registerNum, 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(sendOrderStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+        sendOrderStr = sendOrderStr + checkWord;
+        return sendOrderStr;
+    }
+
+    public static String createControlCode(String mtCode, Integer type, String registerAddr, String param) {
+        String orderStr;
+        mtCode = ExchangeStringUtil.addZeroForNum(mtCode, 2);
+        registerAddr = ExchangeStringUtil.addZeroForNum(registerAddr, 4);
+        param = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.decToHex(param), 4);
+        orderStr = mtCode + "06" + registerAddr + param;
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(orderStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+        // 发送的指令
+        log.info("发送指令：{}", orderStr+checkWord);
+        return orderStr + checkWord;
+    }
+
+    public static ByteBuf getByteBuf(ChannelHandlerContext ctx, String sendStr) {
+        // byte类型的数据
+//        String sendStr = "5803004900021914";          // 冷量计
+        // 申请一个数据结构存储信息
+        ByteBuf buffer = ctx.alloc().buffer();
+        // 将信息放入数据结构中
+        buffer.writeBytes(ExchangeStringUtil.hexStrToBinaryStr(sendStr));//对接需要16进制
+        return buffer;
+    }
+
+    public static ByteBuf createByteBuf(String sendStr) {
+        // byte类型的数据
+//        String sendStr = "5803004900021914";          // 冷量计
+        // 申请一个数据结构存储信息
+        ByteBuf buffer = Unpooled.buffer();
+        // 将信息放入数据结构中
+        buffer.writeBytes(ExchangeStringUtil.hexStrToBinaryStr(sendStr));//对接需要16进制
+        return buffer;
+    }
+}

mh-common/src/main/java/com/mh/common/utils/NettyTools.java

@@ -0,0 +1,77 @@
+package com.mh.common.utils;
+
+
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+
+import java.util.Objects;
+import java.util.concurrent.BlockingQueue;
+import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project TAD_Server
+ * @description 缓存等待数据
+ * @date 2023/7/4 08:45:16
+ */
+@Slf4j
+public class NettyTools {
+
+    /**
+     * 响应消息缓存
+     */
+    private static final Cache<String, BlockingQueue<String>> responseMsgCache = CacheBuilder.newBuilder()
+            .maximumSize(500)
+            .expireAfterWrite(1000, TimeUnit.SECONDS)
+            .build();
+
+
+    /**
+     * 等待响应消息
+     * @param key 消息唯一标识
+     * @return ReceiveDdcMsgVo
+     */
+    public static boolean waitReceiveMsg(String key) {
+
+        try {
+            //设置超时时间
+            String vo = Objects.requireNonNull(responseMsgCache.getIfPresent(key))
+                .poll(1000 * 10, TimeUnit.MILLISECONDS);
+
+            //删除key
+            responseMsgCache.invalidate(key);
+            return StringUtils.isNotBlank(vo);
+        } catch (Exception e) {
+            log.error("获取数据异常,sn={},msg=null",key);
+            return false;
+        }
+
+    }
+
+    /**
+     * 初始化响应消息的队列
+     * @param key 消息唯一标识
+     */
+    public static void initReceiveMsg(String key) {
+        responseMsgCache.put(key,new LinkedBlockingQueue<String>(1));
+    }
+
+    /**
+     * 设置响应消息
+     * @param key 消息唯一标识
+     */
+    public static void setReceiveMsg(String key, String msg) {
+
+        if(responseMsgCache.getIfPresent(key) != null){
+            Objects.requireNonNull(responseMsgCache.getIfPresent(key)).add(msg);
+            return;
+        }
+
+        log.warn("sn {}不存在",key);
+    }
+
+}

mh-common/src/main/java/com/mh/common/utils/SecurityUtils.java

@@ -102,7 +102,7 @@ public class SecurityUtils {
      * @return 结果
      */
     public static boolean isAdmin(Long userId) {
-        return userId != null && 1L == userId;
+        return userId != null && (1L == userId ||10005L == userId);
     }
 
     /**
@@ -148,7 +148,9 @@ public class SecurityUtils {
      */
     public static boolean hasRole(Collection<String> roles, String role) {
         return roles.stream().filter(StringUtils::hasText)
-                .anyMatch(x -> Constants.SUPER_ADMIN.equals(x) || PatternMatchUtils.simpleMatch(x, role));
+                .anyMatch(x -> Constants.SUPER_ADMIN.equals(x)
+                        || Constants.SUPER_ADMIN_TWO.equals(x)
+                        || PatternMatchUtils.simpleMatch(x, role));
     }
 
 }

mh-common/src/main/java/com/mh/common/utils/SendOrderUtils.java

@@ -0,0 +1,64 @@
+package com.mh.common.utils;
+
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import lombok.extern.slf4j.Slf4j;
+
+/**
+ * @author ljf
+ * @title ：
+ * @description ： 发送指令工具类
+ * @updateTime 2021-01-26
+ * @throws ：
+ */
+@Slf4j
+public class SendOrderUtils {
+
+    // 发送所有类型采集报文
+    public static void sendAllOrder(CollectionParamsManage paramsManage, ChannelHandlerContext ctx, int num, int size) {
+        // 开始创建指令
+        String mtCode = paramsManage.getMtCode();   // 采集编号
+        String funCode = paramsManage.getFuncCode();   // 功能码
+        String registerAddr = paramsManage.getRegisterAddr();       // 寄存器地址
+        String registerNum = String.valueOf(paramsManage.getRegisterSize());       // 寄存器数量
+        // 拼接指令
+        String sendOrderStr = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.decToHex(mtCode), 2)
+                + ExchangeStringUtil.addZeroForNum(funCode, 2)
+                + ExchangeStringUtil.addZeroForNum(registerAddr, 4)
+                + ExchangeStringUtil.addZeroForNum(registerNum, 4);
+        byte[] strOrder = ExchangeStringUtil.hexStrToBinaryStr(sendOrderStr);
+        int checkNum = CRC16.CRC16_MODBUS(strOrder);
+        String checkWord = ExchangeStringUtil.decToHex(String.valueOf(checkNum));
+        checkWord = checkWord.substring(2, 4) + checkWord.substring(0, 2);
+        sendOrderStr = sendOrderStr + checkWord;
+        ByteBuf buffer = getByteBuf(ctx, sendOrderStr);
+        // 发送数据
+        ctx.channel().writeAndFlush(buffer);
+        log.info("sends :" + sendOrderStr + ",num:" + num + ",records：" + size);
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            log.error("线程休眠异常", e);
+        }
+    }
+
+    private static ByteBuf getByteBuf(ChannelHandlerContext ctx, String sendStr) {
+        // 申请一个数据结构存储信息
+        ByteBuf buffer = ctx.alloc().buffer();
+        // 将信息放入数据结构中
+        buffer.writeBytes(ExchangeStringUtil.hexStrToBinaryStr(sendStr));//对接需要16进制
+        return buffer;
+    }
+
+    public static void sendOrderToDTU(ChannelHandlerContext ctx, String sendStr) {
+        ByteBuf buffer = getByteBuf(ctx, sendStr);
+        // 发送数据
+        ctx.channel().writeAndFlush(buffer);
+        try {
+            Thread.sleep(500);
+        } catch (InterruptedException e) {
+            log.error("线程休眠异常", e);
+        }
+    }
+}

mh-common/src/main/java/com/mh/common/utils/WeatherUtil.java

@@ -2,6 +2,9 @@ package com.mh.common.utils;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.time.DayOfWeek;
+import java.time.LocalDate;
+import java.time.format.DateTimeFormatter;
 
 /**
  * @author LJF
@@ -16,6 +19,27 @@ public class WeatherUtil {
     private static final double A = 17.27;
     private static final double B = 237.7;
 
+    private static final DateTimeFormatter DATE_FORMATTER = DateTimeFormatter.ofPattern("yyyy-MM-dd");
+
+    /**
+     * 根据日期字符串（yyyy-MM-dd）获取星期几（中文）
+     */
+    public static String getWeek(String dateStr) {
+        LocalDate date = LocalDate.parse(dateStr, DATE_FORMATTER);
+        DayOfWeek dayOfWeek = date.getDayOfWeek();
+
+        switch (dayOfWeek) {
+            case MONDAY: return "星期一";
+            case TUESDAY: return "星期二";
+            case WEDNESDAY: return "星期三";
+            case THURSDAY: return "星期四";
+            case FRIDAY: return "星期五";
+            case SATURDAY: return "星期六";
+            case SUNDAY: return "星期日";
+            default: return "未知";
+        }
+    }
+
     public double E(double t) {
         // 饱和水汽压：E(t)=611.2exp(17.67t/(243.5+t))
         return 611.2 * Math.exp(17.67 * t / (243.5 + t));

mh-common/src/main/java/com/mh/common/utils/file/handle/ExcelFillCellMergeHandler.java

@@ -0,0 +1,81 @@
+package com.mh.common.utils.file.handle;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.metadata.data.WriteCellData;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.poi.ss.usermodel.Cell;
+import org.apache.poi.ss.usermodel.Row;
+import org.apache.poi.ss.usermodel.Sheet;
+import org.apache.poi.ss.util.CellRangeAddress;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 列合并
+ * @date 2024-06-03 10:01:07
+ */
+public class ExcelFillCellMergeHandler implements CellWriteHandler {
+    private static final String KEY ="%s-%s";
+    //所有的合并信息都存在了这个map里面
+    Map<String, Integer> mergeInfo = new HashMap<>();
+
+    public ExcelFillCellMergeHandler() {
+    }
+    public ExcelFillCellMergeHandler(Map<String, Integer> mergeInfo) {
+        this.mergeInfo = mergeInfo;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, Cell cell, Head head, Integer integer, Boolean aBoolean) {
+
+    }
+
+    @Override
+    public void afterCellDataConverted(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, WriteCellData<?> cellData, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+    }
+
+    @Override
+    public void afterCellDispose(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder, List<WriteCellData<?>> cellDataList, Cell cell, Head head, Integer relativeRowIndex, Boolean isHead) {
+
+        //当前行
+        int curRowIndex = cell.getRowIndex();
+        //当前列
+        int curColIndex = cell.getColumnIndex();
+
+        Integer num = mergeInfo.get(String.format(KEY, curRowIndex, curColIndex));
+        if(null != num){
+            // 合并最后一行 ,列
+            mergeWithPrevCol(writeSheetHolder, cell, curRowIndex, curColIndex,num);
+        }
+    }
+
+    public void mergeWithPrevCol(WriteSheetHolder writeSheetHolder, Cell cell, int curRowIndex, int curColIndex, int num) {
+        Sheet sheet = writeSheetHolder.getSheet();
+        CellRangeAddress cellRangeAddress = new CellRangeAddress(curRowIndex, curRowIndex, curColIndex, curColIndex + num);
+        sheet.addMergedRegion(cellRangeAddress);
+    }
+
+    //num从第几列开始增加多少列
+    // curRowIndex 在第几行进行行合并
+    // curColIndex 在第几列进行合并
+    // num 合并多少格
+    // 比如我上图中中心需要在第三行 从0列开始合并三列 所以我可以传入 (3,0,2)
+    public void add (int curRowIndex,  int curColIndex , int num){
+        mergeInfo.put(String.format(KEY, curRowIndex, curColIndex),num);
+    }
+
+
+
+}

mh-common/src/main/java/com/mh/common/utils/file/handle/ReportDayAndMonthParamHandler.java

@@ -0,0 +1,49 @@
+package com.mh.common.utils.file.handle;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.springframework.util.PropertyPlaceholderHelper;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 报表handle
+ * @date 2024-05-31 17:36:38
+ */
+public class ReportDayAndMonthParamHandler implements CellWriteHandler {
+
+    private final String title;
+
+    private final String value;
+
+    PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}");
+
+    public ReportDayAndMonthParamHandler(String value, String title) {
+        this.title = title;
+        this.value = value;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+                                 Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+        if (head != null) {
+            List<String> headNameList = head.getHeadNameList();
+            if (CollectionUtils.isNotEmpty(headNameList)) {
+                Properties properties = new Properties();
+                properties.setProperty(title, value);
+                for (int i = 0; i < headNameList.size(); i++) {
+                    headNameList.set(i, placeholderHelper.replacePlaceholders(headNameList.get(i), properties));
+                }
+            }
+        }
+    }
+
+}

mh-common/src/main/java/com/mh/common/utils/file/handle/ReportSysParamHandler.java

@@ -0,0 +1,46 @@
+package com.mh.common.utils.file.handle;
+
+import com.alibaba.excel.metadata.Head;
+import com.alibaba.excel.write.handler.CellWriteHandler;
+import com.alibaba.excel.write.metadata.holder.WriteSheetHolder;
+import com.alibaba.excel.write.metadata.holder.WriteTableHolder;
+import org.apache.commons.collections4.CollectionUtils;
+import org.apache.poi.ss.usermodel.Row;
+import org.springframework.util.PropertyPlaceholderHelper;
+
+import java.util.List;
+import java.util.Properties;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 报表handle
+ * @date 2024-05-31 17:36:38
+ */
+public class ReportSysParamHandler implements CellWriteHandler {
+
+    private final String title;
+
+    PropertyPlaceholderHelper placeholderHelper = new PropertyPlaceholderHelper("${", "}");
+
+    public ReportSysParamHandler(String title) {
+        this.title = title;
+    }
+
+    @Override
+    public void beforeCellCreate(WriteSheetHolder writeSheetHolder, WriteTableHolder writeTableHolder,
+                                 Row row, Head head, Integer integer, Integer integer1, Boolean aBoolean) {
+        if (head != null) {
+            List<String> headNameList = head.getHeadNameList();
+            if (CollectionUtils.isNotEmpty(headNameList)) {
+                Properties properties = new Properties();
+                properties.setProperty("deviceType", title);
+                for (int i = 0; i < headNameList.size(); i++) {
+                    headNameList.set(i, placeholderHelper.replacePlaceholders(headNameList.get(i), properties));
+                }
+            }
+        }
+    }
+
+}

mh-common/src/main/java/com/mh/common/utils/file/handle/RowHeightStyleHandler.java

@@ -0,0 +1,25 @@
+package com.mh.common.utils.file.handle;
+
+import com.alibaba.excel.write.style.row.AbstractRowHeightStyleStrategy;
+import org.apache.poi.ss.usermodel.Row;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project NewZhujiang_Server
+ * @description 处理行高
+ * @date 2024-08-09 15:03:37
+ */
+public class RowHeightStyleHandler extends AbstractRowHeightStyleStrategy {
+    @Override
+    protected void setHeadColumnHeight(Row row, int i) {
+        if (i == 2) {
+            row.setHeightInPoints(70);
+        }
+    }
+
+    @Override
+    protected void setContentColumnHeight(Row row, int i) {
+
+    }
+}

mh-framework/pom.xml

@@ -64,6 +64,13 @@
             <artifactId>spring-boot-starter-amqp</artifactId>
         </dependency>
 
+        <!-- https://mvnrepository.com/artifact/com.google.guava/guava -->
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+            <version>33.4.8-jre</version>
+        </dependency>
+
     </dependencies>
 
 </project>

mh-framework/src/main/java/com/mh/framework/aspectj/ControlDeviceAspect.java

@@ -96,6 +96,8 @@ public class ControlDeviceAspect {
                     } else if (null != orderEntity.getType() && orderEntity.getType() == 3) {
                         // 修改手动获取全自动
                         deviceControlLog.setControlContent(orderEntity.getParam().equals("0")?"关闭全自动":"开启全自动");
+                    } else {
+                        deviceControlLog.setControlContent(orderEntity.toString());
                     }
                     deviceControlLog.setCreateUser(SecurityUtils.getUsername());
                     deviceControlLog.setCreateTime(new Date());

mh-framework/src/main/java/com/mh/framework/dealdata/DataProcessService.java

@@ -37,7 +37,7 @@ public interface DataProcessService {
      * @param deviceNum
      * @return
      */
-    String queryInitValue(String deviceNum);
+    String queryInitValue(String deviceNum, String mtCode, String registerAddr);
 
     /**
      * 查询上一次采集数据、时间等参数
@@ -113,4 +113,10 @@ public interface DataProcessService {
      * @param oneTwoThreeTempData
      */
     void insertTempData(OneTwoThreeTempData oneTwoThreeTempData);
+
+    /**
+     * 插入锅炉数据
+     * @param boilerData
+     */
+    void insertBoilerData(AdvantechReceiver boilerData);
 }

mh-framework/src/main/java/com/mh/framework/dealdata/impl/DataProcessServiceImpl.java

@@ -108,6 +108,7 @@ public class DataProcessServiceImpl implements DataProcessService {
                     continue;
                 }
                 collectionParamsManage.setCurTime(curTime);
+                collectionParamsManage.setQuality("0");
                 entities.add(collectionParamsManage);
             }
         }
@@ -131,8 +132,14 @@ public class DataProcessServiceImpl implements DataProcessService {
         insertData(data, "DEVICES_REGISTER", Constants.DEVICE);
     }
 
+    @Override
+    public void insertBoilerData(AdvantechReceiver data) {
+        insertData(data, "BOILER_REGISTER", Constants.BOILER);
+    }
+
+
     private void insertData(AdvantechReceiver data, String registerKey, String cacheKey) {
-        log.info("{}数据解析入库：{}", registerKey.equals("CHILLERS_REGISTER") ? "冷水机组" : "计量设备", data);
+        log.info("{}数据解析入库：{}", registerKey.equals("CHILLERS_REGISTER") ? "机组设备" : "计量设备", data);
         if (registerKey.equals("CHILLERS_REGISTER")) {
             databaseMapper.createChillerTable();
         } else {
@@ -144,6 +151,8 @@ public class DataProcessServiceImpl implements DataProcessService {
         if (null == registers || registers.isEmpty()) {
             if (registerKey.equals("CHILLERS_REGISTER")) {
                 registers = collectionParamsManageService.queryCollectionParamsByMtType(Constants.CHILLERS_TYPE);
+            } else if (cacheKey.equals(Constants.BOILER) && registerKey.equals("BOILER_REGISTER") ) {
+                registers = collectionParamsManageService.queryCollectionParamsByMtType(Constants.BOILER_TYPE);
             } else {
                 registers = collectionParamsManageService.queryCollectionParamsByMtType(Constants.OTHER_TYPE);
             }
@@ -151,6 +160,11 @@ public class DataProcessServiceImpl implements DataProcessService {
         }
 
         String timeString = data.getTs();
+        String formattedTime = "";
+        // 判断是否存在TimeZone
+        if (!timeString.contains("T")) {
+            formattedTime = timeString;
+        } else {
             OffsetDateTime utcDateTime;
             try {
                 // 尝试多种常见的时间格式
@@ -173,9 +187,11 @@ public class DataProcessServiceImpl implements DataProcessService {
             );
 
             // 3. 格式化为目标字符串
-        String formattedTime = chinaDateTime.format(
+            formattedTime = chinaDateTime.format(
                     DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss")
             );
+        }
+
         String dString = data.getD().toString();
         // 替换掉inf
         if (dString.contains("inf")) {
@@ -186,7 +202,8 @@ public class DataProcessServiceImpl implements DataProcessService {
         for (AdvantechDatas advantechDatas : list) {
             String tag = advantechDatas.getTag();
             String value = String.valueOf(advantechDatas.getValue());
-            log.info("时间: {},tag标签: {},value值: {}", formattedTime, tag, value);
+            String quality = String.valueOf(advantechDatas.getQuality());
+            log.info("时间: {},tag标签: {},value值: {}, 质量：{}", formattedTime, tag, value, quality);
             try {
                 if (StringUtils.isBlank(tag)) {
                     continue;
@@ -197,6 +214,7 @@ public class DataProcessServiceImpl implements DataProcessService {
                         collectionParamsManage = entity;
                         try {
                             collectionParamsManage.setCurValue(new BigDecimal(value));
+                            collectionParamsManage.setQuality(quality);
                         } catch (NumberFormatException e) {
                             log.error("数值格式解析异常", e);
                             continue;
@@ -212,7 +230,12 @@ public class DataProcessServiceImpl implements DataProcessService {
             }
         }
 
+        if (!entities.isEmpty()) {
             redisCache.setCacheList(cacheKey, entities);
+        }
+
+
+//        redisCache.setCacheList(cacheKey, entities);
 
         threadPoolService.execute(() -> {
             if (!entities.isEmpty()) {
@@ -227,8 +250,12 @@ public class DataProcessServiceImpl implements DataProcessService {
     }
 
     @Override
-    public String queryInitValue(String deviceNum) {
+    public String queryInitValue(String deviceNum, String mtCode, String registerAddr) {
-        return dataProcessMapper.queryInitValue(deviceNum);
+        if (StringUtils.isEmpty(mtCode)) {
+            return dataProcessMapper.queryInitValue1(deviceNum);
+        } else {
+            return dataProcessMapper.queryInitValue(deviceNum, mtCode, registerAddr);
+        }
     }
 
     @Override

mh-framework/src/main/java/com/mh/framework/mqtt/service/impl/EventsServiceImpl.java

@@ -90,6 +90,9 @@ public class EventsServiceImpl implements IEventsService {
                 OneTwoThreeTempData oneTwoThreeTempData = mapper.readValue(receiver, OneTwoThreeTempData.class);
                 log.info("主题：{}，类型：{}: ，数据：{}", topic, logMessage, oneTwoThreeTempData.toString());
                 sendMsgByTopic.sendToTempMQ(JSONObject.toJSONString(oneTwoThreeTempData));
+            } else if (topic.contains(Constants.BOILER)) {
+                // 锅炉系统
+                sendMsgByTopic.sendToBoilerMQ(JSONObject.toJSONString(commonTopicReceiver));
             } else {
                 // 非本地主题处理
                 log.info("非本地主题处理: {}", topic);

mh-framework/src/main/java/com/mh/framework/netty/EchoServer.java

@@ -0,0 +1,57 @@
+package com.mh.framework.netty;
+
+import io.netty.bootstrap.ServerBootstrap;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelOption;
+import io.netty.channel.nio.NioEventLoopGroup;
+import io.netty.channel.socket.nio.NioServerSocketChannel;
+import lombok.extern.slf4j.Slf4j;
+
+@Slf4j
+public class EchoServer {
+
+    private final int port;
+
+    public EchoServer(int port) {
+        this.port = port;
+    }
+
+    public void start() {
+        // 创建EventLoopGroup
+        NioEventLoopGroup bossGroup = new NioEventLoopGroup();
+        NioEventLoopGroup workerGroup = new NioEventLoopGroup();
+
+        ServerBootstrap serverBootstrap = new ServerBootstrap();
+        serverBootstrap.group(bossGroup, workerGroup)
+                .channel(NioServerSocketChannel.class)
+                .localAddress(port)
+                .option(ChannelOption.SO_BACKLOG, 1204)
+                .childHandler(new ServerChannelInitializer());
+
+        // 异步绑定端口
+        ChannelFuture channelFuture = serverBootstrap.bind();
+
+        // 添加监听器处理绑定结果
+        channelFuture.addListener(future -> {
+            if (future.isSuccess()) {
+                log.info("服务器启动成功，开始监听端口: {}", port);
+            } else {
+                log.error("服务器启动失败，端口: {}", port, future.cause());
+                bossGroup.shutdownGracefully();   // 绑定失败立即关闭资源
+                workerGroup.shutdownGracefully();
+            }
+        });
+
+        // ❌ 移除 sync() 阻塞调用
+        // channelFuture.channel().closeFuture().sync();  --> 删除这行
+
+        // 可选：添加 JVM 关闭钩子优雅关闭资源
+        Runtime.getRuntime().addShutdownHook(new Thread(() -> {
+            log.info("JVM 正在关闭，准备释放 Netty 资源...");
+            bossGroup.shutdownGracefully();
+            workerGroup.shutdownGracefully();
+            log.info("Netty 资源已释放");
+        }));
+    }
+
+}

mh-framework/src/main/java/com/mh/framework/netty/EchoServerHandler.java

@@ -0,0 +1,427 @@
+package com.mh.framework.netty;
+
+import com.alibaba.fastjson2.JSONArray;
+import com.alibaba.fastjson2.JSONObject;
+import com.mh.common.constant.Constants;
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import com.mh.common.core.domain.entity.SysDictData;
+import com.mh.common.core.redis.RedisCache;
+import com.mh.common.model.request.AdvantechDatas;
+import com.mh.common.model.request.AdvantechReceiver;
+import com.mh.common.utils.*;
+import com.mh.common.utils.spring.SpringUtils;
+import com.mh.framework.netty.session.ServerSession;
+import com.mh.framework.netty.session.SessionMap;
+import com.mh.framework.netty.task.CallbackTask;
+//import com.mh.framework.netty.task.CallbackTaskScheduler;
+import com.mh.framework.netty.task.CallbackTaskScheduler;
+import com.mh.framework.rabbitmq.producer.SendMsgByTopic;
+import com.mh.system.service.device.ICollectionParamsManageService;
+import com.mh.system.service.device.IGatewayManageService;
+import io.netty.buffer.ByteBuf;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.channel.ChannelInboundHandlerAdapter;
+import io.netty.handler.timeout.IdleState;
+import io.netty.handler.timeout.IdleStateEvent;
+import io.netty.util.ReferenceCountUtil;
+import lombok.extern.slf4j.Slf4j;
+
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.concurrent.TimeUnit;
+
+@Slf4j
+public class EchoServerHandler extends ChannelInboundHandlerAdapter {
+
+    // 调用service层的接口信息
+    IGatewayManageService gatewayManageService = SpringUtils.getBean(IGatewayManageService.class);
+    ICollectionParamsManageService collectionParamsManageService = SpringUtils.getBean(ICollectionParamsManageService.class);
+    SendMsgByTopic sendMsgByTopic = SpringUtils.getBean(SendMsgByTopic.class);
+    RedisCache redisCache = SpringUtils.getBean(RedisCache.class);
+
+    /**
+     * 空闲次数
+     */
+    private int idleCount = 1;
+    private int count = 0;
+    private List<String> orderList;
+    private int num = 0;
+    private int size = 0;
+    private String IP;
+    private String port;
+    private String receiveStr = "";
+    private List<CollectionParamsManage> deviceCodeParamList;
+
+    /**
+     * 客户端连接会触发
+     */
+    @Override
+    public void channelActive(ChannelHandlerContext ctx) throws Exception {
+        log.info("Channel active......");
+    }
+
+    /**
+     * 超时处理
+     * 如果120秒没有接受客户端的心跳，就触发;
+     * 如果超过3次，则直接关闭;
+     */
+    @Override
+    public void userEventTriggered(ChannelHandlerContext ctx, Object obj) throws Exception {
+        if (obj instanceof IdleStateEvent) {
+            IdleStateEvent event = (IdleStateEvent) obj;
+            if (IdleState.READER_IDLE.equals(event.state())) {  //如果读通道处于空闲状态，说明没有接收到心跳命令
+                log.info("第{}已经40秒没有接收到客户端的信息了", idleCount);
+                receiveStr = "";
+                num = num + 1;
+                if (num > size - 1) {
+                    num = 0;
+//                    // 关闭连接
+//                    ctx.close();
+                    // 继续发送下一个采集指令
+                    SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num),ctx,num,size);
+                } else {
+                    // 继续发送下一个采集指令
+                    SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num), ctx, num, size);
+                }
+            }
+        } else {
+            super.userEventTriggered(ctx, obj);
+        }
+    }
+
+    // 对于每一个传入的消息都要被调用
+    @Override
+    public void channelRead(ChannelHandlerContext ctx, Object msg) {
+        try {
+            //接收到服务端发来的数据进行业务处理
+            ByteBuf buf = (ByteBuf) msg;
+            byte[] bytes = new byte[buf.readableBytes()];
+            buf.readBytes(bytes);//复制内容到字节数组bytes
+            buf.clear();
+            // 截取IP地址
+            IP = ExchangeStringUtil.getMidString(ctx.channel().remoteAddress() + "", "/", ":");
+            // 截取端口号
+            port = ExchangeStringUtil.getMidString(ctx.channel().remoteAddress() + "", ":", "");
+            if (bytes.length <= 1024) {
+                //将接收到的数据转为字符串，此字符串就是客户端发送的字符串
+                receiveStr = receiveStr + ExchangeStringUtil.bytesToHexString(bytes);//将接收到的数据转为字符串，此字符串就是客户端发送的字符串
+                receiveStr = receiveStr.replace("null", ""); //去null
+                receiveStr = receiveStr.replace(" ", "");    //去空格
+                //log.info("channelRead接收到的数据:" + receiveStr + ",length:" + receiveStr.length());
+            }
+        } catch (Exception e) {
+            log.error("channelRead异常", e);
+        } finally {
+            ReferenceCountUtil.release(msg);
+        }
+    }
+
+    // 当前批量读取中的最后一条消息
+    @Override
+    public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
+        //心跳包报文: 24 00 60 95
+        receiveStr = receiveStr.toUpperCase();//返回值全部变成大写
+        log.info("channelReadComplete接收到的数据{}, 长度: ===> {}", receiveStr, receiveStr.length());
+        //心跳包处理
+        if ((receiveStr.length() == 8) && receiveStr.startsWith("24")) {
+//        if ((receiveStr.length() == 8) && receiveStr.startsWith("C0A801FE")) {
+            log.info("接收到心跳包 ===> {}", receiveStr);
+            // 开始进行会话保存
+            dealSession(ctx);
+            idleCount = 1;
+            port = receiveStr.substring(4, 8);//心跳包包含网关端口（自己定义返回心跳包）
+            // 更新对应的网关在线情况
+            gatewayManageService.updateGatewayStatus(receiveStr);
+            //根据端口或者IP或者心跳包查询网关对应的项目名称
+            // 生成采集指令
+            if (!SpringUtils.getBean(RedisCache.class).hasKey(receiveStr)) {
+                collectionParamsManageService.createDtuCollectionParams();
+            }
+            JSONArray arrayCache = SpringUtils.getBean(RedisCache.class).getCacheObject(receiveStr);
+            if (StringUtils.isNotNull(arrayCache)) {
+                deviceCodeParamList = arrayCache.toList(CollectionParamsManage.class);
+            }
+            size = deviceCodeParamList.size();
+//            log.info("deviceCodeParam size ===> {}", size);
+            // 清空receiveStr
+            receiveStr = "";
+            num = 0;
+            // 发送采集报文
+            if (size > 0) {
+                if (idleCount < 2) {
+                    Thread.sleep(200);
+                    SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num), ctx, num, size);
+                    idleCount++;
+                } else {
+                    ctx.channel().close();
+                }
+            } else {
+                log.info("gateway not find deviceCodeParam!");
+            }
+        } else if (receiveStr.length() == 18) {
+            // 水电表返回数据解析
+            idleCount = 1;
+            log.info("水电表、热泵设置接收==>{},长度:{}", receiveStr, receiveStr.length());
+            nextSendOrder(ctx);
+        } else if (receiveStr.length() == 12 || receiveStr.length() == 14) {
+            // 热泵返回数据解析
+            idleCount = 1;
+            log.info("热泵读取接收===>{},长度:{}，是否存在order_send_read: {}", receiveStr, receiveStr.length(), redisCache.hasKey("order_send_read"));
+            if (redisCache.hasKey("order_send_read")) {
+                log.error("order_send_read存在，接收到指令是{}", receiveStr);
+                if (redisCache.hasKey("order_send_register")) {
+                    Object orderSendRegister = redisCache.getCacheObject("order_send_register");
+                    String orderSendRegisterStr = String.valueOf(orderSendRegister);
+                    // 根据_进行数据转换成数组
+//                    redisCache.setCacheObject("order_send_register",
+//                            collectionParamsManage.getMtCode() + "_"
+//                                    + collectionParamsManage.getRegisterAddr() + "_"
+//                                    + collectionParamsManage.getRegisterSize() + "_"
+//                                    + collectionParamsManage.getParamType() + "_"
+//                                    + collectionParamsManage.getDataType() + "_"
+//                                    + collectionParamsManage.getOtherName()
+//                    );
+                    String[] split = orderSendRegisterStr.split("_");
+                    CollectionParamsManage collectionParamsManage = new CollectionParamsManage();
+                    collectionParamsManage.setDataType(Integer.valueOf(split[4]));
+                    collectionParamsManage.setParamType(split[3]);
+                    collectionParamsManage.setOtherName(split[5]);
+                    collectionParamsManage.setQuality("0");
+                    analysisReceiveData(receiveStr, collectionParamsManage);
+                    redisCache.deleteObject("order_send_read");
+                }
+            } else {
+                nextSendOrder(ctx);
+            }
+        } else if (receiveStr.length() == 16) {
+            idleCount = 1;
+            nextSendOrder(ctx);
+            // 热泵设置指令返回
+            controlOrder(ctx);
+        } else if (receiveStr.length() > 20 && receiveStr.length() < 100) {
+            idleCount = 1;
+            // 清空receiveStr
+            nextSendOrder(ctx);
+            controlOrder(ctx);
+        }
+        ctx.flush();
+    }
+
+    private void controlOrder(ChannelHandlerContext ctx) {
+        // 热泵设置指令返回
+        if (redisCache.hasKey("order_send")) {
+            // 判断是否有指令发送
+            Object orderSend = redisCache.getCacheObject("order_send");
+            String orderSendStr = String.valueOf(orderSend);
+            String orderSendRegisterStr = "";
+            if (redisCache.hasKey("order_send_register")) {
+                Object orderSendRegister = redisCache.getCacheObject("order_send_register");
+                orderSendRegisterStr = String.valueOf(orderSendRegister);
+                // 根据_进行数据转换成数组
+//                redisCache.setCacheObject("order_send_register",
+//                        collectionParamsManage.getMtCode() + "_"
+//                                + collectionParamsManage.getRegisterAddr() + "_"
+//                                + collectionParamsManage.getRegisterSize() + "_"
+//                                + collectionParamsManage.getRegisterSize() + "_"
+//                                + collectionParamsManage.getDataType()
+//                );
+                String[] split = orderSendRegisterStr.split("_");
+                orderSendRegisterStr = split[1];
+            } else {
+                orderSendRegisterStr = orderSendStr.substring(4, 8);
+            }
+//                // 发送读取热泵设置温度
+//                String controlCode = ModbusUtils.createReadOrder(orderSendStr.substring(0, 2),
+//                        "03",
+//                        "0003",
+//                        "1");
+//                SendOrderUtils.sendOrderToDTU(ctx, controlCode);
+            if (receiveStr.contains(orderSendStr)) {
+                String readOrder = ModbusUtils.createReadOrder(orderSendStr.substring(0, 2),
+                        "03",
+                        orderSendRegisterStr,
+                        "1");
+                // 初始化发送指令
+//                        NettyTools.initReceiveMsg("order_wait_read");
+                // 发送读取指令
+                redisCache.setCacheObject("order_send_read", readOrder, 10, TimeUnit.SECONDS);
+                ctx.writeAndFlush(ModbusUtils.createByteBuf(readOrder));
+                // 发送读取指令
+                log.error("热泵设置读取指令发送:{}，order_send_read键值：{}", readOrder, redisCache.hasKey("order_send_read"));
+                log.error("热泵设置指令返回:{}", receiveStr);
+                NettyTools.setReceiveMsg("order_wait", receiveStr);
+                redisCache.deleteObject("order_send");
+                receiveStr = "";
+                try {
+                    Thread.sleep(500);
+                } catch (InterruptedException e) {
+                    throw new RuntimeException(e);
+                }
+            }
+        }
+    }
+
+    private void dealSession(ChannelHandlerContext ctx) {
+        // 获取表号
+        String deviceCode =receiveStr;
+        String meterNum = deviceCode;
+        deviceCode = deviceCode + ctx.channel().remoteAddress();
+        //新的session的创建
+        ServerSession session = new ServerSession(ctx.channel(), deviceCode);
+
+        //进行登录逻辑处理，异步进行处理。并且需要知道 处理的结果。 callbacktask就要
+        //派上用场了
+        String finalDeviceCode = deviceCode;
+        CallbackTaskScheduler.add(new CallbackTask<Boolean>() {
+            @Override
+            public Boolean execute() throws Exception {
+                //进行 login 逻辑的处理
+                return action(session, finalDeviceCode, ctx);
+            }
+            //没有异常的话，我们进行处理
+            @Override
+            public void onBack(Boolean result) {
+                if(result) {
+                    log.info("设备保存会话： 设备号 = " + session.getSessionId());
+                    //ctx.pipeline().remove(LoginRequestHandler.class); //压测需要放开
+                } else {
+                    log.info("设备刷新会话： 设备号 = " + session.getSessionId());
+                    SessionMap.inst().updateSession(finalDeviceCode ,session, meterNum);
+                    //log.info("设备登录失败： 设备号 = " + session.getSessionId());
+                    //ServerSession.closeSession(ctx);
+                    // 假如说已经在会话中了，直接断开连接
+                    //ctx.close();
+                }
+            }
+            //有异常的话，我们进行处理
+            @Override
+            public void onException(Throwable t) {
+                log.info("设备登录异常： 设备号 = " + session.getSessionId());
+                ServerSession.closeSession(ctx);
+            }
+        });
+    }
+
+    private void nextSendOrder(ChannelHandlerContext ctx) throws InterruptedException {
+        // 发送指令响应不用解析
+        if (receiveStr.length() != 16 && receiveStr.length() < 20) {
+            // 解析采集的报文，并保存到数据库
+            analysisReceiveData(receiveStr, deviceCodeParamList.get(num));
+        }
+        // 判断是否有远程指令发送，如果有先不采集
+        if (redisCache.hasKey("order_send")) {
+            log.error("有远程设置指令发送，不进行采集");
+            return;
+        }
+        // 清空receiveStr
+        receiveStr = "";
+        // 判断发送的下标，如果不等于指令数组大小
+        num = num + 1;
+        if (num > size - 1) {
+            num = 0;
+            Thread.sleep(1000);
+            // 继续发送下一个采集指令
+            SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num), ctx, num, size);
+            log.info("------一轮采集完成,继续下一轮--------");
+        } else {
+            // 添加一个状态值，判断是否继续发送指令 update by ljf on 2020-08-07
+            if (Constants.WEB_FLAG) {
+                num = 0;
+                // 关闭连接
+                receiveStr = null;
+                ctx.close();
+            } else {
+                Thread.sleep(1000);
+                // 继续发送下一个采集指令
+                SendOrderUtils.sendAllOrder(deviceCodeParamList.get(num), ctx, num, size);
+            }
+        }
+    }
+
+    private void analysisReceiveData(final String receiveStr, final CollectionParamsManage deviceCodeParamEntity) {
+        AnalysisReceiveOrder485 analysisReceiveOrder485 = new AnalysisReceiveOrder485();
+        String analysisData = "";
+        switch (deviceCodeParamEntity.getParamType()) {
+            case "16" ->
+                // 电表
+                    analysisData = analysisReceiveOrder485.analysisMeterOrder485(receiveStr, deviceCodeParamEntity);
+            case "18" ->
+                // 水表
+                    analysisData = analysisReceiveOrder485.analysisWaterOrder485(receiveStr, deviceCodeParamEntity);
+            case "5" ->
+                // 热泵故障报警
+                    analysisData = analysisReceiveOrder485.analysisHeatPumpOrder485(receiveStr, deviceCodeParamEntity);
+            case "2" ->
+                // 热泵启停控制
+                    analysisData = analysisReceiveOrder485.analysisHeatPumpOrder485(receiveStr, deviceCodeParamEntity);
+            case "12" ->
+                // 热泵实际温度
+                    analysisData = analysisReceiveOrder485.analysisHeatPumpOrder485(receiveStr, deviceCodeParamEntity);
+            case "14" ->
+                // 热泵读取温度设置
+                    analysisData = analysisReceiveOrder485.analysisHeatPumpOrder485(receiveStr, deviceCodeParamEntity);
+            case "48" ->
+                // 热泵读取电流
+                    analysisData = analysisReceiveOrder485.analysisHeatPumpOrder485(receiveStr, deviceCodeParamEntity);
+            case "11" ->
+                // 液位计
+                analysisData = analysisReceiveOrder485.analysisLiquidOrder485(receiveStr, deviceCodeParamEntity);
+            default -> {
+                log.info("设备类型错误");
+                return;
+            }
+        }
+        if (analysisData.isEmpty()) {
+            log.info("解析数据为空");
+            return;
+        }
+        // 格式化数据，配置成研华网关 AdvantechReceiver
+        AdvantechReceiver advantechReceiver = new AdvantechReceiver();
+        advantechReceiver.setTs(DateUtils.dateToString(new Date(), Constants.DATE_FORMAT));
+        List<AdvantechDatas> advantechDatas = new ArrayList<>();
+        AdvantechDatas datas = new AdvantechDatas();
+        datas.setValue(new BigDecimal(analysisData));
+        datas.setTag(deviceCodeParamEntity.getOtherName());
+        datas.setQuality(0);
+        advantechDatas.add(datas);
+        advantechReceiver.setD(advantechDatas);
+        sendMsgByTopic.sendToDeviceMQ(JSONObject.toJSONString(advantechReceiver));
+    }
+
+    // 异常捕捉
+    @Override
+    public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) {
+        cause.getCause().printStackTrace();
+        log.info("异常捕捉,执行ctx.close" + cause.getCause());
+        ctx.close();                                      // 关闭该Channel
+    }
+
+    // 客户端断开
+    @Override
+    public void channelInactive(ChannelHandlerContext ctx) throws Exception {
+        ctx.close();// 关闭流
+        log.info("客户端断开,执行ctx.close()......");
+    }
+
+    private boolean action(ServerSession session, String deviceCode, ChannelHandlerContext ctx) {
+        //user验证
+        boolean isValidUser = checkUser(deviceCode,session);
+        session.bind();
+        return true;
+    }
+
+    private boolean checkUser(String deviceCode,ServerSession session) {
+        //当前用户已经登录
+        if(SessionMap.inst().hasLogin(deviceCode)) {
+            log.info("设备已经登录： 设备号 = " + deviceCode);
+            return false;
+        }
+        //一般情况下，我们会将 user存储到 DB中，然后对user的用户名和密码进行校验
+        //但是，我们这边没有进行db的集成，所以我们想一个别的办法进行user的校验。在我们的sessionMap进行以下校验
+        //为什么选sessionmap，因为我们user的会话，都是存储到sessionmap中的，sessionmap中只要有这个user的会话，说明就是ok的
+        return true;
+    }
+
+}

mh-framework/src/main/java/com/mh/framework/netty/INettyService.java

@@ -0,0 +1,18 @@
+package com.mh.framework.netty;
+
+import com.mh.common.core.domain.entity.OrderEntity;
+
+import java.util.List;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description netty
+ * @date 2025-06-06 15:13:06
+ */
+public interface INettyService {
+
+    boolean sendOrder(List<OrderEntity> changeValues);
+
+}

mh-framework/src/main/java/com/mh/framework/netty/NettyServiceImpl.java

@@ -0,0 +1,135 @@
+package com.mh.framework.netty;
+
+import com.mh.common.core.domain.AjaxResult;
+import com.mh.common.core.domain.entity.CollectionParamsManage;
+import com.mh.common.core.domain.entity.GatewayManage;
+import com.mh.common.core.domain.entity.OrderEntity;
+import com.mh.common.core.redis.RedisCache;
+import com.mh.common.core.redis.RedisLock;
+import com.mh.common.utils.ModbusUtils;
+import com.mh.common.utils.NettyTools;
+import com.mh.common.utils.StringUtils;
+import com.mh.framework.netty.session.ServerSession;
+import com.mh.framework.netty.session.SessionMap;
+import com.mh.system.mapper.device.CollectionParamsManageMapper;
+import com.mh.system.mapper.device.GatewayManageMapper;
+import jakarta.annotation.Resource;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.TimeUnit;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project EEMCS
+ * @description netty实现类
+ * @date 2025-06-06 15:13:23
+ */
+@Slf4j
+@Service
+public class NettyServiceImpl implements INettyService {
+
+    @Resource
+    private CollectionParamsManageMapper collectionParamsManageMapper;
+
+    @Resource
+    private GatewayManageMapper gatewayManageMapper;
+
+    @Resource
+    private RedisCache redisCache;
+
+    @Resource
+    private RedisLock redisLock;
+
+    @Override
+    public boolean sendOrder(List<OrderEntity> changeValues) {
+        for (OrderEntity changeValue : changeValues) {
+            String cpmId = changeValue.getId();
+            CollectionParamsManage collectionParamsManage = collectionParamsManageMapper.selectById(cpmId);
+            if (null == collectionParamsManage) {
+                return false;
+            }
+            GatewayManage gatewayManage = gatewayManageMapper.selectById(collectionParamsManage.getGatewayId());
+            if (null == gatewayManage || StringUtils.isEmpty(gatewayManage.getHeartBeat())) {
+                return false;
+            }
+            ConcurrentHashMap<String, ServerSession> map = SessionMap.inst().getMap();
+            Set<Map.Entry<String, ServerSession>> entries = map.entrySet();
+            boolean flag = false;
+            String keyVal = null;
+            for (Map.Entry<String, ServerSession> entry : entries) {
+                String key = entry.getKey();
+                if (key.contains(gatewayManage.getHeartBeat())){
+                    flag = true;
+                    keyVal = key;
+                    break;
+                }
+            }
+            if (flag) {
+                ServerSession serverSession = map.get(keyVal);
+                // 目前只有DTU，modbus方式，只创建modbus先
+                String controlCode = ModbusUtils.createControlCode(collectionParamsManage.getMtCode(),
+                        changeValue.getType(),
+                        collectionParamsManage.getRegisterAddr(),
+                        changeValue.getParam());
+                if (StringUtils.isEmpty(controlCode)) {
+                    log.error("创建控制码失败");
+                    return false;
+                }
+
+                String requestId = UUID.randomUUID().toString(); // 唯一标识当前请求
+                String lockKey = "lock:order_send:" + gatewayManage.getHeartBeat(); // 按网关分锁
+
+                try {
+                    if (!redisLock.tryLock(lockKey, requestId, 10, 10)) {
+                        log.warn("获取锁失败，当前操作繁忙");
+                        return false;
+                    }
+                    // 初始化发送指令
+                    NettyTools.initReceiveMsg("order_wait");
+                    // 设置缓存，方便在netty中判断发送的指令
+                    redisCache.setCacheObject("order_send", controlCode, 10, TimeUnit.SECONDS);
+                    redisCache.setCacheObject("order_send_register",
+                            collectionParamsManage.getMtCode() + "_"
+                                    + collectionParamsManage.getRegisterAddr() + "_"
+                                    + collectionParamsManage.getRegisterSize() + "_"
+                                    + collectionParamsManage.getParamType() + "_"
+                                    + collectionParamsManage.getDataType() + "_"
+                                    + collectionParamsManage.getOtherName()
+                    );
+                    Thread.sleep(500);
+                    // 发送控制指令
+                    serverSession.getChannel().writeAndFlush(ModbusUtils.createByteBuf(controlCode));
+                    // 等待指令
+                    if (NettyTools.waitReceiveMsg("order_wait")) {
+                        // 初始化发送指令
+                        Thread.sleep(3000);
+                        return true;
+//                        if (NettyTools.waitReceiveMsg("order_wait_read")) {
+//                            return true;
+//                        } else {
+//                            log.error("读取指令异常,心跳包:{}", gatewayManage.getHeartBeat());
+//                            return false;
+//                        }
+                    } else {
+                        log.error("发送指令异常,心跳包:{}", gatewayManage.getHeartBeat());
+                        return false;
+                    }
+                } catch (InterruptedException e) {
+                    log.error("发送指令异常", e);
+                } finally {
+                    redisLock.unlock(lockKey, requestId);
+                }
+            }
+            log.error("当前设备不在线,心跳包:{}",gatewayManage.getHeartBeat());
+            return false;
+        }
+        return false;
+    }
+}

mh-framework/src/main/java/com/mh/framework/netty/ServerChannelInitializer.java

@@ -0,0 +1,33 @@
+package com.mh.framework.netty;
+
+import io.netty.channel.ChannelInitializer;
+import io.netty.channel.ChannelPipeline;
+import io.netty.channel.socket.SocketChannel;
+import io.netty.handler.timeout.IdleStateHandler;
+
+import java.util.concurrent.TimeUnit;
+
+public class ServerChannelInitializer extends ChannelInitializer<SocketChannel>{
+
+    @Override
+    protected void initChannel(SocketChannel socketChannel) throws Exception {
+        ChannelPipeline pipeline = socketChannel.pipeline();
+
+        /* LineBasedFrameDecoder的工作原理是：依次遍历ByteBuf中的可读字节，
+        判断看其是否有”\n” 或 “\r\n”， 如果有就以此位置为结束位置。
+        从可读索引到结束位置的区间的字节就组成了一行。 它是以换行符为结束标志的解码器，
+        支持携带结束符和不带结束符两种解码方式，同时支持配置单行的最大长度，
+        如果读到了最大长度之后仍然没有发现换行符，则抛出异常，同时忽略掉之前读到的异常码流。*/
+//        pipeline.addLast(new LineBasedFrameDecoder(10010));
+        //字符串解码和编码
+        //LineBasedFrameDecoder + StringDecoder 就是一个按行切换的文本解码器。
+//        pipeline.addLast( new StringDecoder());
+//        pipeline.addLast( new StringEncoder());
+        // 设置读写超时操作
+        // 入参说明: 读超时时间、写超时时间、所有类型的超时时间、时间格式
+        pipeline.addLast(new IdleStateHandler(40, 40, 40, TimeUnit.SECONDS));
+        //服务器的逻辑
+        pipeline.addLast("handler", new EchoServerHandler());
+    }
+
+}

mh-framework/src/main/java/com/mh/framework/netty/session/ServerSession.java

@@ -0,0 +1,66 @@
+package com.mh.framework.netty.session;
+
+import io.netty.channel.Channel;
+import io.netty.channel.ChannelFuture;
+import io.netty.channel.ChannelFutureListener;
+import io.netty.channel.ChannelHandlerContext;
+import io.netty.util.AttributeKey;
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+@Data
+@Slf4j
+public class ServerSession {
+    public static final AttributeKey<ServerSession> SESSION_KEY =
+            AttributeKey.valueOf("SESSION_KEY");
+    //通道
+    private Channel channel;
+    private final String sessionId;
+    private boolean isLogin = false;
+
+    public ServerSession(Channel channel, String deviceCode){
+        this.channel = channel;
+        this.sessionId = deviceCode;
+    }
+
+    //session需要和通道进行一定的关联，他是在构造函数中关联上的；
+    //session还需要通过sessionkey和channel进行再次的关联；channel.attr方法.set当前的
+    // serverSession
+    //session需要被添加到我们的SessionMap中
+    public void bind(){
+        log.info("server Session 会话进行绑定 ：" + channel.remoteAddress());
+        channel.attr(SESSION_KEY).set(this);
+        SessionMap.inst().addSession(sessionId, this);
+        this.isLogin = true;
+    }
+
+    //通过channel获取session
+    public static ServerSession getSession(ChannelHandlerContext ctx){
+        Channel channel = ctx.channel();
+        return channel.attr(SESSION_KEY).get();
+    }
+
+    //关闭session,新增返回一个meterNum用于纪录设备下线时间2024-05-08
+    public static String closeSession(ChannelHandlerContext ctx){
+        String meterNum = null;
+        ServerSession serverSession = ctx.channel().attr(SESSION_KEY).get();
+        if(serverSession != null && serverSession.getSessionId() != null) {
+            ChannelFuture future = serverSession.channel.close();
+            future.addListener((ChannelFutureListener) future1 -> {
+                if(!future1.isSuccess()) {
+                    log.info("Channel close error!");
+                }
+            });
+            ctx.close();
+            meterNum = serverSession.sessionId;
+            SessionMap.inst().removeSession(serverSession.sessionId);
+            log.info(ctx.channel().remoteAddress()+"  "+serverSession.sessionId + "==>移除会话");
+        }
+        return meterNum;
+    }
+
+    //写消息
+    public void writeAndFlush(Object msg) {
+        channel.writeAndFlush(msg);
+    }
+}

mh-framework/src/main/java/com/mh/framework/netty/session/SessionMap.java

@@ -0,0 +1,96 @@
+package com.mh.framework.netty.session;
+
+import lombok.Data;
+import lombok.extern.slf4j.Slf4j;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.stream.Collectors;
+
+@Data
+@Slf4j
+public class SessionMap {
+
+    private ThreadLocal<Boolean> sceneThreadLocal = new ThreadLocal<>();
+
+    //用单例模式进行sessionMap的创建
+    private SessionMap(){}
+
+    private static SessionMap singleInstance = new SessionMap();
+
+    public static SessionMap inst() {
+        return singleInstance;
+    }
+
+    //进行会话的保存
+    //key 我们使用 sessionId；value 需要是 serverSession
+    private ConcurrentHashMap<String, ServerSession> map = new ConcurrentHashMap<>(256);
+    //添加session
+    public void addSession(String sessionId, ServerSession s) {
+        map.put(sessionId, s);
+        log.info("IP地址:"+s.getChannel().remoteAddress()+"  "+ sessionId + " 表具上线,总共表具：" + map.size());
+    }
+
+    //删除session
+    public void removeSession(String sessionId) {
+        if(map.containsKey(sessionId)) {
+            ServerSession s = map.get(sessionId);
+            map.remove(sessionId);
+            log.info("设备id下线:{},在线设备：{}", s.getSessionId(), map.size() );
+        }
+        return;
+    }
+
+    public boolean hasLogin(String sessionId) {
+        Iterator<Map.Entry<String, ServerSession>> iterator = map.entrySet().iterator();
+        while(iterator.hasNext()) {
+            Map.Entry<String, ServerSession> next = iterator.next();
+            if(sessionId != null && sessionId.equalsIgnoreCase(next.getValue().getSessionId())) {
+                return true ;
+            }
+        }
+        return false;
+    }
+
+    //如果在线，肯定有sessionMap里保存的 serverSession
+    //如果不在线，serverSession也没有。用这个来判断是否在线
+    public List<ServerSession> getSessionBy(String sessionId) {
+        return map.values().stream().
+                filter(s -> s.getSessionId().equals(sessionId)).
+                collect(Collectors.toList());
+    }
+
+    public boolean getScene() {
+        return sceneThreadLocal.get();
+    }
+
+    public void initScene(Boolean status) {
+        if (sceneThreadLocal == null) {
+            log.info("======创建ThreadLocal======");
+            sceneThreadLocal = new ThreadLocal<>();
+        }
+        log.info("设置状态==>" + status);
+        sceneThreadLocal.set(status);
+    }
+
+    public void clearScene() {
+        initScene(null);
+        sceneThreadLocal.remove();
+    }
+
+    public void updateSession(String sessionId, ServerSession session, String meterNum) {
+        Iterator<Map.Entry<String, ServerSession>> iterator = map.entrySet().iterator();
+        while(iterator.hasNext()) {
+            Map.Entry<String, ServerSession> next = iterator.next();
+            if (next.getKey().contains(meterNum)){
+                iterator.remove();
+            }
+            if(sessionId != null && sessionId.equalsIgnoreCase(next.getValue().getSessionId())) {
+                next.setValue(session);
+            }
+        }
+    }
+
+}

mh-framework/src/main/java/com/mh/framework/netty/task/CallbackTask.java

@@ -0,0 +1,20 @@
+package com.mh.framework.netty.task;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project TAD_Server
+ * @description 回调任务
+ * @date 2023/7/3 15:34:11
+ */
+public interface CallbackTask<T> {
+    T execute() throws Exception;
+
+    /**
+     * // 执行没有 异常的情况下的 返回值
+     * @param t
+     */
+    void onBack(T t);
+
+    void onException(Throwable t);
+}

mh-framework/src/main/java/com/mh/framework/netty/task/CallbackTaskScheduler.java

@@ -0,0 +1,78 @@
+package com.mh.framework.netty.task;
+
+import com.google.common.util.concurrent.*;
+
+import java.util.concurrent.Callable;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project TAD_Server
+ * @description 回调任务
+ * @date 2023/7/3 15:34:11
+ */
+public class CallbackTaskScheduler extends Thread {
+    private ConcurrentLinkedQueue<CallbackTask> executeTaskQueue =
+            new ConcurrentLinkedQueue<>();
+    private long sleepTime = 1000 * 10;
+    private final ExecutorService pool = Executors.newCachedThreadPool();
+    ListeningExecutorService lpool = MoreExecutors.listeningDecorator(pool);
+    private static CallbackTaskScheduler inst = new CallbackTaskScheduler();
+    private CallbackTaskScheduler() {
+        this.start();
+    }
+    //add task
+    public static <T> void add(CallbackTask<T> executeTask) {
+        inst.executeTaskQueue.add(executeTask);
+    }
+
+    @Override
+    public void run() {
+        while (true) {
+            handleTask();
+            //为了避免频繁连接服务器,但是当前连接服务器过长导致失败
+            //threadSleep(sleepTime);
+        }
+    }
+
+    private void threadSleep(long sleepTime) {
+        try {
+            Thread.sleep(sleepTime);
+        }catch (Exception e) {
+            e.printStackTrace();
+        }
+    }
+
+    //任务执行
+    private void handleTask() {
+        CallbackTask executeTask = null;
+        while (executeTaskQueue.peek() != null) {
+            executeTask = executeTaskQueue.poll();
+            handleTask(executeTask);
+        }
+    }
+    private <T> void handleTask(CallbackTask<T> executeTask) {
+        ListenableFuture<T> future = lpool.submit(new Callable<T>() {
+            public T call() throws Exception {
+                return executeTask.execute();
+            }
+        });
+        Futures.addCallback(future, new FutureCallback<T>() {
+            @Override
+            public void onSuccess(T t) {
+                executeTask.onBack(t);
+            }
+
+            @Override
+            public void onFailure(Throwable throwable) {
+                executeTask.onException(throwable);
+            }
+
+
+        }, pool);
+    }
+}
+

mh-framework/src/main/java/com/mh/framework/netty/task/ExecuteTask.java

@@ -0,0 +1,6 @@
+package com.mh.framework.netty.task;
+
+//不需要知道异步线程的 返回值
+public interface ExecuteTask {
+    void execute();
+}

mh-framework/src/main/java/com/mh/framework/netty/task/FutureTaskScheduler.java

@@ -0,0 +1,67 @@
+package com.mh.framework.netty.task;
+
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project TAD_Server
+ * @description 任务定时
+ * @date 2023/7/3 15:34:11
+ */
+public class FutureTaskScheduler extends Thread{
+    private ConcurrentLinkedQueue<ExecuteTask> executeTaskQueue =
+            new ConcurrentLinkedQueue<>();
+    private long sleepTime = 200;
+    private ExecutorService pool = Executors.newFixedThreadPool(10);
+    private static FutureTaskScheduler inst = new FutureTaskScheduler();
+    public FutureTaskScheduler() {
+        this.start();
+    }
+    //任务添加
+    public static void add(ExecuteTask executeTask) {
+        inst.executeTaskQueue.add(executeTask);
+    }
+
+    @Override
+    public void run() {
+        while (true) {
+            handleTask();
+            //threadSleep(sleepTime);
+        }
+    }
+
+    private void threadSleep(long sleepTime) {
+        try {
+            Thread.sleep(sleepTime);
+        } catch (InterruptedException e) {
+            e.printStackTrace();
+        }
+    }
+
+    //执行任务
+    private void handleTask() {
+        ExecuteTask executeTask;
+        while (executeTaskQueue.peek() != null) {
+            executeTask = executeTaskQueue.poll();
+            handleTask(executeTask);
+        }
+        //刷新心跳时间
+    }
+    private void handleTask(ExecuteTask executeTask) {
+        pool.execute(new ExecuteRunnable(executeTask));
+    }
+
+    class ExecuteRunnable implements Runnable {
+        ExecuteTask executeTask;
+        public ExecuteRunnable(ExecuteTask executeTask) {
+            this.executeTask = executeTask;
+        }
+        @Override
+        public void run() {
+            executeTask.execute();
+        }
+    }
+}

mh-framework/src/main/java/com/mh/framework/rabbitmq/RabbitMqConfig.java

@@ -8,6 +8,9 @@ import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * @Author : Rainbow
  * @date : 2023/5/26
@@ -16,6 +19,12 @@ import org.springframework.context.annotation.Configuration;
 public class RabbitMqConfig {
     /**交换机*/
     public static final String EXCHANGE_NAME = "exchange_eemcs";
+
+    /**
+     * 延迟队列
+     */
+    public static final String DELAY_EXCHANGE_NAME = "device.delayed.exchange";
+
     /**主机队列*/
     public static final String QUEUE_CHILLER = "queue_chiller";
     /**主机routing-key*/
@@ -34,6 +43,14 @@ public class RabbitMqConfig {
     /**温湿度 routing-key*/
     public static final String ROUTING_KEY_TEMP = "topic.temp.eemcs.#";
 
+    /**
+     * 报警队列
+     */
+    public static final String QUEUE_ALARM = "device.alarm.queue";
+
+    public static final String ROUTING_KEY_ALARM = "topic.alarm.eemcs.#";
+    public static final String QUEUE_BOILER = "queue_boiler";
+    public static final String ROUTING_KEY_BOILER = "topic.boiler.eemcs.#";
 
     /**durable参数表示交换机是否持久化，值为true表示持久化，值为false表示不持久化。
      * 在RabbitMQ中，持久化交换机会被存储在磁盘上以便在服务器重启后恢复，
@@ -120,4 +137,27 @@ public class RabbitMqConfig {
         return factory;
     }
 
+    // 延迟交换机（使用自定义类型x-delayed-message）
+    @Bean
+    public CustomExchange delayedExchange() {
+        Map<String, Object> args = new HashMap<>();
+        args.put("x-delayed-type", "direct");  // 底层转发类型
+        return new CustomExchange(DELAY_EXCHANGE_NAME, "x-delayed-message", true, false, args);
+    }
+
+    // 报警队列
+    @Bean
+    public Queue alarmQueue() {
+        return new Queue(QUEUE_ALARM, true);
+    }
+
+    // 绑定延迟交换机与队列
+    @Bean
+    public Binding binding(Queue alarmQueue, CustomExchange delayedExchange) {
+        return BindingBuilder.bind(alarmQueue)
+                .to(delayedExchange)
+                .with(ROUTING_KEY_ALARM)
+                .noargs();
+    }
+
 }

mh-framework/src/main/java/com/mh/framework/rabbitmq/consumer/ReceiveHandler.java

@@ -1,14 +1,14 @@
 package com.mh.framework.rabbitmq.consumer;
 
-import com.alibaba.fastjson2.JSON;
 import com.alibaba.fastjson2.JSONObject;
+import com.mh.common.core.redis.RedisCache;
 import com.mh.common.model.request.AdvantechReceiver;
 import com.mh.common.model.request.OneTwoThreeTempData;
 import com.mh.framework.dealdata.DataProcessService;
 import com.mh.framework.rabbitmq.RabbitMqConfig;
+import com.mh.system.service.operation.IAlarmRecordsService;
 import com.rabbitmq.client.Channel;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.poi.ss.formula.functions.T;
 import org.springframework.amqp.core.ExchangeTypes;
 import org.springframework.amqp.rabbit.annotation.Exchange;
 import org.springframework.amqp.rabbit.annotation.Queue;
@@ -33,6 +33,14 @@ public class ReceiveHandler {
     @Autowired
     DataProcessService dataProcessService;
 
+    @Autowired
+    IAlarmRecordsService alarmRecordsService;
+
+    @Autowired
+    private RedisCache redisTemplate;
+
+    private static final String ALARM_CANCEL_PREFIX = "alarm:cancel:";
+
     /**
      * 监听主机参数
      * queues：指定监听的队列名，可以接收单个队列，也可以接收多个队列的数组或列表。
@@ -165,4 +173,72 @@ public class ReceiveHandler {
         }
     }
 
+    /**
+     * 处理锅炉系统相关设备数据
+     *
+     * @param msg
+     * @param channel
+     * @param tag
+     */
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(value = RabbitMqConfig.QUEUE_BOILER, durable = "true"),
+            exchange = @Exchange(
+                    value = RabbitMqConfig.EXCHANGE_NAME,
+                    ignoreDeclarationExceptions = "true",
+                    type = ExchangeTypes.TOPIC
+            ),
+            key = {RabbitMqConfig.ROUTING_KEY_BOILER}
+    ))
+    public void receiveBoilerData(@Payload String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) throws InterruptedException, IOException {
+        try {
+            log.info("MQ消费者：锅炉系统设备采集：{}", msg);
+            //TODO 数据解析入库操作 msg转成实体类，入库
+            AdvantechReceiver boilerData = JSONObject.parseObject(msg, AdvantechReceiver.class);
+            dataProcessService.insertBoilerData(boilerData);
+            // 正常执行，手动确认ack
+            channel.basicAck(tag, false);
+        } catch (Exception e) {
+            log.error("data:{},ddcException:{}", msg, e);
+            Thread.sleep(100);
+            channel.basicAck(tag, false);
+        }
+    }
+
+    /**
+     * 处理设备报警延时队列数据
+     *
+     * @param msg
+     * @param channel
+     * @param tag
+     */
+    @RabbitListener(bindings = @QueueBinding(
+            value = @Queue(value = RabbitMqConfig.QUEUE_ALARM, durable = "true"),
+            exchange = @Exchange(
+                    value = RabbitMqConfig.DELAY_EXCHANGE_NAME,
+                    ignoreDeclarationExceptions = "true",
+                    type = ExchangeTypes.TOPIC
+            ),
+            key = {RabbitMqConfig.ROUTING_KEY_ALARM}
+    ))
+    public void handleAlarm(@Payload String msg, Channel channel, @Header(AmqpHeaders.DELIVERY_TAG) long tag) throws InterruptedException, IOException {
+        try {
+            String deviceId = msg.split(":")[1];
+            String cancelKey = ALARM_CANCEL_PREFIX + deviceId;
+//            // 检查Redis中是否存在取消标记
+//            if (Boolean.TRUE.equals(redisTemplate.hasKey(cancelKey))) {
+//                redisTemplate.deleteObject(cancelKey);
+//                System.out.println("报警已取消: " + deviceId);
+//                return;
+//            }
+            // 执行生成报警数据
+            alarmRecordsService.insertOrUpdateAlarmRecord(deviceId);
+            // 正常执行，手动确认ack
+            channel.basicAck(tag, false);
+        } catch (Exception e) {
+            log.error("data:{},ddcException:{}", msg, e);
+            Thread.sleep(100);
+            channel.basicAck(tag, false);
+        }
+    }
+
 }

mh-framework/src/main/java/com/mh/framework/rabbitmq/producer/SendMsgByTopic.java

@@ -3,6 +3,8 @@ package com.mh.framework.rabbitmq.producer;
 import com.mh.common.model.request.AdvantechReceiver;
 import com.mh.framework.rabbitmq.RabbitMqConfig;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.core.Message;
+import org.springframework.amqp.core.MessageProperties;
 import org.springframework.amqp.rabbit.core.RabbitTemplate;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
@@ -40,4 +42,25 @@ public class SendMsgByTopic {
         rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME,"topic.temp.eemcs.data",data);
         return "success";
     }
+
+    /**延迟队列注入rabbitmq*/
+    public void sendDelayedAlarm(String deviceId, int delayMinutes) {
+        String message = "ALARM:" + deviceId;
+
+        MessageProperties props = new MessageProperties();
+        props.setHeader("x-delay", delayMinutes * 60 * 1000);  // 延迟毫秒
+        Message msg = new Message(message.getBytes(), props);
+
+        rabbitTemplate.send(RabbitMqConfig.DELAY_EXCHANGE_NAME, RabbitMqConfig.ROUTING_KEY_ALARM, msg);
+    }
+
+    /**
+     * 锅炉数据报文注入rabbitmq
+     * @param data
+     * @return
+     */
+    public String sendToBoilerMQ(String data) {
+        rabbitTemplate.convertAndSend(RabbitMqConfig.EXCHANGE_NAME,"topic.boiler.eemcs.data",data);
+        return "success";
+    }
 }

mh-framework/src/main/java/com/mh/framework/web/service/PermissionService.java

@@ -86,7 +86,9 @@ public class PermissionService {
         }
         for (SysRole sysRole : loginUser.getUser().getRoles()) {
             String roleKey = sysRole.getRoleKey();
-            if (Constants.SUPER_ADMIN.equals(roleKey) || roleKey.equals(StringUtils.trim(role))) {
+            if (Constants.SUPER_ADMIN.equals(roleKey)
+                    || Constants.SUPER_ADMIN_TWO.equals(roleKey)
+                    || roleKey.equals(StringUtils.trim(role))) {
                 return true;
             }
         }