添加水压接收

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/dao/entity/EnvWaterGege.java

@@ -3,18 +3,14 @@ package com.huimv.env.common.dao.entity;
 import java.math.BigDecimal;
 import com.baomidou.mybatisplus.annotation.TableName;
 import com.baomidou.mybatisplus.annotation.IdType;
-import java.time.LocalDate;
 import com.baomidou.mybatisplus.annotation.TableId;
-import java.time.LocalDateTime;
 import java.io.Serializable;
 import java.util.Date;
 
 import lombok.Data;
-import lombok.EqualsAndHashCode;
 import lombok.experimental.Accessors;
 
-import javax.persistence.Entity;
-import javax.persistence.Table;
+import javax.persistence.*;
 
 /**
  * <p>
@@ -25,14 +21,16 @@ import javax.persistence.Table;
  * @since 2022-10-11
  */
 @Data
-@EqualsAndHashCode(callSuper = false)
 @Accessors(chain = true)
-@TableName("env_water_gege")
+@Table(name = "env_water_gege")
+@Entity
 public class EnvWaterGege implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    @TableId(value = "id", type = IdType.AUTO)
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    @Column(name = "id", nullable = false)
     private Integer id;
 
     private String deviceCode;

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/HuimvDeviceApplication.java

@@ -17,7 +17,7 @@ import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
  * @Create : 2020-12-25
  **/
 @ComponentScans({@ComponentScan("com.huimv.env.common.utils"),
-        @ComponentScan("com.huimv.env.common.service")})
+@ComponentScan("com.huimv.env.common.service")})
 @EntityScan(value = "com.huimv.env.common.dao.entity")
 @EnableJpaRepositories(basePackages = "com.huimv.env.common.dao.repo")
 @EnableConfigurationProperties

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/config/TopicRabbitMQConfig.java

@@ -104,7 +104,6 @@ public class TopicRabbitMQConfig {
 
 
     //推送水压
-    //湿度
     @Bean
     public Queue waterGegeQueue() {
         return new Queue(Const.QUEUE_WATER_GEGE);
@@ -115,6 +114,6 @@ public class TopicRabbitMQConfig {
     }
     @Bean
     Binding bindingWaterGegeExchangeMessage() {
-        return BindingBuilder.bind(humiQueue()).to(humiExchange()).with(Const.ROUTING_KEY_WATER_GEGE);
+        return BindingBuilder.bind(waterGegeQueue()).to(waterGegeExchange()).with(Const.ROUTING_KEY_WATER_GEGE);
     }
 }

huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/config/TopicRabbitMQConfig.java

@@ -101,4 +101,17 @@ public class TopicRabbitMQConfig {
     Binding bindingPushMessageMessage() {
         return BindingBuilder.bind(pushMessageQueue()).to(pushMessageExchange()).with(Const.ROUTING_KEY_PUSH_MESSAGE);
     }
+    //推送水压
+    @Bean
+    public Queue waterGegeQueue() {
+        return new Queue(Const.QUEUE_WATER_GEGE);
+    }
+    @Bean
+    TopicExchange waterGegeExchange() {
+        return new TopicExchange(Const.EXCHANGE_WATER_GEGE);
+    }
+    @Bean
+    Binding bindingWaterGegeExchangeMessage() {
+        return BindingBuilder.bind(waterGegeQueue()).to(waterGegeExchange()).with(Const.ROUTING_KEY_WATER_GEGE);
+    }
 }

huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/server/EnvInputServerHandler.java

@@ -235,7 +235,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             return;
         }
         //上报设备状态
-        String answerText = "hm+8+0+7+end";
+        String answerText = "hm+118+13+1010101010101010+201702081523+6+end";
         log.info(">>上报设备状态上传请求-应答数据>>" + answerText);
         answerCmd(answerText, ctx);
         //上报设备状态请求到消息队列
@@ -249,7 +249,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             return;
         }
         //TODO 获取设备开关请求
-        String answerText = "hm+158+12+1010101010101010+6+end";
+        String answerText = "hm+118+12+1010101010101010+6+end";
         log.info(">>获取设备开关上传请求-应答数据>>" + answerText);
         answerCmd(answerText, ctx);
         //获取设备开关请求
@@ -388,7 +388,7 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
             return;
         }
         //（声光报警、短信报警、语音报警） 1：关闭，2：打开
-        String answerText = "hm+"+idCode+"+14+2(111)2(111)2(111)2(111)+0+4+end";
+        String answerText = "hm+"+idCode+"+14+2(111)2(111)2(111)2(111)2(111)+0+4+end";
         log.info(">>获取报警使能请求-应答数据>>" + answerText);
         answerCmd(answerText, ctx);
     }