1、兼容MQTT协议

pom.xml

@@ -17,7 +17,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>2.7.18</version>
+        <version>2.2.5.RELEASE</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
 
@@ -50,33 +50,21 @@
         <dependency>
             <groupId>org.springframework</groupId>
             <artifactId>spring-messaging</artifactId>
-            <version>5.3.39</version>
+            <version>6.2.1</version>
         </dependency>
 
         <!-- spring-integration-mqtt -->
-        <dependency>
-            <groupId>org.springframework.integration</groupId>
-            <artifactId>spring-integration-core</artifactId>
-            <version>5.5.18</version>
-        </dependency>
         <dependency>
             <groupId>org.springframework.integration</groupId>
             <artifactId>spring-integration-mqtt</artifactId>
-            <version>5.5.18</version>
+            <version>6.3.4</version>
         </dependency>
-
-        <!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-starter-integration</artifactId>-->
-<!--            <version>3.4.2</version>-->
-<!--        </dependency>-->
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-validation</artifactId>
+            <artifactId>spring-boot-starter-integration</artifactId>
+            <version>3.4.2</version>
         </dependency>
 
-
     </dependencies>
 
     <dependencyManagement>

user-service/pom.xml

@@ -58,11 +58,6 @@
             <artifactId>mybatis-spring-boot-starter</artifactId>
             <version>2.3.0</version>
         </dependency>
-        <dependency>
-            <groupId>tk.mybatis</groupId>
-            <artifactId>mapper</artifactId>
-            <version>4.2.3</version>
-        </dependency>
         <!--        druid配置-->
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -124,6 +119,12 @@
             <optional>true</optional>
         </dependency>
 
+        <dependency>
+            <groupId>tk.mybatis</groupId>
+            <artifactId>mapper</artifactId>
+            <version>3.3.9</version>
+        </dependency>
+
         <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>

user-service/src/main/java/com/mh/user/config/CorsConfig.java

@@ -29,12 +29,12 @@ public class CorsConfig implements WebMvcConfigurer {
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/**")  // 允许跨域访问的路径
+        registry.addMapping("/**")	// 允许跨域访问的路径
-                .allowedOriginPatterns("*")  // 使用allowedOriginPatterns代替allowedOrigins
+        .allowedOrigins("*")	// 允许跨域访问的源
-                .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")  // 允许请求方法
+        .allowedMethods("POST", "GET", "PUT", "OPTIONS", "DELETE")	// 允许请求方法
-                .maxAge(168000)  // 预检间隔时间
+        .maxAge(168000)	// 预检间隔时间
-                .allowedHeaders("*")  // 允许头部设置
+        .allowedHeaders("*")  // 允许头部设置
-                .allowCredentials(true);  // 是否发送cookie
+        .allowCredentials(true);	// 是否发送cookie
     }
 
 }

user-service/src/main/java/com/mh/user/config/mqtt/InboundMessageRouter.java

@@ -0,0 +1,62 @@
+package com.mh.user.config.mqtt;
+
+import com.mh.user.config.MHConfig;
+import com.mh.user.constants.ChannelName;
+import com.mh.user.constants.TopicEnum;
+import com.mh.user.utils.SpringBeanUtil;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.integration.annotation.Router;
+import org.springframework.integration.mqtt.support.MqttHeaders;
+import org.springframework.integration.router.AbstractMessageRouter;
+import org.springframework.messaging.Message;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHeaders;
+import org.springframework.stereotype.Component;
+
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Objects;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project springboot-mqtt-demo
+ * @description 入站消息路由分发中心
+ * @date 2024-10-29 17:04:17
+ */
+@Slf4j
+@Component
+public class InboundMessageRouter extends AbstractMessageRouter {
+
+    /** 系统基础配置 */
+    @Autowired
+    private MHConfig mHConfig;
+
+    /**
+     * 目前只需要这个方式，后期在拓展使用IntegrationFlow方式
+     * @param message
+     * @return
+     */
+    @Router(inputChannel = ChannelName.INBOUND)
+    @Override
+    protected Collection<MessageChannel> determineTargetChannels(Message<?> message) {
+        MessageHeaders headers = message.getHeaders();
+        String topic = Objects.requireNonNull(headers.get(MqttHeaders.RECEIVED_TOPIC)).toString();
+//        byte[] payload = (byte[]) message.getPayload();
+//        log.info("从当前主题 topic: {}, 接收到的消息：{}", topic, new String(payload));
+        // 判断当前主题是否是当前项目的,温湿度目前写死的
+        if (!topic.startsWith(mHConfig.getName()) && !topic.contains("/temp")) {
+            log.info("当前主题 topic: {} 不是当前项目的，直接丢弃", topic);
+            return Collections.singleton((MessageChannel) SpringBeanUtil.getBean(ChannelName.DEFAULT_BOUND));
+        }
+        // 找到对应的主题消息通道
+        if (topic.contains("/temp")) {
+            return Collections.singleton((MessageChannel) SpringBeanUtil.getBean(ChannelName.EVENTS_UPLOAD_INBOUND));
+        } else {
+            TopicEnum topicEnum = TopicEnum.find(mHConfig.getName() + "/", topic);
+            MessageChannel bean = (MessageChannel) SpringBeanUtil.getBean(topicEnum.getBeanName());
+            return Collections.singleton(bean);
+        }
+    }
+}

user-service/src/main/java/com/mh/user/config/mqtt/MqttConfig.java

@@ -0,0 +1,99 @@
+package com.mh.user.config.mqtt;
+
+import com.mh.user.constants.MqttClientOptions;
+import com.mh.user.constants.MqttProtocolEnum;
+import com.mh.user.constants.MqttUseEnum;
+import lombok.Data;
+import org.eclipse.paho.client.mqttv3.MqttConnectOptions;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.mqtt.core.DefaultMqttPahoClientFactory;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.util.StringUtils;
+
+import java.util.Map;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project springboot-mqtt-demo
+ * @description mqtt连接配置
+ * @date 2024-10-29 14:44:51
+ */
+@Configuration
+@Data
+@ConfigurationProperties
+public class MqttConfig {
+
+    private static Map<MqttUseEnum, MqttClientOptions> mqttSpring;
+
+    public void setMqttSpring(Map<MqttUseEnum, MqttClientOptions> mqtt) {
+        MqttConfig.mqttSpring = mqtt;
+    }
+
+    /**
+     * 获取mqtt基本配置
+     * @return
+     */
+    static MqttClientOptions getBasicMqttClientOptions() {
+        if (!mqttSpring.containsKey(MqttUseEnum.BASIC)) {
+            throw new Error("请先配置MQTT的基本连接参数，否则无法启动项目");
+        }
+        return mqttSpring.get(MqttUseEnum.BASIC);
+    }
+
+    /**
+     * 拼接获取对应mqtt的连接地址
+     * @param options
+     * @return
+     */
+    public static String getMqttAddress(MqttClientOptions options) {
+        StringBuilder addr = new StringBuilder();
+        addr.append(options.getProtocol().getProtocolAddr())
+                .append(options.getHost().trim())
+                .append(":")
+                .append(options.getPort());
+        if ((options.getProtocol() == MqttProtocolEnum.WS || options.getProtocol() == MqttProtocolEnum.WSS)
+                && StringUtils.hasText(options.getPath())) {
+            addr.append(options.getPath());
+        }
+        return addr.toString();
+    }
+
+    public static String getBasicMqttAddress() {
+        return getMqttAddress(getBasicMqttClientOptions());
+    }
+
+    /**
+     * 获取连接参数，注入到spring中
+     * @return
+     */
+    @Bean
+    public MqttConnectOptions mqttConnectionOptions() {
+
+        MqttConnectOptions mqttConnectOptions = new MqttConnectOptions();
+
+        MqttClientOptions customizeOptions = getBasicMqttClientOptions();
+        String basicMqttAddress = getBasicMqttAddress();
+        mqttConnectOptions.setServerURIs(new String[]{basicMqttAddress});
+        mqttConnectOptions.setUserName(StringUtils.hasText(customizeOptions.getUsername()) ?
+                customizeOptions.getUsername() : "");
+        mqttConnectOptions.setPassword(StringUtils.hasText(customizeOptions.getPassword()) ?
+                customizeOptions.getPassword().toCharArray() : new char[0]);
+        // 直接进行自动连接
+        mqttConnectOptions.setAutomaticReconnect(true);
+        // 时间间隔时间10s
+        mqttConnectOptions.setKeepAliveInterval(10);
+
+        return mqttConnectOptions;
+    }
+
+    @Bean
+    public MqttPahoClientFactory mqttClientFactory() {
+        DefaultMqttPahoClientFactory factory = new DefaultMqttPahoClientFactory();
+        factory.setConnectionOptions(mqttConnectionOptions());
+        return factory;
+    }
+
+}

user-service/src/main/java/com/mh/user/config/mqtt/MqttInboundConfig.java

@@ -0,0 +1,91 @@
+package com.mh.user.config.mqtt;
+
+import com.mh.user.constants.ChannelName;
+import com.mh.user.constants.MqttClientOptions;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.IntegrationComponentScan;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.endpoint.MessageProducerSupport;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
+import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.integration.mqtt.support.MqttHeaders;
+import org.springframework.messaging.MessageChannel;
+import org.springframework.messaging.MessageHandler;
+
+import javax.annotation.Resource;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project springboot-mqtt-demo
+ * @description 入站配置
+ * @date 2024-10-29 16:22:10
+ */
+@Slf4j
+@Configuration
+@IntegrationComponentScan
+public class MqttInboundConfig {
+
+    @Autowired
+    private MqttPahoClientFactory mqttClientFactory;
+
+    @Resource(name = ChannelName.INBOUND)
+    private MessageChannel inboundChannel;
+
+    private String clientId;
+
+    /**
+     * 入站适配器
+     * @return
+     */
+    @Bean(name = "adapter")
+    public MessageProducerSupport mqttInbound() {
+        MqttClientOptions options = MqttConfig.getBasicMqttClientOptions();
+        // 此处初始化的时候，默认订阅了配置文件中已经写好的topic
+        // 如果需要订阅多个，可以自己手动订阅，会写一个addTopic()进行添加订阅
+        clientId = options.getClientId() + "_consumer_" + System.currentTimeMillis();
+        MqttPahoMessageDrivenChannelAdapter adapter = new MqttPahoMessageDrivenChannelAdapter(
+                clientId,
+                mqttClientFactory,
+                options.getInboundTopic().split(","));
+        // System.out.println("每一次都会入站适配器吗？"+clientId);
+        DefaultPahoMessageConverter converter = new DefaultPahoMessageConverter();
+        // 统一是字节处理
+        converter.setPayloadAsBytes(true);
+        // 设置消息转换器
+        adapter.setConverter(converter);
+        // 设置qos（quality of service）
+        // 0：最多一次传输（消息会丢失），
+        // 1：至少一次传输（消息会重复），
+        // 2：只有当消息发送成功时才确认（消息不回丢，但延迟高）。
+        adapter.setQos(0);
+        // 设置在接收已经订阅的主题信息后，发送给哪个通道，具体的发送方法需要翻上层的抽象类
+        adapter.setOutputChannel(inboundChannel);
+        return adapter;
+    }
+
+    /**
+     * 默认声明一个消息处理器，用于处理无效的消息
+     * @return
+     */
+    @Bean
+    @ServiceActivator(inputChannel = ChannelName.DEFAULT_BOUND)
+    public MessageHandler handler() {
+        return message -> {
+            log.info("The default channel does not handle messages." +
+                    "\nTopic: {}" +
+                    "\nPayload: {}",
+                    message.getHeaders().get(MqttHeaders.RECEIVED_TOPIC),
+                    message.getPayload());
+        };
+    }
+
+    public String getClientId() {
+        return clientId;
+    }
+
+}

user-service/src/main/java/com/mh/user/config/mqtt/MqttMessageChannel.java

@@ -0,0 +1,55 @@
+package com.mh.user.config.mqtt;
+
+import com.mh.user.constants.ChannelName;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.channel.DirectChannel;
+import org.springframework.messaging.MessageChannel;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project springboot-mqtt-demo
+ * @description 声明所有通道的定义类
+ * @date 2024-10-29 16:23:32
+ */
+@Slf4j
+@Configuration
+public class MqttMessageChannel {
+
+    @Bean(name = ChannelName.OUTBOUND)
+    public MessageChannel outboundChannel() {
+        return new DirectChannel();
+    }
+
+    @Bean(name = ChannelName.INBOUND)
+    public MessageChannel inboundChannel() {
+        return new DirectChannel();
+    }
+
+    /**
+     * 事件主动上报通道
+     * @return
+     */
+    @Bean(name = ChannelName.EVENTS_UPLOAD_INBOUND)
+    public MessageChannel eventsUploadInbound() {
+        return new DirectChannel();
+    }
+
+    @Bean(name = ChannelName.EVENTS_COLLECTION_INBOUND)
+    public MessageChannel eventsCollectionInbound() {
+        return new DirectChannel();
+    }
+
+    @Bean(name = ChannelName.EVENTS_CONTROL_INBOUND)
+    public MessageChannel eventsControlInbound() {
+        return new DirectChannel();
+    }
+
+    @Bean(name = ChannelName.EVENTS_SEND_INBOUND)
+    public MessageChannel eventsSendInbound() {
+        return new DirectChannel();
+    }
+
+}

user-service/src/main/java/com/mh/user/config/mqtt/MqttOutboundConfig.java

@@ -0,0 +1,51 @@
+package com.mh.user.config.mqtt;
+
+import com.mh.user.constants.ChannelName;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.integration.annotation.IntegrationComponentScan;
+import org.springframework.integration.annotation.ServiceActivator;
+import org.springframework.integration.mqtt.core.MqttPahoClientFactory;
+import org.springframework.integration.mqtt.outbound.MqttPahoMessageHandler;
+import org.springframework.integration.mqtt.support.DefaultPahoMessageConverter;
+import org.springframework.messaging.MessageHandler;
+
+/**
+ * @author LJF
+ * @version 1.0
+ * @project springboot-mqtt-demo
+ * @description 入站配置
+ * @date 2024-10-29 16:22:10
+ */
+@Slf4j
+@Configuration
+@IntegrationComponentScan
+public class MqttOutboundConfig {
+
+    @Autowired
+    private MqttPahoClientFactory mqttClientFactory;
+
+    /**
+     * 默认声明一个出站处理器，用于处理无效的消息
+     * @return
+     */
+    @Bean
+    @ServiceActivator(inputChannel = ChannelName.OUTBOUND)
+    public MessageHandler mqttOutbound() {
+        MqttPahoMessageHandler messageHandler = new MqttPahoMessageHandler(
+                MqttConfig.getBasicMqttClientOptions().getClientId() + "_producer_" + System.currentTimeMillis(),
+                mqttClientFactory);
+        DefaultPahoMessageConverter converter = new DefaultPahoMessageConverter();
+        // use byte types uniformly
+        converter.setPayloadAsBytes(true);
+
+        messageHandler.setAsync(true);
+        messageHandler.setDefaultQos(0);
+        messageHandler.setConverter(converter);
+        return messageHandler;
+    }
+
+
+}

user-service/src/main/java/com/mh/user/constants/TopicEnum.java

@@ -14,7 +14,7 @@ import static com.mh.user.constants.TopicConst.*;
 public enum TopicEnum {
 
     /**
-     * 客户端主动上报数据
+     * 冷水机组客户端主动上报数据
      */
     CLIENT_UPLOAD_DATA(Pattern.compile("^" + MH_UPLOAD + EVENTS_UPLOAD + REGEX_SN + "$"), ChannelName.EVENTS_UPLOAD_INBOUND),
 

user-service/src/main/java/com/mh/user/controller/CodeTableController.java

@@ -29,11 +29,4 @@ public class CodeTableController {
         list=codeTableService.queryBrand();
         return HttpResult.ok(list);
     }
-
-    @PostMapping("/paramType")
-    public HttpResult queryParamType(){
-        List<DeviceTypeModel> list;
-        list=codeTableService.queryDataByName("paramType");
-        return HttpResult.ok(list);
-    }
 }

user-service/src/main/java/com/mh/user/controller/CollectionParamsManageController.java

@@ -1,71 +0,0 @@
-package com.mh.user.controller;
-
-import com.mh.common.http.HttpResult;
-import com.mh.common.utils.StringUtils;
-import com.mh.user.annotation.SysLogger;
-import com.mh.user.entity.CollectionParamsManageEntity;
-import com.mh.user.entity.DeviceInstallEntity;
-import com.mh.user.model.DeviceModel;
-import com.mh.user.service.*;
-import org.apache.poi.hssf.usermodel.HSSFCell;
-import org.apache.poi.hssf.usermodel.HSSFSheet;
-import org.apache.poi.hssf.usermodel.HSSFWorkbook;
-import org.apache.poi.ss.usermodel.CellType;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.multipart.MultipartFile;
-
-import javax.servlet.http.HttpServletRequest;
-import java.io.IOException;
-import java.io.InputStream;
-import java.text.SimpleDateFormat;
-import java.util.*;
-
-/**
- * 基表参数信息管理
- */
-@RestController
-@RequestMapping("cpm")
-public class CollectionParamsManageController {
-
-    @Autowired
-    private CollectionParamsManageService collectionParamsManageService;
-
-    //保存
-    @SysLogger(title="基表采集信息",optDesc = "保存基表采集参数信息")
-    @PostMapping(value="/save")
-    public HttpResult saveDevice(@RequestBody CollectionParamsManageEntity collectionParamsManageEntity) {
-        return HttpResult.ok(collectionParamsManageService.insertCPM(collectionParamsManageEntity));
-    }
-
-    //修改
-    @SysLogger(title="基表采集参数信息",optDesc = "修改基表采集参数信息")
-    @PostMapping(value="/update")
-    public HttpResult updateDevice(@RequestBody CollectionParamsManageEntity collectionParamsManageEntity) {
-        return HttpResult.ok(collectionParamsManageService.updateCPM(collectionParamsManageEntity));
-    }
-
-    // 删除多
-    @PostMapping(value="/deletes")
-    public HttpResult deleteDevices(@RequestBody String[] ids) {
-        return HttpResult.ok(collectionParamsManageService.deleteByIds(ids));
-    }
-
-    // 按条件查询
-    @SysLogger(title="基表采集信息",optDesc = "按条件查询基表采集参数信息")
-    @PostMapping(value="/query")
-    public HttpResult queryDevice( @RequestParam(value = "deviceInstallId", required = false)String deviceInstallId,
-                                   @RequestParam(value = "buildingId", required = false)String buildingId,
-                                   @RequestParam(value = "otherName", required = false)String otherName,
-                                   @RequestParam(value = "page", required=true)Integer page,
-                                   @RequestParam(value = "limit", required=true)Integer limit) {
-        try{
-            int count=collectionParamsManageService.selectCPMListCount(buildingId, deviceInstallId,otherName, page, limit);
-            List<CollectionParamsManageEntity> records=collectionParamsManageService.selectCPMList(buildingId, deviceInstallId,otherName, page, limit);
-            return HttpResult.ok(count,records);
-        }catch (Exception e){
-            return HttpResult.error(e.getMessage());
-        }
-    }
-
-}

user-service/src/main/java/com/mh/user/controller/HotWaterMonitorController.java

@@ -1,52 +0,0 @@
-package com.mh.user.controller;
-
-import com.mh.common.http.HttpResult;
-import com.mh.user.dto.HotWaterControlDTO;
-import com.mh.user.dto.HotWaterNowDataDTO;
-import com.mh.user.service.CollectionParamsManageService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-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 CHWS
- * @description 热水监控
- * @date 2025-12-16 16:02:20
- */
-@RestController
-@RequestMapping("/device/hotWater")
-public class HotWaterMonitorController {
-
-    @Autowired
-    private CollectionParamsManageService collectionParamsManageService;
-
-    /**
-     * 获取生活热水监控热泵信息
-     * @param buildingId
-     * @return
-     */
-    @GetMapping("/monitorList")
-    public HttpResult monitorList(@RequestParam("buildingId") String buildingId) {
-        List<HotWaterNowDataDTO> list = collectionParamsManageService.monitorList(buildingId);
-        return HttpResult. ok(list);
-    }
-
-    /**
-     * 获取生活热水监控操作信息内容
-     * @param buildingId
-     * @return
-     */
-    @GetMapping("/operateList")
-    public HttpResult operateList(@RequestParam("buildingId") String buildingId) {
-        List<HotWaterControlDTO> list = collectionParamsManageService.operateList(buildingId);
-        return HttpResult.ok(list);
-    }
-
-
-}

user-service/src/main/java/com/mh/user/dto/HotWaterBackPumpControlVO.java

@@ -1,144 +0,0 @@
-package com.mh.user.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.StringJoiner;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 回水泵热泵控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterBackPumpControlVO {
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    // 定时_时开1
-    private int oneHourTimeOpenSetOne;
-    private String oneHourTimeOpenSetOneId;
-
-    // 定时_分开1
-    private int oneMinTimeOpenSetOne;
-    private String oneMinTimeOpenSetOneId;
-
-    // 定时_时关1
-    private int oneHourTimeCloseSetOne;
-    private String oneHourTimeCloseSetOneId;
-
-    // 定时_分关1
-    private int oneMinTimeCloseSetOne;
-    private String oneMinTimeCloseSetOneId;
-
-    // 定时_时开2
-    private int oneHourTimeOpenSetTwo;
-    private String oneHourTimeOpenSetTwoId;
-
-    // 定时_分开2
-    private int oneMinTimeOpenSetTwo;
-    private String oneMinTimeOpenSetTwoId;
-
-    // 定时_时关2
-    private int oneHourTimeCloseSetTwo;
-    private String oneHourTimeCloseSetTwoId;
-
-    // 定时_分关2
-    private int oneMinTimeCloseSetTwo;
-    private String oneMinTimeCloseSetTwoId;
-
-    // 定时_时开3
-    private int oneHourTimeOpenSetThree;
-    private String oneHourTimeOpenSetThreeId;
-
-    // 定时_分开3
-    private int oneMinTimeOpenSetThree;
-    private String oneMinTimeOpenSetThreeId;
-
-    // 定时_时关3
-    private int oneHourTimeCloseSetThree;
-    private String oneHourTimeCloseSetThreeId;
-
-    // 定时_分关3
-    private int oneMinTimeCloseSetThree;
-    private String oneMinTimeCloseSetThreeId;
-
-    // 开延时
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private int openDelayTime;
-    private String openDelayTimeId;
-
-    // 温度设置
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tempSet;
-    private String tempSetId;
-
-    // 累计运行时间
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal runTime;
-    private String runTimeId;
-
-    // 运行状态
-    private int runState;
-    private String runStateId;
-
-    // 启停控制
-    private int startStopControl;
-    private String startStopControlId;
-
-    // 故障
-    private int fault;
-    private String faultId;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterBackPumpControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("orderNum=" + orderNum)
-                .add("oneHourTimeOpenSetOne=" + oneHourTimeOpenSetOne)
-                .add("oneHourTimeOpenSetOneId='" + oneHourTimeOpenSetOneId + "'")
-                .add("oneMinTimeOpenSetOne=" + oneMinTimeOpenSetOne)
-                .add("oneMinTimeOpenSetOneId='" + oneMinTimeOpenSetOneId + "'")
-                .add("oneHourTimeCloseSetOne=" + oneHourTimeCloseSetOne)
-                .add("oneHourTimeCloseSetOneId='" + oneHourTimeCloseSetOneId + "'")
-                .add("oneMinTimeCloseSetOne=" + oneMinTimeCloseSetOne)
-                .add("oneMinTimeCloseSetOneId='" + oneMinTimeCloseSetOneId + "'")
-                .add("oneHourTimeOpenSetTwo=" + oneHourTimeOpenSetTwo)
-                .add("oneHourTimeOpenSetTwoId='" + oneHourTimeOpenSetTwoId + "'")
-                .add("oneMinTimeOpenSetTwo=" + oneMinTimeOpenSetTwo)
-                .add("oneMinTimeOpenSetTwoId='" + oneMinTimeOpenSetTwoId + "'")
-                .add("oneHourTimeCloseSetTwo=" + oneHourTimeCloseSetTwo)
-                .add("oneHourTimeCloseSetTwoId='" + oneHourTimeCloseSetTwoId + "'")
-                .add("oneMinTimeCloseSetTwo=" + oneMinTimeCloseSetTwo)
-                .add("oneMinTimeCloseSetTwoId='" + oneMinTimeCloseSetTwoId + "'")
-                .add("oneHourTimeOpenSetThree=" + oneHourTimeOpenSetThree)
-                .add("oneHourTimeOpenSetThreeId='" + oneHourTimeOpenSetThreeId + "'")
-                .add("oneMinTimeOpenSetThree=" + oneMinTimeOpenSetThree)
-                .add("oneMinTimeOpenSetThreeId='" + oneMinTimeOpenSetThreeId + "'")
-                .add("oneHourTimeCloseSetThree=" + oneHourTimeCloseSetThree)
-                .add("oneHourTimeCloseSetThreeId='" + oneHourTimeCloseSetThreeId + "'")
-                .add("openDelayTime=" + openDelayTime)
-                .add("openDelayTimeId='" + openDelayTimeId + "'")
-                .add("tempSet=" + tempSet)
-                .add("tempSetId='" + tempSetId + "'")
-                .add("runTime=" + runTime)
-                .add("runTimeId='" + runTimeId + "'")
-                .add("runState=" + runState)
-                .add("runStateId='" + runStateId + "'")
-                .add("startStopControl=" + startStopControl)
-                .add("startStopControlId='" + startStopControlId + "'")
-                .add("fault=" + fault)
-                .add("faultId='" + faultId + "'")
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterCircuitPumpControlVO.java

@@ -1,104 +0,0 @@
-package com.mh.user.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.StringJoiner;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 热泵控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterCircuitPumpControlVO {
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    // 定时_时开1
-    private int oneHourTimeOpenSetOne;
-    private String oneHourTimeOpenSetOneId;
-
-    // 定时_分开1
-    private int oneMinTimeOpenSetOne;
-    private String oneMinTimeOpenSetOneId;
-
-    // 定时_时关1
-    private int oneHourTimeCloseSetOne;
-    private String oneHourTimeCloseSetOneId;
-
-    // 定时_分关1
-    private int oneMinTimeCloseSetOne;
-    private String oneMinTimeCloseSetOneId;
-
-    // 开延时
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private int openDelayTime;
-    private String openDelayTimeId;
-
-    // 温差
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tempDiff;
-    private String tempDiffId;
-
-    // 温差设置
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tempDiffSet;
-    private String tempDiffSetId;
-
-    // 累计运行时间
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal runTime;
-    private String runTimeId;
-
-    // 运行状态
-    private int runState;
-    private String runStateId;
-
-    // 启停控制
-    private int startStopControl;
-    private String startStopControlId;
-
-    // 故障
-    private int fault;
-    private String faultId;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterCircuitPumpControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("orderNum=" + orderNum)
-                .add("oneHourTimeOpenSetOne=" + oneHourTimeOpenSetOne)
-                .add("oneHourTimeOpenSetOneId='" + oneHourTimeOpenSetOneId + "'")
-                .add("oneMinTimeOpenSetOne=" + oneMinTimeOpenSetOne)
-                .add("oneMinTimeOpenSetOneId='" + oneMinTimeOpenSetOneId + "'")
-                .add("oneHourTimeCloseSetOne=" + oneHourTimeCloseSetOne)
-                .add("oneHourTimeCloseSetOneId='" + oneHourTimeCloseSetOneId + "'")
-                .add("oneMinTimeCloseSetOne=" + oneMinTimeCloseSetOne)
-                .add("oneMinTimeCloseSetOneId='" + oneMinTimeCloseSetOneId + "'")
-                .add("tempDiff=" + tempDiff)
-                .add("tempDiffId='" + tempDiffId + "'")
-                .add("tempDiffSet=" + tempDiffSet)
-                .add("tempDiffSetId='" + tempDiffSetId + "'")
-                .add("runTime=" + runTime)
-                .add("runTimeId='" + runTimeId + "'")
-                .add("runState=" + runState)
-                .add("runStateId='" + runStateId + "'")
-                .add("startStopControl=" + startStopControl)
-                .add("startStopControlId='" + startStopControlId + "'")
-                .add("fault=" + fault)
-                .add("faultId='" + faultId + "'")
-                .toString();
-    }
-
-}

user-service/src/main/java/com/mh/user/dto/HotWaterControlDTO.java

@@ -1,38 +0,0 @@
-package com.mh.user.dto;
-
-import lombok.Getter;
-import lombok.Setter;
-import org.apache.poi.ss.formula.functions.T;
-
-import java.util.List;
-import java.util.StringJoiner;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 生活热水监控dto
- * @date 2025-03-14 09:13:19
- */
-@Setter
-@Getter
-public class HotWaterControlDTO {
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    private List<?> children;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterControlDTO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("orderNum=" + orderNum)
-                .add("children=" + children)
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterControlListVO.java

@@ -1,77 +0,0 @@
-package com.mh.user.dto;
-
-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-03-14 09:07:46
- */
-@Setter
-@Getter
-public class HotWaterControlListVO {
-
-    private String cpmId;
-
-    private String buildingId;
-
-    private String buildingName;
-
-    private String deviceType;
-
-    private String deviceId;
-
-    private String deviceName;
-
-    private BigDecimal curValue;
-
-    private Date curTime;
-
-    private String paramTypeId;
-
-    private String otherName;
-
-    private int dtOrderNum;
-
-    private int dlOrderNum;
-
-    private int ctOrderNum;
-
-    public BigDecimal getCurValue() {
-        return curValue;
-    }
-
-    public void setCurValue(BigDecimal curValue) {
-        if (curValue!= null) {
-            // 保留两位小数
-            curValue = curValue.setScale(2, BigDecimal.ROUND_HALF_UP);
-        }
-        this.curValue = curValue;
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterControlListVO.class.getSimpleName() + "[", "]")
-                .add("cpmId='" + cpmId + "'")
-                .add("buildingId='" + buildingId + "'")
-                .add("buildingName='" + buildingName + "'")
-                .add("deviceType='" + deviceType + "'")
-                .add("deviceId='" + deviceId + "'")
-                .add("deviceName='" + deviceName + "'")
-                .add("curValue=" + curValue)
-                .add("curTime=" + curTime)
-                .add("paramTypeId='" + paramTypeId + "'")
-                .add("otherName='" + otherName + "'")
-                .add("dtOrderNum=" + dtOrderNum)
-                .add("dlOrderNum=" + dlOrderNum)
-                .add("ctOrderNum=" + ctOrderNum)
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterControlVO.java

@@ -1,186 +0,0 @@
-package com.mh.user.dto;
-
-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 生活热水系统控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterControlVO {
-
-    private String id;
-
-    private String name;
-
-    // 运行状态 1d
-    private int runningStatus;
-    private String runningStatusId;
-
-    // 启停控制 2
-    private int switchStatus;
-    private String switchStatusId;
-
-    // 频率设置 3
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal frequencySet;
-    private String frequencySetId;
-
-    // 频率 4
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal frequency;
-    private String frequencyId;
-
-    // 故障状态 5
-    private int alarmStatus;
-    private String alarmStatusId;
-
-    // 手动自动切换 6
-    private int handAutomaticSwitch;
-    private String handAutomaticSwitchId;
-
-    // 开控制 8
-    private int openSwitch;
-    private String openSwitchId;
-
-    // 关控制 9
-    private int closeSwitch;
-    private String closeSwitchId;
-
-    // 水位设置 10
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0.0")
-    private BigDecimal waterLevelSet;
-    private String waterLevelSetId;
-
-    // 水位 11
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0.0")
-    private BigDecimal waterLevel;
-    private String waterLevelId;
-
-    // 温度 12
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal temp;
-    private String tempId;
-
-    // 压力 13
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal pressure;
-    private String pressureId;
-
-    // 温度设置 14
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tempSet;
-    private String tempSetId;
-
-    // 压力设置 15
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal pressureSet;
-    private String pressureSetId;
-
-    // 延时时间设置 34
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal delayTimeSet;
-    private String delayTimeSetId;
-
-    // 差值设置 35
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal diffValueSet;
-    private String diffValueSetId;
-
-    // 计数器设置 36
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal counterSet;
-    private String counterSetId;
-
-    // 切换时间设置 37
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal switchTimeSet;
-    private String switchTimeSetId;
-
-    // 故障复位状态 38
-    private int faultResetStatus;
-    private String faultResetStatusId;
-
-    // 急停状态 39
-    private int emergencyStopStatus;
-    private String emergencyStopStatusId;
-
-    // 最低设置值 44
-    private int minSet;
-    private String minSetId;
-
-
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date curTime;
-
-    private int orderNum;
-
-    public void setCounterSet(BigDecimal counterSet) {
-        if (counterSet != null) {
-            counterSet = counterSet.setScale(0, BigDecimal.ROUND_HALF_UP);
-        }
-        this.counterSet = counterSet;
-    }
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("runningStatus=" + runningStatus)
-                .add("runningStatusId='" + runningStatusId + "'")
-                .add("switchStatus=" + switchStatus)
-                .add("switchStatusId='" + switchStatusId + "'")
-                .add("frequencySet=" + frequencySet)
-                .add("frequencySetId='" + frequencySetId + "'")
-                .add("frequency=" + frequency)
-                .add("frequencyId='" + frequencyId + "'")
-                .add("alarmStatus=" + alarmStatus)
-                .add("alarmStatusId='" + alarmStatusId + "'")
-                .add("handAutomaticSwitch=" + handAutomaticSwitch)
-                .add("handAutomaticSwitchId='" + handAutomaticSwitchId + "'")
-                .add("openSwitch=" + openSwitch)
-                .add("openSwitchId='" + openSwitchId + "'")
-                .add("closeSwitch=" + closeSwitch)
-                .add("closeSwitchId='" + closeSwitchId + "'")
-                .add("waterLevelSet=" + waterLevelSet)
-                .add("waterLevelSetId='" + waterLevelSetId + "'")
-                .add("waterLevel=" + waterLevel)
-                .add("waterLevelId='" + waterLevelId + "'")
-                .add("temp=" + temp)
-                .add("tempId='" + tempId + "'")
-                .add("pressure=" + pressure)
-                .add("pressureId='" + pressureId + "'")
-                .add("tempSet=" + tempSet)
-                .add("tempSetId='" + tempSetId + "'")
-                .add("pressureSet=" + pressureSet)
-                .add("pressureSetId='" + pressureSetId + "'")
-                .add("delayTimeSet=" + delayTimeSet)
-                .add("delayTimeSetId='" + delayTimeSetId + "'")
-                .add("diffValueSet=" + diffValueSet)
-                .add("diffValueSetId='" + diffValueSetId + "'")
-                .add("counterSet=" + counterSet)
-                .add("counterSetId='" + counterSetId + "'")
-                .add("switchTimeSet=" + switchTimeSet)
-                .add("switchTimeSetId='" + switchTimeSetId + "'")
-                .add("faultResetStatus=" + faultResetStatus)
-                .add("faultResetStatusId='" + faultResetStatusId + "'")
-                .add("emergencyStopStatus=" + emergencyStopStatus)
-                .add("emergencyStopStatusId='" + emergencyStopStatusId + "'")
-                .add("minSet=" + minSet)
-                .add("minSetId='" + minSetId + "'")
-                .add("curTime=" + curTime)
-                .add("orderNum=" + orderNum)
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterDeviceCalibrationControlVO.java

@@ -1,71 +0,0 @@
-package com.mh.user.dto;
-
-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 设备校准控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterDeviceCalibrationControlVO {
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    // 校准值
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal calibrationValue;
-    private String calibrationValueId;
-
-    // 工程量最低值
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal engineeringMinValue;
-    private String engineeringMinValueId;
-
-    // 工程量最高值
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal engineeringMaxValue;
-    private String engineeringMaxValueId;
-
-    // 数字量最低值
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal digitalMinValue;
-    private String digitalMinValueId;
-
-    // 数字量最高值
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal digitalMaxValue;
-    private String digitalMaxValueId;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterDeviceCalibrationControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("orderNum=" + orderNum)
-                .add("calibrationValue=" + calibrationValue)
-                .add("calibrationValueId='" + calibrationValueId + "'")
-                .add("engineeringMinValue=" + engineeringMinValue)
-                .add("engineeringMinValueId='" + engineeringMinValueId + "'")
-                .add("engineeringMaxValue=" + engineeringMaxValue)
-                .add("engineeringMaxValueId='" + engineeringMaxValueId + "'")
-                .add("digitalMinValue=" + digitalMinValue)
-                .add("digitalMinValueId='" + digitalMinValueId + "'")
-                .add("digitalMaxValue=" + digitalMaxValue)
-                .add("digitalMaxValueId='" + digitalMaxValueId + "'")
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterDeviceControlVO.java

@@ -1,43 +0,0 @@
-package com.mh.user.dto;
-
-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 生活热水系统控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterDeviceControlVO {
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    // 累计读数
-    @JsonFormat(shape = JsonFormat.Shape.STRING)
-    private BigDecimal totalReading;
-    private String totalReadingId;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterDeviceControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("orderNum=" + orderNum)
-                .add("totalReading=" + totalReading)
-                .add("totalReadingId='" + totalReadingId + "'")
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterHotPumpControlVO.java

@@ -1,241 +0,0 @@
-package com.mh.user.dto;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.math.BigDecimal;
-import java.util.StringJoiner;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 热泵控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterHotPumpControlVO { // 去掉pump后的类名
-
-    private String id;
-
-    private String name;
-
-    private int orderNum;
-
-    // 热泵12定时_时开1
-    private int oneHourTimeOpenSetOne;
-    private String oneHourTimeOpenSetOneId;
-
-    // 热泵12定时_分开1 (新增分钟设置)
-    private int oneMinTimeOpenSetOne;
-    private String oneMinTimeOpenSetOneId;
-
-    // 热泵12定时_时关1
-    private int oneHourTimeCloseSetOne;
-    private String oneHourTimeCloseSetOneId;
-
-    // 热泵12定时_分关1 (新增分钟设置)
-    private int oneMinTimeCloseSetOne;
-    private String oneMinTimeCloseSetOneId;
-
-    // 热泵12定时_时开2
-    private int oneHourTimeOpenSetTwo;
-    private String oneHourTimeOpenSetTwoId;
-
-    // 热泵12定时_分开2 (新增分钟设置)
-    private int oneMinTimeOpenSetTwo;
-    private String oneMinTimeOpenSetTwoId;
-
-    // 热泵12定时_时关2
-    private int oneHourTimeCloseSetTwo;
-    private String oneHourTimeCloseSetTwoId;
-
-    // 热泵12定时_分关2 (新增分钟设置)
-    private int oneMinTimeCloseSetTwo;
-    private String oneMinTimeCloseSetTwoId;
-
-    // 热泵12定时_时开3
-    private int oneHourTimeOpenSetThree;
-    private String oneHourTimeOpenSetThreeId;
-
-    // 热泵12定时_分开3 (新增分钟设置)
-    private int oneMinTimeOpenSetThree;
-    private String oneMinTimeOpenSetThreeId;
-
-    // 热泵12定时_时关3
-    private int oneHourTimeCloseSetThree;
-    private String oneHourTimeCloseSetThreeId;
-
-    // 热泵12定时_分关3 (新增分钟设置)
-    private int oneMinTimeCloseSetThree;
-    private String oneMinTimeCloseSetThreeId;
-
-    // 热泵12定时_时开1
-    private int twoHourTimeOpenSetOne;
-    private String twoHourTimeOpenSetOneId;
-
-    // 热泵34定时_分开1 (新增分钟设置)
-    private int twoMinTimeOpenSetOne;
-    private String twoMinTimeOpenSetOneId;
-
-    // 热泵34定时_时关1
-    private int twoHourTimeCloseSetOne;
-    private String twoHourTimeCloseSetOneId;
-
-    // 热泵34定时_分关1 (新增分钟设置)
-    private int twoMinTimeCloseSetOne;
-    private String twoMinTimeCloseSetOneId;
-
-    // 热泵34定时_时开2
-    private int twoHourTimeOpenSetTwo;
-    private String twoHourTimeOpenSetTwoId;
-
-    // 热泵34定时_分开2 (新增分钟设置)
-    private int twoMinTimeOpenSetTwo;
-    private String twoMinTimeOpenSetTwoId;
-
-    // 热泵34定时_时关2
-    private int twoHourTimeCloseSetTwo;
-    private String twoHourTimeCloseSetTwoId;
-
-    // 热泵34定时_分关2 (新增分钟设置)
-    private int twoMinTimeCloseSetTwo;
-    private String twoMinTimeCloseSetTwoId;
-
-    // 热泵34定时_时开3
-    private int twoHourTimeOpenSetThree;
-    private String twoHourTimeOpenSetThreeId;
-
-    // 热泵34定时_分开3 (新增分钟设置)
-    private int twoMinTimeOpenSetThree;
-    private String twoMinTimeOpenSetThreeId;
-
-    // 热泵34定时_时关3
-    private int twoHourTimeCloseSetThree;
-    private String twoHourTimeCloseSetThreeId;
-
-    // 热泵34定时_分关3 (新增分钟设置)
-    private int twoMinTimeCloseSetThree;
-    private String twoMinTimeCloseSetThreeId;
-
-    // 热泵_开机 -> 去掉pump前缀
-    private String start;
-    private String startId;
-
-    // 热泵_关机 -> 去掉pump前缀
-    private String stop;
-    private String stopId;
-
-    // 热泵_运行状态 -> 去掉pump前缀
-    private int runState;
-    private String runStateId;
-
-    // 热泵_启停控制 -> 去掉pump前缀
-    private int startStopControl;
-    private String startStopControlId;
-
-    // 热泵_设定温度 -> 去掉pump前缀
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal setTemp;
-    private String setTempId;
-
-    // 热泵_水箱温度 -> 去掉pump前缀
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tankTemp;
-    private String tankTempId;
-
-    // 热泵累计运行时间 -> 去掉pump前缀
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal runTime;
-    private String runTimeId;
-
-    // 热泵_出水温度 -> 去掉pump前缀
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal outWaterTemp;
-    private String outWaterTempId;
-
-    // 热泵_进水温度 -> 去掉pump前缀
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal inWaterTemp;
-    private String inWaterTempId;
-
-    // 热泵_故障 -> 去掉pump前缀
-    private int fault;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterHotPumpControlVO.class.getSimpleName() + "[", "]") // 更新类名引用
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("oneHourTimeOpenSetOne=" + oneHourTimeOpenSetOne)
-                .add("oneHourTimeOpenSetOneId='" + oneHourTimeOpenSetOneId + "'")
-                .add("oneMinTimeOpenSetOne=" + oneMinTimeOpenSetOne) // 新增分钟字段
-                .add("oneMinTimeOpenSetOneId='" + oneMinTimeOpenSetOneId + "'") // 新增分钟字段
-                .add("oneHourTimeCloseSetOne=" + oneHourTimeCloseSetOne)
-                .add("oneHourTimeCloseSetOneId='" + oneHourTimeCloseSetOneId + "'")
-                .add("oneMinTimeCloseSetOne=" + oneMinTimeCloseSetOne) // 新增分钟字段
-                .add("oneMinTimeCloseSetOneId='" + oneMinTimeCloseSetOneId + "'") // 新增分钟字段
-                .add("oneHourTimeOpenSetTwo=" + oneHourTimeOpenSetTwo)
-                .add("oneHourTimeOpenSetTwoId='" + oneHourTimeOpenSetTwoId + "'")
-                .add("oneMinTimeOpenSetTwo=" + oneMinTimeOpenSetTwo) // 新增分钟字段
-                .add("oneMinTimeOpenSetTwoId='" + oneMinTimeOpenSetTwoId + "'") // 新增分钟字段
-                .add("oneHourTimeCloseSetTwo=" + oneHourTimeCloseSetTwo)
-                .add("oneHourTimeCloseSetTwoId='" + oneHourTimeCloseSetTwoId + "'")
-                .add("oneMinTimeCloseSetTwo=" + oneMinTimeCloseSetTwo) // 新增分钟字段
-                .add("oneMinTimeCloseSetTwoId='" + oneMinTimeCloseSetTwoId + "'") // 新增分钟字段
-                .add("oneHourTimeOpenSetThree=" + oneHourTimeOpenSetThree)
-                .add("oneHourTimeOpenSetThreeId='" + oneHourTimeOpenSetThreeId + "'")
-                .add("oneMinTimeOpenSetThree=" + oneMinTimeOpenSetThree) // 新增分钟字段
-                .add("oneMinTimeOpenSetThreeId='" + oneMinTimeOpenSetThreeId + "'") // 新增分钟字段
-                .add("oneHourTimeCloseSetThree=" + oneHourTimeCloseSetThree)
-                .add("oneHourTimeCloseSetThreeId='" + oneHourTimeCloseSetThreeId + "'")
-                .add("oneMinTimeCloseSetThree=" + oneMinTimeCloseSetThree) // 新增分钟字段
-                .add("oneMinTimeCloseSetThreeId='" + oneMinTimeCloseSetThreeId + "'") // 新增分钟字段
-                .add("twoHourTimeOpenSetOne=" + twoHourTimeOpenSetOne)
-                .add("twoHourTimeOpenSetOneId='" + twoHourTimeOpenSetOneId + "'")
-                .add("twoMinTimeOpenSetOne=" + twoMinTimeOpenSetOne) // 新增分钟字段
-                .add("twoMinTimeOpenSetOneId='" + twoMinTimeOpenSetOneId + "'") // 新增分钟字段
-                .add("twoHourTimeCloseSetOne=" + twoHourTimeCloseSetOne)
-                .add("twoHourTimeCloseSetOneId='" + twoHourTimeCloseSetOneId + "'")
-                .add("twoMinTimeCloseSetOne=" + twoMinTimeCloseSetOne) // 新增分钟字段
-                .add("twoMinTimeCloseSetOneId='" + twoMinTimeCloseSetOneId + "'") // 新增分钟字段
-                .add("twoHourTimeOpenSetTwo=" + twoHourTimeOpenSetTwo)
-                .add("twoHourTimeOpenSetTwoId='" + twoHourTimeOpenSetTwoId + "'")
-                .add("twoMinTimeOpenSetTwo=" + twoMinTimeOpenSetTwo) // 新增分钟字段
-                .add("twoMinTimeOpenSetTwoId='" + twoMinTimeOpenSetTwoId + "'") // 新增分钟字段
-                .add("twoHourTimeCloseSetTwo=" + twoHourTimeCloseSetTwo)
-                .add("twoHourTimeCloseSetTwoId='" + twoHourTimeCloseSetTwoId + "'")
-                .add("twoMinTimeCloseSetTwo=" + twoMinTimeCloseSetTwo) // 新增分钟字段
-                .add("twoMinTimeCloseSetTwoId='" + twoMinTimeCloseSetTwoId + "'") // 新增分钟字段
-                .add("twoHourTimeOpenSetThree=" + twoHourTimeOpenSetThree)
-                .add("twoHourTimeOpenSetThreeId='" + twoHourTimeOpenSetThreeId + "'")
-                .add("twoMinTimeOpenSetThree=" + twoMinTimeOpenSetThree) // 新增分钟字段
-                .add("twoMinTimeOpenSetThreeId='" + twoMinTimeOpenSetThreeId + "'") // 新增分钟字段
-                .add("twoHourTimeCloseSetThree=" + twoHourTimeCloseSetThree)
-                .add("twoHourTimeCloseSetThreeId='" + twoHourTimeCloseSetThreeId + "'")
-                .add("twoMinTimeCloseSetThree=" + twoMinTimeCloseSetThree) // 新增分钟字段
-                .add("twoMinTimeCloseSetThreeId='" + twoMinTimeCloseSetThreeId + "'") // 新增分钟字段
-                .add("start='" + start + "'")
-                .add("startId='" + startId + "'")
-                .add("stop='" + stop + "'")
-                .add("stopId='" + stopId + "'")
-                .add("runState='" + runState + "'")
-                .add("runStateId='" + runStateId + "'")
-                .add("startStopControl='" + startStopControl + "'")
-                .add("startStopControlId='" + startStopControlId + "'")
-                .add("setTemp=" + setTemp)
-                .add("setTempId='" + setTempId + "'")
-                .add("tankTemp=" + tankTemp)
-                .add("tankTempId='" + tankTempId + "'")
-                .add("runTime=" + runTime)
-                .add("runTimeId='" + runTimeId + "'")
-                .add("outWaterTemp=" + outWaterTemp)
-                .add("outWaterTempId='" + outWaterTempId + "'")
-                .add("inWaterTemp=" + inWaterTemp)
-                .add("inWaterTempId='" + inWaterTempId + "'")
-                .add("fault=" + fault)
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/dto/HotWaterNowDataDTO.java

@@ -1,55 +0,0 @@
-package com.mh.user.dto;
-
-import lombok.Data;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 热水实时监控列表数据
- * @date 2025-03-10 15:43:36
- */
-@Data
-public class HotWaterNowDataDTO {
-
-    private String id;
-    private String curDate;         //日期
-    private String buildingId;    //楼栋编号
-    private String buildingName;  //楼栋名称
-    private String pumpId;        //热泵编号
-    private String pumpName;      //热泵名称
-    private String tempSet;       //水温设定
-    private String waterTemp;     //水箱水温
-    private String runState;      //运行状态
-    private String isFault;       //是否故障
-    private String levelSet1;      //水位设置
-    private String levelSet2;      //水位设置
-    private String waterLevel1;    //实际水位
-    private String waterLevel2;    //实际水位
-    private String tankId;        //水箱编号
-    private String tankName;      //水箱名称
-    private String envTemp;       //环境温度
-
-    private String upWaterState1;       // 供水1泵状态
-
-    private String freq1;               // 供水频率1
-
-    private String upWaterState2;       // 供水2泵状态
-
-    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;     // 回水状态
-
-    private int orderNum;
-
-}

user-service/src/main/java/com/mh/user/dto/HotWaterSystemControlVO.java

@@ -1,145 +0,0 @@
-package com.mh.user.dto;
-
-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 生活热水系统控制界面VO
- * @date 2025-03-14 09:00:37
- */
-@Setter
-@Getter
-public class HotWaterSystemControlVO {
-
-    private String id;
-
-    private String name;
-
-    // 启用时间写入 1
-    private int timeSet;
-    private String timeSetId;
-
-    // 水箱温度 2
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal tankTemp;
-    private String tankTempId;
-
-    // 太阳能温度 3
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal solarTemp;
-    private String solarTempId;
-
-    // 回水温度 4
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal inTemp;
-    private String inTempId;
-
-    // 压力 4
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "0")
-    private BigDecimal pressure;
-    private String pressureId;
-
-    // PLC 时间
-    private String plcTime;
-    // 秒_读 6
-    private int sTimeRead;
-    private String sTimeReadId;
-
-    // 分_读 8
-    private int minTimeRead;
-    private String minTimeReadId;
-
-    // 时_读 9
-    private int hourTimeRead;
-    private String hourTimeReadId;
-
-    // 日_读 9
-    private int dayTimeRead;
-    private String dayTimeReadId;
-
-    // 月_读 10
-    private int monthTimeRead;
-    private String monthTimeReadId;
-
-    // 年_读 11
-    private int yearTimeRead;
-    private String yearTimeReadId;
-
-    // 秒_写 6
-    private int sTimeSet;
-    private String sTimeSetId;
-
-    // 分_写 8
-    private int minTimeSet;
-    private String minTimeSetId;
-
-    // 时_写 9
-    private int hourTimeSet;
-    private String hourTimeSetId;
-
-    // 日_写 9
-    private int dayTimeSet;
-    private String dayTimeSetId;
-
-    // 月_写 10
-    private int monthTimeSet;
-    private String monthTimeSetId;
-
-    // 年_写 11
-    private int yearTimeSet;
-    private String yearTimeSetId;
-
-    private int orderNum;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", HotWaterSystemControlVO.class.getSimpleName() + "[", "]")
-                .add("id='" + id + "'")
-                .add("name='" + name + "'")
-                .add("timeSet=" + timeSet)
-                .add("timeSetId='" + timeSetId + "'")
-                .add("tankTemp=" + tankTemp)
-                .add("tankTempId='" + tankTempId + "'")
-                .add("solarTemp=" + solarTemp)
-                .add("solarTempId='" + solarTempId + "'")
-                .add("inTemp=" + inTemp)
-                .add("inTempId='" + inTempId + "'")
-                .add("pressure=" + pressure)
-                .add("pressureId='" + pressureId + "'")
-                .add("plcTime='" + plcTime + "'")
-                .add("sTimeRead=" + sTimeRead)
-                .add("sTimeReadId='" + sTimeReadId + "'")
-                .add("minTimeRead=" + minTimeRead)
-                .add("minTimeReadId='" + minTimeReadId + "'")
-                .add("hourTimeRead=" + hourTimeRead)
-                .add("hourTimeReadId='" + hourTimeReadId + "'")
-                .add("dayTimeRead=" + dayTimeRead)
-                .add("dayTimeReadId='" + dayTimeReadId + "'")
-                .add("monthTimeRead=" + monthTimeRead)
-                .add("monthTimeReadId='" + monthTimeReadId + "'")
-                .add("yearTimeRead=" + yearTimeRead)
-                .add("yearTimeReadId='" + yearTimeReadId + "'")
-                .add("sTimeSet=" + sTimeSet)
-                .add("sTimeSetId='" + sTimeSetId + "'")
-                .add("minTimeSet=" + minTimeSet)
-                .add("minTimeSetId='" + minTimeSetId + "'")
-                .add("hourTimeSet=" + hourTimeSet)
-                .add("hourTimeSetId='" + hourTimeSetId + "'")
-                .add("dayTimeSet=" + dayTimeSet)
-                .add("dayTimeSetId='" + dayTimeSetId + "'")
-                .add("monthTimeSet=" + monthTimeSet)
-                .add("monthTimeSetId='" + monthTimeSetId + "'")
-                .add("yearTimeSet=" + yearTimeSet)
-                .add("yearTimeSetId='" + yearTimeSetId + "'")
-                .add("orderNum=" + orderNum)
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/entity/CollectionParamsManageEntity.java

@@ -1,108 +0,0 @@
-package com.mh.user.entity;
-
-import com.fasterxml.jackson.annotation.JsonFormat;
-import lombok.Getter;
-import lombok.Setter;
-import org.springframework.format.annotation.DateTimeFormat;
-
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.time.LocalDateTime;
-import java.util.Date;
-import java.util.StringJoiner;
-
-/**
- * @author LJF
- * @version 1.0
- * @project CHWS
- * @description 采集参数实体类
- * @date 2025-12-10 10:53:33
- */
-@Getter
-@Setter
-public class CollectionParamsManageEntity implements Serializable {
-
-    static final long serialVersionUID = 42L;
-
-    private Long id;
-
-    /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date createTime;
-
-    /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date updateTime;
-    private Long buildingId;
-    /** 设备id */
-    private Long deviceInstallId;
-    /** 寄存器地址 */
-    private String registerAddr;
-    /** 功能码 */
-    private String funcCode;
-    /** 倍率 */
-    private Integer mtRatio;
-    /** 初始值 */
-    private BigDecimal mtInitValue;
-    /** 小数点 */
-    private Integer digits;
-    /** 数据类型 */
-    private Integer dataType;
-    /** 当前值 */
-    private BigDecimal curValue;
-    /** 当前时间 */
-    /** 当前时间 */
-    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-    private Date curTime;
-    /** 是否是总表 (0: 是, 1: 否) */
-    private Integer mtIsSum;
-    /** 单位 */
-    private String unit;
-    /** 排序 */
-    private Long orderNum;
-    /** 备注 */
-    private String remark;
-    /** 读取的寄存器大小 */
-    private Integer registerSize;
-    /** 是否使用 */
-    private Integer isUse;
-    /** 别名：mqtt上传名，唯一值 */
-    private String otherName;
-    /** 40，累计值，140瞬时值 */
-    private Integer grade;
-    /** 参数id */
-    private Integer paramTypeId;
-    /** 遥测、遥信数据类型 */
-    private Integer collectionType;
-    /** 上报质量 */
-    private String quality;
-
-    @Override
-    public String toString() {
-        return new StringJoiner(", ", CollectionParamsManageEntity.class.getSimpleName() + "[", "]")
-                .add("deviceInstallId=" + deviceInstallId)
-                .add("registerAddr='" + registerAddr + "'")
-                .add("funcCode='" + funcCode + "'")
-                .add("mtRatio=" + mtRatio)
-                .add("mtInitValue=" + mtInitValue)
-                .add("digits=" + digits)
-                .add("dataType=" + dataType)
-                .add("curValue=" + curValue)
-                .add("curTime=" + curTime)
-                .add("mtIsSum=" + mtIsSum)
-                .add("unit='" + unit + "'")
-                .add("orderNum=" + orderNum)
-                .add("remark='" + remark + "'")
-                .add("registerSize=" + registerSize)
-                .add("isUse=" + isUse)
-                .add("otherName='" + otherName + "'")
-                .add("grade=" + grade)
-                .add("paramTypeId=" + paramTypeId)
-                .add("collectionType=" + collectionType)
-                .add("quality='" + quality + "'")
-                .toString();
-    }
-}

user-service/src/main/java/com/mh/user/factory/BackTempControl.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,9 +40,4 @@ public class BackTempControl implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
 }

user-service/src/main/java/com/mh/user/factory/Device.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -19,20 +17,4 @@ public interface Device {
     String createOrders(DeviceCodeParamEntity deviceCodeParamEntity);
 
     String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity);
-
-    /**
-     * 解析MQTT报文
-     * @param dateStr
-     * @param registerAddr
-     * @param dataStr   已经是解析好的数据
-     * @param operateType   操作类型，读取/设置
-     * @param deviceInstallEntity
-     * @return
-     */
-    String analysisMQTTReceiveData(String dateStr,
-                                   String registerAddr,
-                                   String dataStr,
-                                   String operateType,
-                                   DeviceInstallEntity deviceInstallEntity,
-                                   CollectionParamsManageEntity collectionParamsManageEntity);
 }

user-service/src/main/java/com/mh/user/factory/EleMeter.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 import lombok.extern.slf4j.Slf4j;
 
@@ -45,9 +43,4 @@ public class EleMeter implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return eleMeterStrategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return eleMeterStrategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
 }

user-service/src/main/java/com/mh/user/factory/HeatPump.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,9 +40,4 @@ public class HeatPump implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
 }

user-service/src/main/java/com/mh/user/factory/HeatPumpStatus.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,9 +40,4 @@ public class HeatPumpStatus implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
 }

user-service/src/main/java/com/mh/user/factory/MultiControl.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class MultiControl implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/PressureTrans.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class PressureTrans implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/StatusCheck.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,10 +44,4 @@ public class StatusCheck implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return wtMeterStrategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return wtMeterStrategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/TempControl.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class TempControl implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/TempTrans.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class TempTrans implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/TimeControl.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class TimeControl implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity , collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/WaterLevelSwitch.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 
 /**
@@ -42,10 +40,4 @@ public class WaterLevelSwitch implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
         return strategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return strategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/factory/WtMeter.java

@@ -1,8 +1,6 @@
 package com.mh.user.factory;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
-import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.strategy.DeviceStrategy;
 import lombok.extern.slf4j.Slf4j;
 
@@ -46,10 +44,4 @@ public class WtMeter implements Device {
     public String analysisReceiveData(String dateStr, String deviceType, String registerAddr, String brand, String buildingId, String buildingName, String dataStr, DeviceCodeParamEntity deviceCodeParamEntity) {
        return wtMeterStrategy.analysisReceiveData(dateStr, deviceType, registerAddr, brand, buildingId, buildingName, dataStr, deviceCodeParamEntity);
     }
-
-    @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity, CollectionParamsManageEntity collectionParamsManageEntity) {
-        return wtMeterStrategy.analysisMQTTReceiveData(dateStr, registerAddr, dataStr, operateType, deviceInstallEntity, collectionParamsManageEntity);
-    }
-
 }

user-service/src/main/java/com/mh/user/job/DealDataJob.java

@@ -73,7 +73,7 @@ public class DealDataJob {
     /**
      * 采集
      */
-//    @Scheduled(cron = "35 0/2 * * * ?")
+    @Scheduled(cron = "35 0/2 * * * ?")
 //    @Scheduled(cron = "0 0/1 * * * ?")
 //    @Scheduled(cron = "0 0/5 * * * ?")  //5分钟
     public void collect() {

user-service/src/main/java/com/mh/user/job/GetWeatherInfoJob.java

@@ -42,7 +42,7 @@ public class GetWeatherInfoJob {
     /**
      * 定时获取每天天气
      */
-    @Scheduled(cron = "0 0 0 1/1 * ?")
+    @Scheduled(cron = "0 0 0 0/1 * ? ")
     public void getWeatherInfo() {
         // 从系统参数中获取对应的项目区域
         SysParamEntity sysParam = sysParamService.selectSysParam();

user-service/src/main/java/com/mh/user/mapper/CodeTableMapper.java

@@ -18,7 +18,4 @@ public interface CodeTableMapper {
     //从code_table表查询品牌
     @Select("select * from code_table where name='brand' ")
     List<DeviceTypeModel> queryBrand();
-
-    @Select("select * from code_table where name=#{name} ")
-    List<DeviceTypeModel> queryDataByName(String name);
 }

user-service/src/main/java/com/mh/user/mapper/CollectionParamsManageMapper.java

@@ -1,193 +0,0 @@
-package com.mh.user.mapper;
-
-import com.mh.user.dto.HotWaterControlListVO;
-import com.mh.user.entity.CollectionParamsManageEntity;
-import com.mh.user.entity.DeviceInstallEntity;
-import org.apache.ibatis.annotations.*;
-import tk.mybatis.mapper.common.BaseMapper;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author LJF
- * @version 1.0
- * @project CHWS
- * @description 采集参数设备mapper类
- * @date 2025-12-10 11:31:42
- */
-@Mapper
-public interface CollectionParamsManageMapper extends BaseMapper<CollectionParamsManageEntity> {
-
-    @Select("<script>" +
-            "SELECT * FROM (" +
-            "SELECT cpm.*, ROW_NUMBER() OVER (ORDER BY cpm.device_install_id) AS row_num " +
-            "FROM collection_params_manage cpm join device_install di on cpm.device_install_id = di.id where 1=1" +
-            "<if test='deviceInstallId != null and deviceInstallId != \"\"'>" +
-            "AND cpm.device_install_id = #{deviceInstallId} " +
-            "</if>" +
-            "<if test='buildingId != null and buildingId != \"\"'>" +
-            "AND di.building_id = #{buildingId} " +
-            "</if>" +
-            "<if test='otherName != null and otherName != \"\"'>" +
-            "AND cpm.other_name LIKE CONCAT('%', #{otherName}, '%') " +
-            "</if>" +
-            ") AS t WHERE t.row_num BETWEEN (#{pageNum}-1)*#{pageSize} AND #{pageNum}*#{pageSize}" +
-            "</script>")
-    @Results({
-            @Result(column = "id", property = "id"),
-            @Result(column = "create_time", property = "createTime"),
-            @Result(column = "update_time", property = "updateTime"),
-            @Result(column = "device_install_id", property = "deviceInstallId"),
-            @Result(column = "register_addr", property = "registerAddr"),
-            @Result(column = "func_code", property = "funcCode"),
-            @Result(column = "mt_ratio", property = "mtRatio"),
-            @Result(column = "mt_init_value", property = "mtInitValue"),
-            @Result(column = "digits", property = "digits"),
-            @Result(column = "data_type", property = "dataType"),
-            @Result(column = "cur_value", property = "curValue"),
-            @Result(column = "cur_time", property = "curTime"),
-            @Result(column = "mt_is_sum", property = "mtIsSum"),
-            @Result(column = "unit", property = "unit"),
-            @Result(column = "order_num", property = "orderNum"),
-            @Result(column = "remark", property = "remark"),
-            @Result(column = "register_size", property = "registerSize"),
-            @Result(column = "is_use", property = "isUse"),
-            @Result(column = "other_name", property = "otherName"),
-            @Result(column = "grade", property = "grade"),
-            @Result(column = "param_type_id", property = "paramTypeId"),
-            @Result(column = "collection_type", property = "collectionType"),
-            @Result(column = "quality", property = "quality")
-    })
-    List<CollectionParamsManageEntity> selectCPMList(String buildingId,String deviceInstallId, String otherName, Integer pageNum, Integer pageSize);
-
-    @Select("<script>" +
-            "SELECT count(1) " +
-            "FROM collection_params_manage cpm join device_install di on cpm.device_install_id = di.id where 1=1" +
-            "<if test='deviceInstallId != null and deviceInstallId != \"\"'>" +
-            "AND cpm.device_install_id = #{deviceInstallId} " +
-            "</if>" +
-            "<if test='buildingId != null and buildingId != \"\"'>" +
-            "AND di.building_id = #{buildingId} " +
-            "</if>" +
-            "<if test='otherName != null and otherName != \"\"'>" +
-            "AND cpm.other_name LIKE CONCAT('%', #{otherName}, '%') " +
-            "</if>" +
-            "</script>")
-    int selectCPMListCount(String buildingId, String deviceInstallId, String otherName, Integer pageNum, Integer pageSize);
-
-    @Select("select count(1) from collection_params_manage where other_name = #{otherName} ")
-    int selectCountByOtherName(String otherName);
-
-    @Update("update collection_params_manage set cur_value = #{value}, cur_time = #{time}, quality = #{quality} where other_name = #{name}")
-    void updateCPMByOtherName(String name, BigDecimal value, String time, String quality);
-
-    @Select("select top 1 * from collection_params_manage where other_name = #{name}")
-    @Results({
-            @Result(column = "id", property = "id"),
-            @Result(column = "create_time", property = "createTime"),
-            @Result(column = "update_time", property = "updateTime"),
-            @Result(column = "device_install_id", property = "deviceInstallId"),
-            @Result(column = "register_addr", property = "registerAddr"),
-            @Result(column = "func_code", property = "funcCode"),
-            @Result(column = "mt_ratio", property = "mtRatio"),
-            @Result(column = "mt_init_value", property = "mtInitValue"),
-            @Result(column = "digits", property = "digits"),
-            @Result(column = "data_type", property = "dataType"),
-            @Result(column = "cur_value", property = "curValue"),
-            @Result(column = "cur_time", property = "curTime"),
-            @Result(column = "mt_is_sum", property = "mtIsSum"),
-            @Result(column = "unit", property = "unit"),
-            @Result(column = "order_num", property = "orderNum"),
-            @Result(column = "remark", property = "remark"),
-            @Result(column = "register_size", property = "registerSize"),
-            @Result(column = "is_use", property = "isUse"),
-            @Result(column = "other_name", property = "otherName"),
-            @Result(column = "grade", property = "grade"),
-            @Result(column = "param_type_id", property = "paramTypeId"),
-            @Result(column = "collection_type", property = "collectionType"),
-            @Result(column = "quality", property = "quality")
-    })
-    CollectionParamsManageEntity selectDeviceInstallByOtherName(String name);
-
-    @Insert("insert into collection_params_manage(" +
-            "device_install_id, register_addr, func_code, mt_ratio, mt_init_value, digits, data_type, " +
-            "mt_is_sum, unit, order_num, remark, register_size, is_use, " +
-            "other_name, grade, param_type_id, collection_type, quality, create_time, building_id, cur_value, cur_time) " +
-            "values(#{deviceInstallId}, #{registerAddr}, #{funcCode}, #{mtRatio}, #{mtInitValue}, " +
-            "#{digits}, #{dataType}, #{mtIsSum}, #{unit}, #{orderNum}, " +
-            "#{remark}, #{registerSize}, #{isUse}, #{otherName}, #{grade}, #{paramTypeId}, " +
-            "#{collectionType}, #{quality}, getdate(), #{buildingId}, #{curValue}, #{curTime})")
-    void insertCPM(CollectionParamsManageEntity cpmEntity);
-
-    @Update("<script>" +
-            "update collection_params_manage " +
-            "<set>" +
-            "<if test='deviceInstallId != null'>device_install_id = #{deviceInstallId},</if>" +
-            "<if test='registerAddr != null'>register_addr = #{registerAddr},</if>" +
-            "<if test='funcCode != null'>func_code = #{funcCode},</if>" +
-            "<if test='mtRatio != null'>mt_ratio = #{mtRatio},</if>" +
-            "<if test='mtInitValue != null'>mt_init_value = #{mtInitValue},</if>" +
-            "<if test='digits != null'>digits = #{digits},</if>" +
-            "<if test='dataType != null'>data_type = #{dataType},</if>" +
-            "<if test='curValue != null'>cur_value = #{curValue},</if>" +
-            "<if test='curTime != null'>cur_time = #{curTime},</if>" +
-            "<if test='mtIsSum != null'>mt_is_sum = #{mtIsSum},</if>" +
-            "<if test='unit != null'>unit = #{unit},</if>" +
-            "<if test='orderNum != null'>order_num = #{orderNum},</if>" +
-            "<if test='remark != null'>remark = #{remark},</if>" +
-            "<if test='registerSize != null'>register_size = #{registerSize},</if>" +
-            "<if test='isUse != null'>is_use = #{isUse},</if>" +
-            "<if test='otherName != null'>other_name = #{otherName},</if>" +
-            "<if test='grade != null'>grade = #{grade},</if>" +
-            "<if test='paramTypeId != null'>param_type_id = #{paramTypeId},</if>" +
-            "<if test='collectionType != null'>collection_type = #{collectionType},</if>" +
-            "<if test='quality != null'>quality = #{quality},</if>" +
-            "<if test='buildingId != null'>building_id = #{buildingId},</if>" +
-            " update_time = getdate() " +
-            "</set>" +
-            "where id = #{id}" +
-            "</script>")
-    void updateById(CollectionParamsManageEntity cpmEntity);
-
-    @Delete("delete from collection_params_manage where id = #{msId}")
-    void deleteById(String msId);
-
-    @Select("SELECT " +
-            "  cpm.id as cpm_id, " +
-            "  di.building_id, " +
-            "  di.building_name, " +
-            "  di.device_type, " +
-            "  di.id as device_id, " +
-            "  di.device_name, " +
-            "  cpm.other_name, " +
-            "  cpm.cur_value, " +
-            "  cpm.cur_time, " +
-            "  cpm.param_type_id, " +
-            "  ct.order_num AS ct_order_num, " +
-            "  di.order_num AS dl_order_num  " +
-            "FROM " +
-            "  device_install di " +
-            "  JOIN collection_params_manage cpm ON di.id = cpm.device_install_id " +
-            "  JOIN code_table ct ON ct.des = di.device_type  " +
-            "  AND di.building_id = #{buildingId}  " +
-            "  AND ct.name = 'deviceType'  " +
-            "ORDER BY " +
-            "  ct.order_num, " +
-            "  di.order_num ")
-    @Results({
-            @Result(column = "cpm_id", property = "cpmId"),
-            @Result(column = "building_id", property = "buildingId"),
-            @Result(column = "building_name", property = "buildingName"),
-            @Result(column = "device_type", property = "deviceType"),
-            @Result(column = "device_id", property = "deviceId"),
-            @Result(column = "device_name", property = "deviceName"),
-            @Result(column = "other_name", property = "otherName"),
-            @Result(column = "cur_value", property = "curValue"),
-            @Result(column = "cur_time", property = "curTime"),
-            @Result(column = "param_type_id", property = "paramTypeId"),
-            @Result(column = "ct_order_num", property = "ctOrderNum"),
-            @Result(column = "dl_order_num", property = "dlOrderNum")
-    })
-    List<HotWaterControlListVO> selectHotWaterByBuildingId(String buildingId);
-}

user-service/src/main/java/com/mh/user/mapper/GatewayManageMapper.java

@@ -115,7 +115,4 @@ public interface GatewayManageMapper {
 
     @Select("select top 1 grade from gateway_manage where data_com = #{dataCom} ")
     int queryGatewayByDataCom(@Param("dataCom") String dataCom);
-
-    @Update("update gateway_manage set grade = #{grade}, connect_date = getdate() where sn = #{sn}")
-    void updateGatewayManageOnlineBySn(String sn, int grade);
 }

user-service/src/main/java/com/mh/user/mapper/MqttSubscriptionMapper.java

@@ -22,7 +22,7 @@ public interface MqttSubscriptionMapper extends BaseMapper<MqttSubscriptionEntit
             "SELECT * FROM mqtt_subscription WHERE 1=1 " +
             "<if test='topic != null and topic != \"\"'>AND topic = #{topic}</if>" +
             "<if test='status != null and status != \"\"'>AND status = #{status}</if>" +
-            "ORDER BY create_time DESC " +
+            "ORDER BY crate_time DESC " +
             "</script>")
     List<MqttSubscriptionEntity> selectListByTopic(@Param("topic") String topic,
                                                    @Param("status") String status);

user-service/src/main/java/com/mh/user/model/SanShiFengDatas.java

@@ -15,16 +15,16 @@ public class SanShiFengDatas<T extends Number> {
     /**
      * 对应研华的标签值
      */
-    private String name;
+    private String tag;
 
     /**
      * 上报值
      */
     private T value;
 
-//    /**
+    /**
-//     * 质量值
+     * 质量值
-//     */
+     */
-//    private T quality;
+    private T quality;
 
 }

user-service/src/main/java/com/mh/user/model/SanShiFengReceiver.java

@@ -3,7 +3,6 @@ package com.mh.user.model;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import lombok.Data;
 
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -20,26 +19,11 @@ public class SanShiFengReceiver<T> {
     /**
      * 数据集合
      */
-    private List<T> datas;
+    private List<T> d;
 
     /**
      * 主动上报数据时间（带T类型）
      */
-    private String sn;
+    private String ts;
-
-    private String plcName;
-
-    private String projectName;
-
-    private String time;
-
-    // 确保在 getDatas() 方法中正确处理泛型类型
-    public List<SanShiFengDatas> getDatas() {
-        // 如果是从 JSON 反序列化，使用 TypeReference
-        if (this.datas != null) {
-            return (List<SanShiFengDatas>) this.datas;
-        }
-        return Collections.emptyList();
-    }
 
 }

user-service/src/main/java/com/mh/user/service/CodeTableService.java

@@ -9,6 +9,4 @@ public interface CodeTableService {
     List<DeviceTypeModel> queryDeviceType();
 
     List<DeviceTypeModel> queryBrand();
-
-    List<DeviceTypeModel> queryDataByName(String name);
 }

user-service/src/main/java/com/mh/user/service/CollectionParamsManageService.java

@@ -1,39 +0,0 @@
-package com.mh.user.service;
-
-import com.mh.user.dto.HotWaterControlDTO;
-import com.mh.user.dto.HotWaterNowDataDTO;
-import com.mh.user.entity.CollectionParamsManageEntity;
-import com.mh.user.entity.DeviceInstallEntity;
-
-import java.math.BigDecimal;
-import java.util.List;
-
-/**
- * @author LJF
- * @version 1.0
- * @project EEMCS
- * @description 采集参数管理
- * @date 2025-02-14 13:58:37
- */
-public interface CollectionParamsManageService {
-
-    List<CollectionParamsManageEntity> selectCPMList(String buildingId, String deviceInstallId, String otherName, Integer pageNum, Integer pageSize);
-
-    int selectCPMListCount(String buildingId, String deviceInstallId, String otherName, Integer pageNum, Integer pageSize);
-
-    CollectionParamsManageEntity selectById(String msId);
-
-    String insertCPM(CollectionParamsManageEntity mqttSubscription);
-
-    String updateCPM(CollectionParamsManageEntity mqttSubscription);
-
-    int deleteByIds(String[] msIds);
-
-    void updateCPMByOtherName(String name, BigDecimal value, String time);
-
-    CollectionParamsManageEntity selectDeviceInstallByOtherName(String name);
-
-    List<HotWaterNowDataDTO> monitorList(String buildingId);
-
-    List<HotWaterControlDTO> operateList(String floorId);
-}

user-service/src/main/java/com/mh/user/service/GatewayManageService.java

@@ -53,6 +53,4 @@ public interface GatewayManageService {
     void updateGatewayManageOnlineByHeartBeatCode(String heartBeat, int status);
 
     void updateGatewayManageOnlineByImei(String imei, int status);
-
-    void updateGatewayManageOnlineBySn(String sn, int grade);
 }

user-service/src/main/java/com/mh/user/service/impl/CodeTableServiceImpl.java

@@ -6,7 +6,6 @@ import com.mh.user.service.CodeTableService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -24,9 +23,4 @@ public class CodeTableServiceImpl implements CodeTableService {
     public List<DeviceTypeModel> queryBrand() {
         return codeTableMapper.queryBrand();
     }
-
-    @Override
-    public List<DeviceTypeModel> queryDataByName(String name) {
-        return codeTableMapper.queryDataByName(name);
-    }
 }

user-service/src/main/java/com/mh/user/service/impl/CollectionParamsManageServiceImpl.java

@@ -1,576 +0,0 @@
-package com.mh.user.service.impl;
-
-import com.mh.common.utils.StringUtils;
-import com.mh.user.constants.Constant;
-import com.mh.user.dto.*;
-import com.mh.user.entity.CollectionParamsManageEntity;
-import com.mh.user.entity.DeviceInstallEntity;
-import com.mh.user.mapper.CollectionParamsManageMapper;
-import com.mh.user.service.CollectionParamsManageService;
-import org.springframework.stereotype.Service;
-
-import java.math.BigDecimal;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.Date;
-import java.util.List;
-import java.util.stream.Collectors;
-
-/**
- * @author LJF
- * @version 1.0
- * @project CHWS
- * @description 采集参数设备实现类
- * @date 2025-12-10 11:30:54
- */
-@Service
-public class CollectionParamsManageServiceImpl implements CollectionParamsManageService {
-
-    private final CollectionParamsManageMapper collectionParamsManageMapper;
-
-    public CollectionParamsManageServiceImpl(CollectionParamsManageMapper collectionParamsManageMapper) {
-        this.collectionParamsManageMapper = collectionParamsManageMapper;
-    }
-
-    @Override
-    public List<HotWaterNowDataDTO> monitorList(String buildingId) {
-        return Collections.emptyList();
-    }
-
-    @Override
-    public List<HotWaterControlDTO> operateList(String floorId) {
-        List<HotWaterControlListVO> hotWaterControlListVOS = collectionParamsManageMapper.selectHotWaterByBuildingId(floorId);
-        if (hotWaterControlListVOS.isEmpty()) {
-            return Collections.emptyList();
-        }
-
-        return hotWaterControlListVOS.stream()
-//                .peek(vo -> System.out.println(vo.getHiOrderNum()))
-                .collect(Collectors.groupingBy(HotWaterControlListVO::getDeviceType))
-                .entrySet().stream()
-                .map(houseEntry -> {
-                    HotWaterControlDTO dto = new HotWaterControlDTO();
-                    dto.setId(houseEntry.getKey());
-                    dto.setName(houseEntry.getValue().get(0).getDeviceType());
-                    dto.setOrderNum(houseEntry.getValue().get(0).getCtOrderNum());
-
-                    List<?> children = houseEntry.getValue().stream()
-                            .collect(Collectors.groupingBy(HotWaterControlListVO::getDeviceId))
-                            .entrySet().stream()
-                            .map(dlEntry -> {
-                                List<HotWaterControlListVO> dlItems = dlEntry.getValue();
-                                switch (dto.getName()) {
-                                    case "系统":
-                                        HotWaterSystemControlVO vo = new HotWaterSystemControlVO();
-                                        vo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            // 如果设备名称为空，则使用房间号
-                                            vo.setName(dto.getName());
-                                        } else {
-                                            vo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        vo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "1":
-                                                    // 启用写入时间
-                                                    vo.setTimeSet(item.getCurValue().intValue());
-                                                    vo.setTimeSetId(item.getCpmId());
-                                                    break;
-                                                case "5":
-                                                    // 压力
-                                                    vo.setPressure(item.getCurValue());
-                                                    vo.setPressureId(item.getCpmId());
-                                                    break;
-                                                case "6":
-                                                    // 回水温度
-                                                    vo.setInTemp(item.getCurValue());
-                                                    vo.setInTempId(item.getCpmId());
-                                                    break;
-                                                case "10":
-                                                    // 水箱温度
-                                                    vo.setTankTemp(item.getCurValue());
-                                                    vo.setTankTempId(item.getCpmId());
-                                                    break;
-                                                case "19":
-                                                    // 太阳能温度
-                                                    vo.setSolarTemp(item.getCurValue());
-                                                    vo.setSolarTempId(item.getCpmId());
-                                                    break;
-                                                case "15":
-                                                    // 时间
-                                                    if ("年_读".equals(item.getOtherName())) {
-                                                        vo.setYearTimeRead(item.getCurValue().intValue());
-                                                        vo.setYearTimeReadId(item.getCpmId());
-                                                    } else if ("月_读".equals(item.getOtherName())) {
-                                                        vo.setMonthTimeRead(item.getCurValue().intValue());
-                                                        vo.setMonthTimeReadId(item.getCpmId());
-                                                    } else if ("日_读".equals(item.getOtherName())) {
-                                                        vo.setDayTimeRead(item.getCurValue().intValue());
-                                                        vo.setDayTimeReadId(item.getCpmId());
-                                                    } else if ("时_读".equals(item.getOtherName())) {
-                                                        vo.setHourTimeRead(item.getCurValue().intValue());
-                                                        vo.setHourTimeReadId(item.getCpmId());
-                                                    } else if ("分_读".equals(item.getOtherName())) {
-                                                        vo.setMinTimeRead(item.getCurValue().intValue());
-                                                        vo.setMinTimeReadId(item.getCpmId());
-                                                    } else if ("秒_读".equals(item.getOtherName())) {
-                                                        vo.setSTimeSet(item.getCurValue().intValue());
-                                                        vo.setSTimeSetId(item.getCpmId());
-                                                    } else if ("年_写".equals(item.getOtherName())) {
-                                                        vo.setYearTimeSet(item.getCurValue().intValue());
-                                                        vo.setYearTimeSetId(item.getCpmId());
-                                                    } else if ("月_写".equals(item.getOtherName())) {
-                                                        vo.setMonthTimeSet(item.getCurValue().intValue());
-                                                        vo.setMonthTimeSetId(item.getCpmId());
-                                                    } else if ("日_写".equals(item.getOtherName())) {
-                                                        vo.setDayTimeSet(item.getCurValue().intValue());
-                                                        vo.setDayTimeSetId(item.getCpmId());
-                                                    } else if ("时_写".equals(item.getOtherName())) {
-                                                        vo.setHourTimeSet(item.getCurValue().intValue());
-                                                        vo.setHourTimeSetId(item.getCpmId());
-                                                    } else if ("分_写".equals(item.getOtherName())) {
-                                                        vo.setMinTimeSet(item.getCurValue().intValue());
-                                                        vo.setMinTimeSetId(item.getCpmId());
-                                                    } else if ("秒_写".equals(item.getOtherName())) {
-                                                        vo.setSTimeSet(item.getCurValue().intValue());
-                                                        vo.setSTimeSetId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return vo;
-                                    case "热泵":
-                                        HotWaterHotPumpControlVO hotPumpVo = new HotWaterHotPumpControlVO(); // 修改类名
-                                        hotPumpVo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            // 如果设备名称为空，则使用房间号
-                                            hotPumpVo.setName(dto.getName());
-                                        } else {
-                                            hotPumpVo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        hotPumpVo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 判断只有存在一个故障点，那么当前设备就是故障
-                                        if (dlItems.stream().anyMatch(item -> ("3".equals(item.getParamTypeId()) && "1".equals(item.getCurValue().toString())))) {
-                                            hotPumpVo.setFault(1); // 去除pump前缀
-                                        }
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "4":
-                                                    // 定时开关
-                                                    if (item.getOtherName().contains("12定时_时开1")) {
-                                                        hotPumpVo.setOneHourTimeOpenSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_时关1")) {
-                                                        hotPumpVo.setOneHourTimeCloseSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_时开2")) {
-                                                        hotPumpVo.setOneHourTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_时关2")) {
-                                                        hotPumpVo.setOneHourTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_时开3")) {
-                                                        hotPumpVo.setOneHourTimeOpenSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_时关3")) {
-                                                        hotPumpVo.setOneHourTimeCloseSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneHourTimeCloseSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分开1")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeOpenSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分关1")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeCloseSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分开2")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分关2")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分开3")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeOpenSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("12定时_分关3")) { // 新增分钟设置
-                                                        hotPumpVo.setOneMinTimeCloseSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setOneMinTimeCloseSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时开1")) {
-                                                        hotPumpVo.setTwoHourTimeOpenSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时关1")) {
-                                                        hotPumpVo.setTwoHourTimeCloseSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时开2")) {
-                                                        hotPumpVo.setTwoHourTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时关2")) {
-                                                        hotPumpVo.setTwoHourTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时开3")) {
-                                                        hotPumpVo.setTwoHourTimeOpenSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_时关3")) {
-                                                        hotPumpVo.setTwoHourTimeCloseSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoHourTimeCloseSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分开1")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeOpenSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分关1")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeCloseSetOne(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分开2")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分关2")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分开3")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeOpenSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("34定时_分关3")) { // 新增分钟设置
-                                                        hotPumpVo.setTwoMinTimeCloseSetThree(item.getCurValue().intValue());
-                                                        hotPumpVo.setTwoMinTimeCloseSetThreeId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                case "1":
-                                                    // 启停控制
-                                                    hotPumpVo.setStartStopControl(item.getCurValue().intValue()); // 去除pump前缀
-                                                    hotPumpVo.setStartStopControlId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "2":
-                                                    // 运行状态
-                                                    hotPumpVo.setRunState(item.getCurValue().intValue()); // 去除pump前缀
-                                                    hotPumpVo.setRunStateId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "10":
-                                                    // 水箱温度
-                                                    hotPumpVo.setTankTemp(item.getCurValue()); // 去除pump前缀
-                                                    hotPumpVo.setTankTempId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "11":
-                                                    // 出水温度
-                                                    hotPumpVo.setOutWaterTemp(item.getCurValue()); // 去除pump前缀
-                                                    hotPumpVo.setOutWaterTempId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "12":
-                                                    // 回水温度
-                                                    hotPumpVo.setInWaterTemp(item.getCurValue()); // 去除pump前缀
-                                                    hotPumpVo.setInWaterTempId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "16":
-                                                    // 累计运行时间
-                                                    hotPumpVo.setRunTime(item.getCurValue()); // 去除pump前缀
-                                                    hotPumpVo.setRunTimeId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "17":
-                                                    // 开机
-                                                    hotPumpVo.setStart(item.getCurValue().toString()); // 去除pump前缀
-                                                    hotPumpVo.setStartId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                case "18":
-                                                    // 关机
-                                                    hotPumpVo.setStop(item.getCurValue().toString()); // 去除pump前缀
-                                                    hotPumpVo.setStopId(item.getCpmId()); // 去除pump前缀
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return hotPumpVo;
-                                    case "循环泵":
-                                        HotWaterCircuitPumpControlVO circuitPumpVo = new HotWaterCircuitPumpControlVO();
-                                        circuitPumpVo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            // 如果设备名称为空，则使用房间号
-                                            circuitPumpVo.setName(dto.getName());
-                                        } else {
-                                            circuitPumpVo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        circuitPumpVo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "1":
-                                                    // 启停
-                                                    circuitPumpVo.setStartStopControl(item.getCurValue().intValue());
-                                                    circuitPumpVo.setStartStopControlId(item.getCpmId());
-                                                    break;
-                                                case "2":
-                                                    // 运行状态
-                                                    circuitPumpVo.setRunState(item.getCurValue().intValue());
-                                                    circuitPumpVo.setRunStateId(item.getCpmId());
-                                                    break;
-                                                case "3":
-                                                    // 故障
-                                                    circuitPumpVo.setFault(item.getCurValue().intValue());
-                                                    circuitPumpVo.setFaultId(item.getCpmId());
-                                                    break;
-                                                case "4":
-                                                    // 时控
-                                                    if (item.getOtherName().contains("定时_时开1")) {
-                                                        circuitPumpVo.setOneHourTimeOpenSetOne(item.getCurValue().intValue());
-                                                        circuitPumpVo.setOneHourTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时关1")) {
-                                                        circuitPumpVo.setOneHourTimeCloseSetOne(item.getCurValue().intValue());
-                                                        circuitPumpVo.setOneHourTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分开1")) {
-                                                        circuitPumpVo.setOneMinTimeOpenSetOne(item.getCurValue().intValue());
-                                                        circuitPumpVo.setOneMinTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分关1")) {
-                                                        circuitPumpVo.setOneMinTimeCloseSetOne(item.getCurValue().intValue());
-                                                        circuitPumpVo.setOneMinTimeCloseSetOneId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                case "15":
-                                                    // 开延时
-                                                    circuitPumpVo.setOpenDelayTime(item.getCurValue().intValue());
-                                                    circuitPumpVo.setOpenDelayTimeId(item.getCpmId());
-                                                    break;
-                                                case "16":
-                                                    if (item.getOtherName().contains("小时")) {
-                                                        // 累计运行时间
-                                                        circuitPumpVo.setRunTime(item.getCurValue());
-                                                        circuitPumpVo.setRunTimeId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return circuitPumpVo;
-                                    case "回水泵":
-                                        HotWaterBackPumpControlVO backPumpVo = new HotWaterBackPumpControlVO();
-                                        backPumpVo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            // 如果设备名称为空，则使用房间号
-                                            backPumpVo.setName(dto.getName());
-                                        } else {
-                                            backPumpVo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        backPumpVo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "1":
-                                                    // 启停
-                                                    backPumpVo.setStartStopControl(item.getCurValue().intValue());
-                                                    backPumpVo.setStartStopControlId(item.getCpmId());
-                                                    break;
-                                                case "2":
-                                                    // 运行状态
-                                                    backPumpVo.setRunState(item.getCurValue().intValue());
-                                                    backPumpVo.setRunStateId(item.getCpmId());
-                                                    break;
-                                                case "3":
-                                                    // 故障
-                                                    backPumpVo.setFault(item.getCurValue().intValue());
-                                                    backPumpVo.setFaultId(item.getCpmId());
-                                                    break;
-                                                case "4":
-                                                    // 时控
-                                                    if (item.getOtherName().contains("定时_时开1")) {
-                                                        backPumpVo.setOneHourTimeOpenSetOne(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时关1")) {
-                                                        backPumpVo.setOneHourTimeCloseSetOne(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分开1")) {
-                                                        backPumpVo.setOneMinTimeOpenSetOne(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeOpenSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分关1")) {
-                                                        backPumpVo.setOneMinTimeCloseSetOne(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeCloseSetOneId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时开2")) {
-                                                        backPumpVo.setOneHourTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时关2")) {
-                                                        backPumpVo.setOneHourTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分开2")) {
-                                                        backPumpVo.setOneMinTimeOpenSetTwo(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeOpenSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分关2")) {
-                                                        backPumpVo.setOneMinTimeCloseSetTwo(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeCloseSetTwoId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时开3")) {
-                                                        backPumpVo.setOneHourTimeOpenSetThree(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_时关3")) {
-                                                        backPumpVo.setOneHourTimeCloseSetThree(item.getCurValue().intValue());
-                                                        backPumpVo.setOneHourTimeCloseSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分开3")) {
-                                                        backPumpVo.setOneMinTimeOpenSetThree(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeOpenSetThreeId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("定时_分关3")) {
-                                                        backPumpVo.setOneMinTimeCloseSetThree(item.getCurValue().intValue());
-                                                        backPumpVo.setOneMinTimeCloseSetThreeId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                case "7":
-                                                    // 回水温度设置
-                                                    backPumpVo.setTempSet(item.getCurValue());
-                                                    backPumpVo.setTempSetId(item.getCpmId());
-                                                    break;
-                                                case "15":
-                                                    // 开延时
-                                                    backPumpVo.setOpenDelayTime(item.getCurValue().intValue());
-                                                    backPumpVo.setOpenDelayTimeId(item.getCpmId());
-                                                    break;
-                                                case "16":
-                                                    if (item.getOtherName().contains("小时")) {
-                                                        // 累计运行时间
-                                                        backPumpVo.setRunTime(item.getCurValue());
-                                                        backPumpVo.setRunTimeId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return backPumpVo;
-                                    case "设备校准":
-                                        HotWaterDeviceCalibrationControlVO deviceCalibrationVo = new HotWaterDeviceCalibrationControlVO();
-                                        deviceCalibrationVo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            // 如果设备名称为空，则使用房间号
-                                            deviceCalibrationVo.setName(dto.getName());
-                                        } else {
-                                            deviceCalibrationVo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        deviceCalibrationVo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "0":
-                                                    if (item.getOtherName().contains("工程量上限")) {
-                                                        deviceCalibrationVo.setEngineeringMaxValue(item.getCurValue());
-                                                        deviceCalibrationVo.setEngineeringMaxValueId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("工程量下限")) {
-                                                        deviceCalibrationVo.setEngineeringMinValue(item.getCurValue());
-                                                        deviceCalibrationVo.setEngineeringMinValueId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("数字量上限")) {
-                                                        deviceCalibrationVo.setDigitalMaxValue(item.getCurValue());
-                                                        deviceCalibrationVo.setDigitalMaxValueId(item.getCpmId());
-                                                    } else if (item.getOtherName().contains("数字量下限")) {
-                                                        deviceCalibrationVo.setDigitalMinValue(item.getCurValue());
-                                                        deviceCalibrationVo.setDigitalMinValueId(item.getCpmId());
-                                                    }
-                                                    break;
-                                                case "9":
-                                                    // 校准值
-                                                    deviceCalibrationVo.setCalibrationValue(item.getCurValue());
-                                                    deviceCalibrationVo.setCalibrationValueId(item.getCpmId());
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return deviceCalibrationVo;
-                                    case "电表":
-                                    case "水表":
-                                        HotWaterDeviceControlVO meterVo = new HotWaterDeviceControlVO();
-                                        meterVo.setId(dlEntry.getKey());
-                                        if (StringUtils.isBlank(dlItems.get(0).getDeviceName())) {
-                                            meterVo.setName(dto.getName());
-                                        } else {
-                                            meterVo.setName(dlItems.get(0).getDeviceName());
-                                        }
-                                        meterVo.setOrderNum(dlItems.get(0).getDlOrderNum());
-                                        // 单独对系统参数
-                                        dlItems.forEach(item -> {
-                                            switch (item.getParamTypeId()) {
-                                                case "13":
-                                                    meterVo.setTotalReading(item.getCurValue());
-                                                    meterVo.setTotalReadingId(item.getCpmId());
-                                                    break;
-                                                case "14":
-                                                    meterVo.setTotalReading(item.getCurValue());
-                                                    meterVo.setTotalReadingId(item.getCpmId());
-                                                    break;
-                                                default:
-                                                    break;
-                                            }
-                                        });
-                                        return meterVo;
-                                    default:
-                                        break;
-                                }
-                                return null;
-                            })
-                            .collect(Collectors.toList());
-                    dto.setChildren(children);
-                    return dto;
-                })
-                // 添加排序操作
-                .sorted(Comparator.comparingInt(HotWaterControlDTO::getOrderNum))
-                .collect(Collectors.toList());
-    }
-
-    @Override
-    public CollectionParamsManageEntity selectDeviceInstallByOtherName(String name) {
-        return collectionParamsManageMapper.selectDeviceInstallByOtherName(name);
-    }
-
-    @Override
-    public void updateCPMByOtherName(String name, BigDecimal value, String time) {
-        try {
-            collectionParamsManageMapper.updateCPMByOtherName(name, value, time, "0");
-        } catch (Exception e) {
-            collectionParamsManageMapper.updateCPMByOtherName(name, new BigDecimal(0), time, "-1");
-            ;
-        }
-    }
-
-    @Override
-    public List<CollectionParamsManageEntity> selectCPMList(String buildingId, String deviceInstallId, String otherName, Integer pageNum, Integer pageSize) {
-        return collectionParamsManageMapper.selectCPMList(buildingId, deviceInstallId, otherName, pageNum, pageSize);
-    }
-
-    @Override
-    public int selectCPMListCount(String buildingId, String deviceInstallId, String otherName, Integer pageNum, Integer pageSize) {
-        return collectionParamsManageMapper.selectCPMListCount(buildingId, deviceInstallId, otherName, pageNum, pageSize);
-    }
-
-    @Override
-    public CollectionParamsManageEntity selectById(String msId) {
-        return collectionParamsManageMapper.selectByPrimaryKey(msId);
-    }
-
-    @Override
-    public String insertCPM(CollectionParamsManageEntity cpmEntity) {
-        // 判断是否存在otherName
-        if (collectionParamsManageMapper.selectCountByOtherName(cpmEntity.getOtherName()) > 0) {
-            return "存在相同参数名称";
-        }
-        if (null == cpmEntity.getCurTime()) {
-            cpmEntity.setCurTime(new Date());
-        }
-        collectionParamsManageMapper.insertCPM(cpmEntity);
-        return Constant.SUCCESS;
-    }
-
-    @Override
-    public String updateCPM(CollectionParamsManageEntity cpmEntity) {
-        // 判断是否存在otherName
-//        if (collectionParamsManageMapper.selectCountByOtherName(cpmEntity.getOtherName()) > 0) {
-//            return "存在相同参数名称";
-//        }
-        collectionParamsManageMapper.updateById(cpmEntity);
-        return Constant.SUCCESS;
-    }
-
-    @Override
-    public int deleteByIds(String[] msIds) {
-        if (msIds != null && msIds.length > 0) {
-            for (String msId : msIds) {
-                collectionParamsManageMapper.deleteById(msId);
-            }
-            return msIds.length;
-        }
-        return 0;
-    }
-}

user-service/src/main/java/com/mh/user/service/impl/GatewayManageServiceImpl.java

@@ -108,9 +108,4 @@ public class GatewayManageServiceImpl implements GatewayManageService {
     public void updateGatewayManageOnlineByImei(String imei, int status) {
         gatewayManageMapper.updateGatewayManageOnlineByImei(imei, status);
     }
-
-    @Override
-    public void updateGatewayManageOnlineBySn(String sn, int grade) {
-        gatewayManageMapper.updateGatewayManageOnlineBySn(sn, grade);
-    }
 }

user-service/src/main/java/com/mh/user/service/mqtt/config/MqttConfig.java

@@ -84,7 +84,7 @@ public class MqttConfig {
         // 直接进行自动连接
         mqttConnectOptions.setAutomaticReconnect(true);
         // 时间间隔时间10s
-        mqttConnectOptions.setKeepAliveInterval(1000);
+        mqttConnectOptions.setKeepAliveInterval(10);
 
         return mqttConnectOptions;
     }

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

@@ -3,19 +3,8 @@ package com.mh.user.service.mqtt.service.impl;
 import com.alibaba.fastjson2.JSONObject;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.mh.user.constants.ChannelName;
-import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
-import com.mh.user.entity.DeviceInstallEntity;
-import com.mh.user.factory.Device;
-import com.mh.user.factory.DeviceFactory;
-import com.mh.user.model.SanShiFengDatas;
 import com.mh.user.model.SanShiFengReceiver;
-import com.mh.user.service.CollectionParamsManageService;
-import com.mh.user.service.DeviceInstallService;
-import com.mh.user.service.GatewayManageService;
 import com.mh.user.service.mqtt.service.IEventsService;
-import com.mh.user.strategy.DeviceStrategy;
-import com.mh.user.strategy.DeviceStrategyFactory;
 import io.netty.util.CharsetUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,9 +13,6 @@ import org.springframework.messaging.MessageHeaders;
 import org.springframework.stereotype.Service;
 
 import java.io.IOException;
-import java.math.BigDecimal;
-import java.util.HashMap;
-import java.util.List;
 import java.util.Objects;
 
 /**
@@ -43,15 +29,6 @@ public class EventsServiceImpl implements IEventsService {
     @Autowired
     private ObjectMapper mapper;
 
-    @Autowired
-    private GatewayManageService gatewayManageService;
-
-    @Autowired
-    private CollectionParamsManageService collectionParamManageService;
-
-    @Autowired
-    private DeviceInstallService deviceInstallService;
-
     @ServiceActivator(inputChannel = ChannelName.EVENTS_UPLOAD_INBOUND)
     @Override
     public void handleInboundUpload(byte[] receiver, MessageHeaders headers) {
@@ -85,64 +62,10 @@ public class EventsServiceImpl implements IEventsService {
 
     private void handleInboundData(byte[] receiver,String topic, String logMessage) {
         try {
-            SanShiFengReceiver datas = new SanShiFengReceiver();
+            SanShiFengReceiver commonTopicReceiver = new SanShiFengReceiver();
-            datas = mapper.readValue(receiver, SanShiFengReceiver.class);
+            commonTopicReceiver = mapper.readValue(receiver, SanShiFengReceiver.class);
-            log.info("主题：{}，类型：{}: ，数据：{}", topic, logMessage, datas.toString());
+            log.info("主题：{}，类型：{}: ，数据：{}", topic, logMessage, commonTopicReceiver.toString());
-            // 开始遍历 数据
+            // 不使用消息队列，查询属于哪种设备类型，然后通过策略进行数据解析
-            String sn = datas.getSn();
-            String plcName = datas.getPlcName();
-            String projectName = datas.getProjectName();
-            String time = datas.getTime();
-            // 更新网关设备在线状态
-            gatewayManageService.updateGatewayManageOnlineBySn(sn, 0);
-            // 修复类型转换问题
-            List<?> rawDataList = datas.getDatas();
-            for (Object rawData : rawDataList) {
-                // 安全地转换对象
-                SanShiFengDatas data = new SanShiFengDatas();
-                if (rawData instanceof SanShiFengDatas) {
-                    data = (SanShiFengDatas) rawData;
-                } else {
-                    // 如果是 LinkedHashMap，则手动转换
-                    JSONObject jsonObject = new JSONObject((HashMap<?, ?>) rawData);
-                    try {
-                        data = jsonObject.to(SanShiFengDatas.class);
-                    } catch (Exception e) {
-                        log.error("mqtt数据上报异常", e);
-                        data.setName(jsonObject.getString("name"));
-                        data.setValue(0);
-                    }
-                }
-                // 不使用消息队列，查询属于哪种设备类型，然后通过策略进行数据解析
-                log.info("设备SN：{}，PLC名称：{}，项目名称：{}，时间：{}，数据：{}", sn, plcName, projectName, time, data.toString());
-                // 获取点位参数名称
-                String name = data.getName();
-                // 获取点位值
-                BigDecimal value = new BigDecimal(0);
-                try {
-                    value = new BigDecimal(String.valueOf(data.getValue()));
-                } catch (Exception e) {
-                    value = BigDecimal.ZERO;
-                }
-                // 直接更新collectionParamManage参数值
-                collectionParamManageService.updateCPMByOtherName(name, value, time);
-                // 查询device_install表，走之前的逻辑
-                CollectionParamsManageEntity collectionParamsManageEntity = collectionParamManageService.selectDeviceInstallByOtherName(name);
-                if (null != collectionParamsManageEntity && collectionParamsManageEntity.getDeviceInstallId() != null) {
-                    DeviceInstallEntity deviceInstallEntity = deviceInstallService.selectDeviceById(collectionParamsManageEntity.getDeviceInstallId());
-                    if (deviceInstallEntity != null) {
-                        // 开始走策略判断
-                        String deviceType = deviceInstallEntity.getDeviceType();
-                        Device device = DeviceFactory.createDevice(deviceType);
-                        DeviceStrategy strategy = DeviceStrategyFactory.createStrategy(deviceType);
-                        if (null == strategy) {
-                            continue;
-                        }
-                        device.setStrategy(strategy);
-                        device.analysisMQTTReceiveData(time, deviceInstallEntity.getDeviceAddr(), String.valueOf(value), Constant.READ, deviceInstallEntity, collectionParamsManageEntity);
-                    }
-                }
-            }
         } catch (IOException e) {
             log.error("处理数据时发生错误: ", e);
         }

user-service/src/main/java/com/mh/user/service/mqtt/service/impl/MqttTopicServiceImpl.java

@@ -1,11 +1,10 @@
 package com.mh.user.service.mqtt.service.impl;
 
-import com.mh.user.service.mqtt.service.IMqttTopicService;
+import com.mh.framework.mqtt.service.IMqttTopicService;
+import jakarta.annotation.Resource;
 import org.springframework.integration.mqtt.inbound.MqttPahoMessageDrivenChannelAdapter;
 import org.springframework.stereotype.Service;
 
-import javax.annotation.Resource;
-
 /**
  * @author LJF
  * @version 1.0

user-service/src/main/java/com/mh/user/strategy/BackTempControlStrategy.java

@@ -1,7 +1,6 @@
 package com.mh.user.strategy;
 
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.entity.NowPublicDataEntity;
@@ -108,8 +107,7 @@ public class BackTempControlStrategy implements DeviceStrategy {
                                           String registerAddr,
                                           String dataStr,
                                           String operateType,
-                                          DeviceInstallEntity deviceInstallEntity,
+                                          DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         String result = Constant.FAIL;
         if (Integer.parseInt(dataStr) < 0) {
             log.info("回水温控报文检验失败: " + dataStr);

user-service/src/main/java/com/mh/user/strategy/DeviceStrategy.java

@@ -1,6 +1,5 @@
 package com.mh.user.strategy;
 
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 
@@ -33,6 +32,5 @@ public interface DeviceStrategy {
                                    String registerAddr,
                                    String dataStr,
                                    String operateType,
-                                   DeviceInstallEntity deviceInstallEntity,
+                                   DeviceInstallEntity deviceInstallEntity);
-                                   CollectionParamsManageEntity collectionParamsManageEntity);
 }

user-service/src/main/java/com/mh/user/strategy/EleMeterStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DataResultEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
@@ -47,15 +46,22 @@ public class EleMeterStrategy implements DeviceStrategy {
         String deviceAddr = deviceCodeParamEntity.getDeviceAddr();
         if (deviceAddr != null && deviceAddr.length() > 0) {
             try {
-                // 增加一个判断，判断是否是广仪电表modbus协议 广仪MODBUS协议
+                // 增加一个判断，判断是否是广仪电表modbus协议
-                if ("广仪MODBUS协议".equals(deviceCodeParamEntity.getBrand()) || deviceCodeParamEntity.getBrand().contains("广仪MODBUS")) {
+                if ("广仪MODBUS协议".equals(deviceCodeParamEntity.getBrand())) {
                     str = ExchangeStringUtil.decToHex(deviceAddr);
                     str = ExchangeStringUtil.addZeroForNum(str, 2);  //以0补位
-                    str = str + "04" + "00010002";
+//                if(registerAddr.equals("")){
+//                    str=str+"0300000002";
+//                }else if(registerAddr.equals("")){
+//                    str=str+"0300000002";
+//                }
+//                    String funCode = ExchangeStringUtil.addZeroForNum(deviceCodeParamEntity.getFunCode(), 2);
+//                    if ("04".equals(funCode)) {
+                        str = str + "04" + "00010002";
+//                    }
                     String checkWord = ExchangeStringUtil.getStrCRC16(str); //CRC16校验
                     str = str + checkWord;
-                    return str.toUpperCase();
+                } if ("广仪07规约".equals(deviceCodeParamEntity.getBrand())) {
-                } else if ("广仪07规约".equals(deviceCodeParamEntity.getBrand())) {
                     //0代表前面补充0,12代表长度为12,d代表参数为正数型,基表通讯号
                     str = String.format("%012d", Long.parseLong(deviceAddr));
                     //转换位置
@@ -68,7 +74,6 @@ public class EleMeterStrategy implements DeviceStrategy {
                     //检验和
                     String checkSum = ExchangeStringUtil.makeChecksum(str);
                     str = "FEFEFE" + str + checkSum + "16";
-                    return str.toUpperCase();
                 } else {
                     //0代表前面补充0,12代表长度为12,d代表参数为正数型,基表通讯号
                     str = String.format("%012d", Long.parseLong(deviceAddr));
@@ -155,8 +160,7 @@ public class EleMeterStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         String data = Constant.FAIL;
         if (Integer.parseInt(dataStr) < 0) {
             return data;

user-service/src/main/java/com/mh/user/strategy/HeatPumpStatusStrategy.java

@@ -3,7 +3,6 @@ package com.mh.user.strategy;
 import com.alibaba.fastjson2.JSON;
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.service.BuildingService;
@@ -242,8 +241,7 @@ public class HeatPumpStatusStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.entity.NowPublicDataEntity;
@@ -674,69 +673,7 @@ public class HeatPumpStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
+        return "";
-        String dataType = "";
-        String sValue = "";
-        long paramTypeId = collectionParamsManageEntity.getParamTypeId();
-        if (paramTypeId == 0) {
-            return null;
-        }
-        if (paramTypeId == 2) {      //运行状态
-            dataType = "runState";
-            if (dataStr.equalsIgnoreCase("2")) { //0
-                sValue = "运行"; //关机
-            } else {//2
-                sValue = "不运行";   //制冷
-            }
-            //计算热泵运行时间,按分钟
-            nowDataService.proPumpMinutes(deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr(), sValue);
-            log.info("计算热泵运行时长,楼栋名称:" + deviceInstallEntity.getBuildingName() + ",热泵编号:" + deviceInstallEntity.getDeviceAddr() + ",状态:" + sValue);
-        } else if (paramTypeId == 7 || paramTypeId == 10) {
-            //7设定温度,10水箱水温
-            if (paramTypeId == 7) {
-                dataType = "tempSet";
-            } else {
-                dataType = "waterTemp";
-            }
-            //读数
-            sValue = dataStr;
-            if (dataType.equals("waterTemp")) {
-                String avgTemp = nowDataService.selectAve(deviceInstallEntity.getBuildingId());
-                NowPublicDataEntity publicData = new NowPublicDataEntity();
-                publicData.setBuildingId(deviceInstallEntity.getBuildingId());
-                publicData.setUseWaterTemp(avgTemp);
-                publicData.setBackWaterTemp(avgTemp);
-                String pumpId = nowDataService.selectMinPumpId(deviceInstallEntity.getBuildingId());
-                // 如果是华夏，则取新增得字段标识为热泵ID
-                String name = dealDataService.customName();
-                if (name.contains(Constant.CUSTOM_NAME_HUAXIA) || name.contains(Constant.CUSTOM_NAME_HUARUAN)) {
-                    pumpId = deviceInstallService.selectSinglePumpId(deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr());
-                }
-                log.info("---------------addr:" + deviceInstallEntity.getDeviceAddr() + ",pumpId:" + pumpId + " ---------------");
-                if (deviceInstallEntity.getDeviceAddr().equals(pumpId)) { //取ID最小的热泵为单箱温度
-                    publicData.setSingleTemp(sValue);
-                    log.info("---------------单箱温度：" + sValue + "---------------");
-                }
-                nowPublicDataService.saveNowHistoryPublicData(publicData);
-                log.info("楼栋名称：" + deviceInstallEntity.getBuildingName() + ",热泵编号：" + deviceInstallEntity.getDeviceAddr());
-            } else {
-                pumpSetService.updatePumpSetTemp(sValue, deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr()); //更新设定温度
-            }
-        } else if (paramTypeId == 3) { //故障状态
-            dataType = "isFault";
-            if (dataStr.equals("0")) {
-                sValue = "无故障";
-            } else {
-                sValue = "有故障";
-            }
-        }
-        if (!StringUtils.isBlank(sValue)) {
-            nowDataService.saveNowHistoryData(deviceInstallEntity.getDeviceAddr(), "热泵", sValue, dataType.toString(), deviceInstallEntity.getBuildingId());
-            log.info("时间： " + dateStr + "热泵ID：" + deviceInstallEntity.getDeviceAddr() + ",数据： " + dataStr + ",保存数据库成功！楼栋名称：" + deviceInstallEntity.getBuildingName());
-        }
-        nowDataService.proWaterTemp(dateStr, deviceInstallEntity.getBuildingId(), deviceInstallEntity.getDeviceAddr()); //保存楼栋时间点温度变化
-        log.info("----------------保存楼栋时间点温度变化值！----------------");
-        return sValue;
     }
 }

user-service/src/main/java/com/mh/user/strategy/MultiControlStrategy.java

@@ -392,8 +392,7 @@ public class MultiControlStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/PressureTransStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.service.*;
@@ -131,8 +130,7 @@ public class PressureTransStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         String result = "fail";
         if (Integer.parseInt(dataStr) < 0) {
             return result;

user-service/src/main/java/com/mh/user/strategy/StatusCheckStrategy.java

@@ -1,7 +1,6 @@
 package com.mh.user.strategy;
 
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.entity.NowPublicDataEntity;
@@ -128,8 +127,7 @@ public class StatusCheckStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/TempControlStrategy.java

@@ -1,7 +1,6 @@
 package com.mh.user.strategy;
 
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.entity.NowPublicDataEntity;
@@ -117,8 +116,7 @@ public class TempControlStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         String result = Constant.FAIL;
         if (Integer.parseInt(dataStr) < 0) {
             log.info("温控报文检验失败: " + dataStr);

user-service/src/main/java/com/mh/user/strategy/TempTransStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.alibaba.fastjson2.JSON;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.entity.NowPublicDataEntity;
@@ -121,8 +120,7 @@ public class TempTransStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/TimeControlStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
 import com.mh.user.service.NowDataService;
@@ -183,14 +182,14 @@ public class TimeControlStrategy implements DeviceStrategy {
                 // 开关时间
                 // 发送：0603001E0001E5BB
                 // 返回：0603020041CDB4
-                if (rec == 14 && (isExactlyDivisibleMH("001E", registerAddr)
+                if (rec == 14 && (isExactlyDivisible("001E", registerAddr)
-                        || isExactlyDivisibleMH("001F", registerAddr)
+                        || isExactlyDivisible("001F", registerAddr)
-                        || isExactlyDivisibleMH("0020", registerAddr)
+                        || isExactlyDivisible("0020", registerAddr)
-                        || isExactlyDivisibleMH("0021", registerAddr)
+                        || isExactlyDivisible("0021", registerAddr)
-                        || isExactlyDivisibleMH("0022", registerAddr)
+                        || isExactlyDivisible("0022", registerAddr)
-                        || isExactlyDivisibleMH("0023", registerAddr)
+                        || isExactlyDivisible("0023", registerAddr)
-                        || isExactlyDivisibleMH("0024", registerAddr)
+                        || isExactlyDivisible("0024", registerAddr)
-                        || isExactlyDivisibleMH("0025", registerAddr)
+                        || isExactlyDivisible("0025", registerAddr)
                 )) {
                     // 开关时间
                     data = ExchangeStringUtil.hexToDec(checkStr.substring(6, 10));
@@ -199,12 +198,12 @@ public class TimeControlStrategy implements DeviceStrategy {
                     int hours = totalMinutes / 60;
                     int minutes = totalMinutes % 60;
                     data = String.format("%02d%02d", hours, minutes);
-                } else if (rec == 14 && (isExactlyDivisibleMH("0018", registerAddr))) {
+                } else if (rec == 14 && isExactlyDivisible("0018", registerAddr)) {
                     // 星期掩码
                     // 截取时间
                     // 发送：06030018000105BA
                     // 返回：060302007F4C64
-                    data = ExchangeStringUtil.addZeroForNum(new StringBuilder(ExchangeStringUtil.hexString2binaryString(checkStr.substring(8, 10))).reverse().toString(), 8);
+                    data = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexString2binaryString(checkStr.substring(8, 10)), 8);
                     // 截取七天
                     data = new StringBuilder(data).reverse().substring(0, 7);
                 } else if (rec == 38 && isExactlyDivisible("0000", registerAddr)) {
@@ -234,7 +233,7 @@ public class TimeControlStrategy implements DeviceStrategy {
                 } else if (rec == 14 && isExactlyDivisible("0043", registerAddr)) {
                     // 星期掩码
                     // 截取时间
-                    data = ExchangeStringUtil.addZeroForNum(new StringBuilder(ExchangeStringUtil.hexString2binaryString(checkStr.substring(8, 10))).reverse().toString(), 8);
+                    data = ExchangeStringUtil.addZeroForNum(ExchangeStringUtil.hexString2binaryString(checkStr.substring(8, 10)), 8);
                     // 截取七天
                     data = new StringBuilder(data).reverse().substring(0, 7);
                 } else if (rec == 18 && isExactlyDivisible("0044", registerAddr)) {
@@ -279,6 +278,7 @@ public class TimeControlStrategy implements DeviceStrategy {
         return result;
     }
 
+    // 判断是否可以整除
     private static boolean isExactlyDivisible(String baseAddr, String registerAddr) {
         // 16进制转十进制
         int baseAddrInt = ExchangeStringUtil.hexToDecimal(baseAddr);
@@ -293,34 +293,8 @@ public class TimeControlStrategy implements DeviceStrategy {
         return false;
     }
 
-    // 判断是否可以整除
-    private static boolean isExactlyDivisibleMH(String baseAddr, String registerAddr) {
-        // 16进制转十进制
-        int baseAddrInt = ExchangeStringUtil.hexToDecimal(baseAddr);
-        int registerAddrInt = ExchangeStringUtil.hexToDecimal(registerAddr);
-
-        // 如果registerAddrInt等于baseAddrInt，直接返回true
-        if (registerAddrInt == baseAddrInt) {
-            return true;
-        }
-
-        // 如果registerAddrInt大于baseAddrInt，持续减18，看是否等于baseAddrInt
-        if (registerAddrInt > baseAddrInt) {
-            int temp = registerAddrInt;
-            while (temp > baseAddrInt) {
-                temp -= 18;
-            }
-            // 判断是否等于baseAddrInt
-            return temp == baseAddrInt;
-        }
-
-        return false;
-    }
-
-
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/WaterLevelSwitchStrategy.java

@@ -3,7 +3,10 @@ package com.mh.user.strategy;
 import com.alibaba.fastjson2.JSON;
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.*;
+import com.mh.user.entity.DeviceCodeParamEntity;
+import com.mh.user.entity.DeviceInstallEntity;
+import com.mh.user.entity.NowPublicDataEntity;
+import com.mh.user.entity.SysParamEntity;
 import com.mh.user.service.*;
 import com.mh.user.utils.ExchangeStringUtil;
 import com.mh.user.utils.SpringBeanUtil;
@@ -575,8 +578,7 @@ public class WaterLevelSwitchStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         return "";
     }
 }

user-service/src/main/java/com/mh/user/strategy/WtMeterStrategy.java

@@ -2,7 +2,6 @@ package com.mh.user.strategy;
 
 import com.mh.common.utils.StringUtils;
 import com.mh.user.constants.Constant;
-import com.mh.user.entity.CollectionParamsManageEntity;
 import com.mh.user.entity.DataResultEntity;
 import com.mh.user.entity.DeviceCodeParamEntity;
 import com.mh.user.entity.DeviceInstallEntity;
@@ -23,7 +22,7 @@ import java.util.Date;
  * @date 2024-03-18 09:51:17
  */
 @Slf4j
-public class  WtMeterStrategy implements DeviceStrategy {
+public class WtMeterStrategy implements DeviceStrategy {
 
     ApplicationContext context = SpringBeanUtil.getApplicationContext();
 
@@ -137,8 +136,7 @@ public class  WtMeterStrategy implements DeviceStrategy {
     }
 
     @Override
-    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity,
+    public String analysisMQTTReceiveData(String dateStr, String registerAddr, String dataStr, String operateType, DeviceInstallEntity deviceInstallEntity) {
-                                          CollectionParamsManageEntity collectionParamsManageEntity) {
         String data = Constant.FAIL;
         if (Integer.parseInt(dataStr) < 0) {
             return data;
@@ -163,8 +161,8 @@ public class  WtMeterStrategy implements DeviceStrategy {
         } catch (Exception e) {
             log.error("水表数据保存数据库失败！楼栋名称：{}", deviceInstallEntity.getBuildingName(), e);
         }
-        if (!StringUtils.isBlank(dataStr)) {
+        if (!StringUtils.isBlank(data)) {
-            data = String.valueOf(Double.valueOf(dataStr));
+            data = String.valueOf(Double.valueOf(data));
         }
         return data;
     }

user-service/src/main/resources/application-dev.yml

@@ -1,17 +1,3 @@
-# 项目相关配置
-mh:
-  # 名称
-  name: nfxy
-  # 版本
-  version: 1.0.0
-  # 版权年份
-  copyrightYear: 2025
-  # 文件路径 示例（ Windows配置D:/mh/uploadPath，Linux配置 /home/mh/uploadPath）
-  profile: D:/mh/uploadPath
-  # 获取ip地址开关
-  addressEnabled: false
-  # 验证码类型 math 数字计算 char 字符验证
-  captchaType: math
 server:
   port: 8762  #8761创新、8762广商、8763华厦、广州理工
 spring:
@@ -22,7 +8,7 @@ spring:
     type: com.alibaba.druid.pool.DruidDataSource
     druid:
       #添加allowMultiQueries=true 在批量更新时才不会出错
-      url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false
+      url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=chws_bsdz;allowMultiQueries=true
       driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
       username: sa
       password: mh@803

user-service/src/main/resources/application-prod.yml

@@ -14,10 +14,10 @@ spring:
       #      password: mh@803
       ##      url: jdbc:sqlserver://120.25.220.177:32012;DatabaseName=M_CHWS;allowMultiQueries=true
       #阿里云服务器-广州理工
-#      url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=CHWS;allowMultiQueries=true;encrypt=false
+      url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=CHWS;allowMultiQueries=true
-#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-#      username: test
+      username: test
-#      password: minghan123456@
+      password: minghan123456@
 #      #华厦云服务器
 #      url: jdbc:sqlserver://127.0.0.1:1433;DatabaseName=CHWS;allowMultiQueries=true
 #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -29,10 +29,10 @@ spring:
 #      username: chws_gsh
 #      password: Mhtech@803
       #广商服务器
-      url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_gsh;allowMultiQueries=true;encrypt=false
+#      url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_gsh;allowMultiQueries=true
-      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
+#      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
-      username: chws_gsh
+#      username: chws_gsh
-      password: Mhtech@803gsh
+#      password: Mhtech@803gsh
       #本机
       #      url: jdbc:sqlserver://127.0.0.1:9956;DatabaseName=CHWS;allowMultiQueries=true
       #      driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver
@@ -143,27 +143,4 @@ logging:
 amap:
   key: 984603bf28ef94ac78765a3ea27a6c26
 
-mqttSpring:
-  # BASIC parameters are required.
-  BASIC:
-    protocol: MQTT
-    host: 192.168.1.79
-    port: 1883
-    username: test
-    password: test123456
-    client-id: chws_nfxy_mqtt_dev
-    # 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 ",".
-    inbound-topic: chws_nfxy_mqtt_dev/read/events_upload/devices
-  # 此部分是提供给后端生成token返回给前端，让前端使用websocket方式去和MQTT实现交互的，笔者此文的案例中并没有去实现
-  # 无人机远程控制模式（drone remote control）
-  DRC:
-    protocol: WS
-    host: 192.168.1.79
-    port: 8083
-    path: /mqtt
-control:
-  topic: chws_nfxy_mqtt_dev/control/events_upload/devices
-
 

user-service/src/main/resources/application.yml

@@ -1,6 +1,3 @@
 spring:
   profiles:
     active: dev
-  mvc:
-    pathmatch:
-      matching-strategy: ant_path_matcher

user-service/src/test/java/com/mh/user/device/CRC16Test.java

@@ -69,45 +69,21 @@ public class CRC16Test {
     }
     //测试
     public static void main(String[] args) throws IOException {
-//        String lastHourTime = "2020-06-03 01:00:00";
+        String lastHourTime = "2020-06-03 01:00:00";
-//        // lastHourTime转换成LocalDateTime
+        // lastHourTime转换成LocalDateTime
-//        LocalDateTime lastHour1 = null;
+        LocalDateTime lastHour1 = null;
-//        if(lastHourTime != null && !"".equals(lastHourTime)){
+        if(lastHourTime != null && !"".equals(lastHourTime)){
-//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
-//            lastHour1 = LocalDateTime.parse(lastHourTime, formatter);
+            lastHour1 = LocalDateTime.parse(lastHourTime, formatter);
-//            System.out.println(lastHour1);
+            System.out.println(lastHour1);
-//        }
-//
-//        LocalDateTime now = lastHour1;
-//            LocalDateTime lastHour = now.minusHours(1);
-//            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00:00");
-//            lastHourTime = lastHour.format(formatter);
-//        System.out.println(lastHourTime);
-        System.out.println(isExactlyDivisible("0018", "002A"));
-
-    }
-
-    private static boolean isExactlyDivisible(String baseAddr, String registerAddr) {
-        // 16进制转十进制
-        int baseAddrInt = ExchangeStringUtil.hexToDecimal(baseAddr);
-        int registerAddrInt = ExchangeStringUtil.hexToDecimal(registerAddr);
-
-        // 如果registerAddrInt等于baseAddrInt，直接返回true
-        if (registerAddrInt == baseAddrInt) {
-            return true;
         }
 
-        // 如果registerAddrInt大于baseAddrInt，持续减16，看是否等于baseAddrInt
+        LocalDateTime now = lastHour1;
-        if (registerAddrInt > baseAddrInt) {
+            LocalDateTime lastHour = now.minusHours(1);
-            int temp = registerAddrInt;
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00:00");
-            while (temp > baseAddrInt) {
+            lastHourTime = lastHour.format(formatter);
-                temp -= 18;
+        System.out.println(lastHourTime);
-            }
-            // 判断是否等于baseAddrInt
-            return temp == baseAddrInt;
-        }
 
-        return false;
     }
 
 }