添加水压接收

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

@@ -0,0 +1,59 @@
+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;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-10-11
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("env_water_gege")
+public class EnvWaterGege implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Integer id;
+
+    private String deviceCode;
+
+    private Integer sensorSn;
+
+    private BigDecimal waterGege;
+
+    private String askTime;
+
+    private Date addTime;
+
+    private Date addDate;
+
+    private String pigpenId;
+
+    private String unitId;
+
+    private String farmCode;
+
+    private String dataUnit;
+
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/dao/repo/EnvWaterGegeEntityRepo.java

@@ -0,0 +1,9 @@
+package com.huimv.env.common.dao.repo;
+
+import com.huimv.env.common.dao.entity.EnvWaterGege;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+
+public interface EnvWaterGegeEntityRepo extends JpaRepository<EnvWaterGege, Integer>, JpaSpecificationExecutor<EnvWaterGege> {
+
+}

huimv-env-platform/huimv-env-common/src/main/java/com/huimv/env/common/utils/Const.java

@@ -38,4 +38,9 @@ public class Const {
     public final static String ROUTING_KEY_PUSH_MESSAGE = "topic.pushMessage.key";
     public final static String QUEUE_PUSH_MESSAGE = "topic.pushMessage.queue";
     public final static String EXCHANGE_PUSH_MESSAGE = "topic.pushMessage.exchange";
+
+    // 水压
+    public final static String ROUTING_KEY_WATER_GEGE = "topic.waterGege.key";
+    public final static String QUEUE_WATER_GEGE = "topic.waterGege.queue";
+    public final static String EXCHANGE_WATER_GEGE = "topic.waterGege.exchange";
 }

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/createdFiles.lst

@@ -33,6 +33,7 @@ com\huimv\env\common\service\impl\SprayStatusServiceImpl.class
 com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.class
 com\huimv\env\common\dao\entity\EnvTempThresholdEntity.class
 com\huimv\env\common\dao\repo\BasePigpenEntityRepo.class
+com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.class
 com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.class
 com\huimv\env\common\service\impl\SprayConfigServiceImpl.class
 com\huimv\env\common\utils\DateUtil.class
@@ -40,5 +41,7 @@ com\huimv\env\common\utils\MathUtil.class
 com\huimv\env\common\service\ISprayStatusService.class
 com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.class
 com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.class
+com\huimv\env\common\dao\entity\EnvWaterGege.class
 com\huimv\env\common\dao\entity\EnvTempEntity.class
 com\huimv\env\common\dao\entity\BasePigpenEntity.class
+com\huimv\env\common\utils\SMSManager.class

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/compile/default-compile/inputFiles.lst

@@ -1,44 +1,47 @@
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BasePigpenEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayConfigEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayTimeEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\BasePigpenEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempThresholdEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayTimeEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAlarmTypeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvDeviceRegisterEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PigpenServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISensorRegisterService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvPushMessageEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SensorRegisterServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvHumiEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAmmoniaEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\RegexUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvWaterGege.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\BasePigpenEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayStatusEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\PushMessageServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayConfigService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvWaterGegeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayConfigServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempThresholdEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayStatusService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayStatusEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvTempEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvDeviceRegisterEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSensorRegisterEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvSprayConfigEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\DeviceRegisterServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ISprayTimeService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\BasePigpenEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvAmmoniaEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayTimeEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSprayConfigEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayStatusServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\DateUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\SprayTimeServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\impl\TempThresholdServiceImpl.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPushMessageService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\MathUtil.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IPigpenService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvSensorRegisterEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\ITempThresholdService.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvAlarmTypeEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\SMSManager.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvTempThresholdEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\repo\EnvPushMessageEntityRepo.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\utils\Const.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\dao\entity\EnvHumiEntity.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\main\java\com\huimv\env\common\service\IDeviceRegisterService.java

huimv-env-platform/huimv-env-common/target/maven-status/maven-compiler-plugin/testCompile/default-testCompile/inputFiles.lst

@@ -1 +1 @@
-D:\idea6\huimv.env.platform\huimv-env-platform\huimv-env-common\src\test\java\com\huimv\env\common\CodeGenerator.java
+G:\idea\huimv.env.platform\huimv-env-platform\huimv-env-common\src\test\java\com\huimv\env\common\CodeGenerator.java

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

@@ -101,4 +101,20 @@ 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(humiQueue()).to(humiExchange()).with(Const.ROUTING_KEY_WATER_GEGE);
+    }
 }

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

@@ -0,0 +1,12 @@
+package com.huimv.env.device.config;
+
+
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import me.chanjar.weixin.common.service.WxService;
+import org.springframework.stereotype.Component;
+
+@Component
+public class WeChatMessage {
+    private static WxService wxService  =  new WxMaServiceImpl();
+
+}

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

@@ -0,0 +1,87 @@
+package com.huimv.env.device.config;
+
+import cn.binarywang.wx.miniapp.api.WxMaService;
+import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;
+import cn.binarywang.wx.miniapp.bean.WxMaSubscribeMessage;
+import cn.binarywang.wx.miniapp.config.impl.WxMaDefaultConfigImpl;
+import org.springframework.stereotype.Component;
+ 
+import java.util.ArrayList;
+import java.util.logging.Logger;
+
+@Component
+public class WeChatMessageHelperTest {
+ 
+    private static WxMaService wxMaService = new WxMaServiceImpl();
+ 
+    /**
+     * 发送小程序订阅消息
+     * @param appletsSubType 小程序类型（developer为开发版、trial为体验版、formal为正式版）
+     * @param appSubTempId 订阅消息模板id
+     * @param appSubPagePath 跳转小程序地址
+     * @param appletsAppid 小程序appId
+     * @param appletsSecret 小程序secret
+     * @param appletsSubToken 小程序token
+     * @param appletsSubAesKey 小程序EncodingAESKey
+     * @param appletsSubDataFormat 数据格式
+     * @param wxMaSubMsgList 消息列表
+     * @param userIds 接收用户id
+     * @return void
+     * @version V1.0
+     * modify history
+     */
+    public static void sendWechatAppSubMessage(String appletsSubType, String appSubTempId, String appSubPagePath, String appletsAppid, String appletsSecret, String appletsSubToken, String appletsSubAesKey, String appletsSubDataFormat, ArrayList<WxMaSubscribeMessage.MsgData> wxMaSubMsgList, String... userIds) throws Exception {
+ 
+        /*
+        // wxMaSubMsgList组装示例，在业务里组装好，再调用系统消息发送工具，系统消息判断是否需要发送小程序订阅消息进行分发，此处不做展示
+        ArrayList<WxMaSubscribeMessage.MsgData> wxMaSubscribeData = new ArrayList<>();
+        WxMaSubscribeMessage.MsgData characterString1 = new WxMaSubscribeMessage.MsgData();
+        characterString1.setName("character_string1");
+        characterString1.setValue("DR15325419846198615651");
+        wxMaSubscribeData.add(characterString1);
+        WxMaSubscribeMessage.MsgData thing3 = new WxMaSubscribeMessage.MsgData();
+        thing3.setName("thing3");
+        thing3.setValue("请XXXXXXXX");
+        wxMaSubscribeData.add(thing3);
+        WxMaSubscribeMessage.MsgData time5 = new WxMaSubscribeMessage.MsgData();
+        time5.setName("time5");
+        time5.setValue(DateUtil.format(new Date(),DateUtil.DATE_TIME_FORMAT));
+        wxMaSubscribeData.add(time5);
+        */
+ 
+        WxMaDefaultConfigImpl config = new WxMaDefaultConfigImpl();
+        // 小程序appId
+        config.setAppid(appletsAppid);
+        // 小程序secret
+        config.setSecret(appletsSecret);
+        // 小程序token
+        config.setToken(appletsSubToken);
+        // 小程序EncodingAESKey
+        config.setAesKey(appletsSubAesKey);
+        // 数据格式
+        config.setMsgDataFormat(appletsSubDataFormat);
+        wxMaService.setWxMaConfig(config);
+ 
+        for (String userId : userIds) {
+            // TODO：根据用户id获取OpenId,测试时写死
+            WxMaSubscribeMessage subscribeMessage = new WxMaSubscribeMessage();
+            // 要推送的用户openid
+            subscribeMessage.setToUser("openId");
+            // 小程序类型（developer为开发版、trial为体验版、formal为正式版）,默认为formal（正式版）
+            subscribeMessage.setMiniprogramState(appletsSubType);
+            // 订阅消息模板id
+            subscribeMessage.setTemplateId(appSubTempId);
+            // 跳转小程序地址
+            subscribeMessage.setPage(appSubPagePath);
+            // 消息列表（组装示例请看方法开始注释部分）
+            subscribeMessage.setData(wxMaSubMsgList);
+ 
+            try {
+                // 发送订阅消息
+                wxMaService.getMsgService().sendSubscribeMsg(subscribeMessage);
+            } catch (Exception e) {
+                System.out.println("微信小程序订阅消息推送失败，接收userId: " + userId+"      "+ e);
+            }
+        }
+    }
+}

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/listener/DeviceListener.java

@@ -63,6 +63,36 @@ public class DeviceListener {
     @Autowired
     private WebSocket webSocket;
 
+
+    @RabbitListener(queues = Const.QUEUE_WATER_GEGE)
+    @RabbitHandler
+    public void processWaterGege(Map RawMap)   {
+        System.out.println(">>>>>>>>>>>>>>接收水压数据 RawMap>>" + RawMap.toString());
+        String askText = RawMap.get("askText").toString();
+        JSONObject dataJo = deviceService.handleAskText(askText);
+        dataJo.put("dataUnit", "Kpa");
+        System.out.println("水压数据=" + dataJo);
+        java.sql.Date todayDate = new java.sql.Date(new java.util.Date().getTime());
+        Timestamp nowTimestamp = new Timestamp(new java.util.Date().getTime());
+        String deviceCode = dataJo.getString("deviceCode");
+        //根据设备编码获取设备注册信息
+        EnvDeviceRegisterEntity envDeviceRegisterEntity = deviceRegisterService.getDeviceRegisterByDeviceCode(deviceCode);
+        if (envDeviceRegisterEntity == null) {
+            log.error("该设备[" + dataJo.getString("deviceCode") + "]未注册.");
+            return;
+        }
+        String farmCode = envDeviceRegisterEntity.getFarmCode();
+       String watreGege = dataJo.getString("value");
+        int sensorSort = 1;
+        //更新传感器数据
+//        deviceService.updateSensorRegister(deviceCode, dataJo.getInteger("sensorSn"), nowTimestamp, todayDate, temp, farmCode,sensorSort);
+        deviceService.sendSensorToMQ(deviceCode, dataJo.getInteger("sensorSn"), nowTimestamp, todayDate, watreGege, farmCode,sensorSort);
+
+        //保存温度流水数据
+        deviceService.saveWaterGege(dataJo, envDeviceRegisterEntity, nowTimestamp, todayDate, farmCode);
+    }
+
+
     @RabbitListener(queues = Const.QUEUE_TEMP)
     @RabbitHandler
     public void processTemp(Map RawMap) throws ParseException {
@@ -188,7 +218,7 @@ public class DeviceListener {
         //webSocket 推送
         webSocket.sendToUser("true,"+farmCode);
         //微信推送
-        WeChatMessageHelperTest.sendWechatAppSubMessage();
+//        WeChatMessageHelperTest.sendWechatAppSubMessage();
 
 
         //{}

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/service/IDeviceService.java

@@ -26,4 +26,6 @@ public interface IDeviceService {
 
     //
     JSONObject handleSprayStatusAskCmd(String askText);
+
+    void saveWaterGege(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode);
 }

huimv-env-platform/huimv-env-device/src/main/java/com/huimv/env/device/service/impl/DeviceServiceImpl.java

@@ -1,13 +1,11 @@
 package com.huimv.env.device.service.impl;
 
 import com.alibaba.fastjson.JSONObject;
-import com.huimv.env.common.dao.entity.EnvAmmoniaEntity;
-import com.huimv.env.common.dao.entity.EnvDeviceRegisterEntity;
-import com.huimv.env.common.dao.entity.EnvHumiEntity;
-import com.huimv.env.common.dao.entity.EnvTempEntity;
+import com.huimv.env.common.dao.entity.*;
 import com.huimv.env.common.dao.repo.EnvAmmoniaEntityRepo;
 import com.huimv.env.common.dao.repo.EnvHumiEntityRepo;
 import com.huimv.env.common.dao.repo.EnvTempEntityRepo;
+import com.huimv.env.common.dao.repo.EnvWaterGegeEntityRepo;
 import com.huimv.env.common.service.IPigpenService;
 import com.huimv.env.common.service.ISensorRegisterService;
 import com.huimv.env.common.utils.DateUtil;
@@ -53,6 +51,9 @@ public class DeviceServiceImpl implements IDeviceService {
     @Autowired
     private IPigpenService pigpenService;
 
+    @Autowired
+    private EnvWaterGegeEntityRepo envWaterGegeEntityRepo;
+
     @Override
     public void sendSensorToMQ(String deviceCode, Integer sensorSn, Timestamp nowTimestamp, Date todayDate, String value, String farmCode, int sensorSort) {
         JSONObject sensorJo = new JSONObject();
@@ -130,6 +131,23 @@ public class DeviceServiceImpl implements IDeviceService {
         envAmmoniaEntity.setDataUnit(dataJo.getString("dataUnit"));
         envAmmoniaEntityRepo.saveAndFlush(envAmmoniaEntity);
     }
+    //保存水压流水数据
+    @Override
+    public void saveWaterGege(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
+        EnvWaterGege envAmmoniaEntity = new EnvWaterGege();
+        envAmmoniaEntity.setDeviceCode(dataJo.getString("deviceCode"));
+        envAmmoniaEntity.setSensorSn(dataJo.getInteger("sensorSn"));
+        envAmmoniaEntity.setWaterGege(new BigDecimal(dataJo.getIntValue("value")));
+        envAmmoniaEntity.setAskTime(dateUtil.handleAskTime(dataJo.getString("askTime")));
+        envAmmoniaEntity.setAddTime(nowTimestamp);
+        envAmmoniaEntity.setAddDate(todayDate);
+        envAmmoniaEntity.setFarmCode(farmCode);
+        envAmmoniaEntity.setPigpenId(envDeviceRegisterEntity.getPigpenId());
+        envAmmoniaEntity.setUnitId(envDeviceRegisterEntity.getUnitId());
+        envAmmoniaEntity.setDataUnit(dataJo.getString("dataUnit"));
+        envWaterGegeEntityRepo.saveAndFlush(envAmmoniaEntity);
+    }
+
 
     //
     @Override
@@ -180,6 +198,7 @@ public class DeviceServiceImpl implements IDeviceService {
         return dataJo;
     }
 
+
     private String getActText(int actType, String act) {
         String[] actGroupArray = act.split(",");
         String actText = "";

huimv-env-platform/huimv-env-input/src/main/java/com/huimv/env/input/producer/Producer.java

@@ -107,4 +107,12 @@ public class Producer {
         rabbitTemplate.convertAndSend(Const.EXCHANGE_PUSH_MESSAGE, Const.ROUTING_KEY_PUSH_MESSAGE, map);
         return "ok";
     }
+
+    public String sendWaterGege(String askText) {
+
+        Map map = new HashMap();
+        map.put("askText",askText);
+        rabbitTemplate.convertAndSend(Const.EXCHANGE_WATER_GEGE, Const.ROUTING_KEY_WATER_GEGE, map);
+        return "ok";
+    }
 }

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

@@ -173,6 +173,31 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                 //上报喷雾除臭状态
                 uploadSprayEquipStatus(askText, idCode, ctx);
                 break;
+            case "8":
+                //水压
+                uploadWaterGege(askText, idCode, ctx);
+                break;
+            case "9":
+                //PH
+                uploadPH(askText, idCode, ctx);
+                break;
+            case "10":
+                //水表
+                uploadWaterMeter(askText, idCode, ctx);
+                break;
+            case "11":
+                //电表
+                uploadElectricityMeter(askText, idCode, ctx);
+                break;
+            case "12":
+                //获取设备开关
+                getSparySwitch(askText, idCode, ctx);
+                break;
+            case "13":
+                //上报设备状态
+                getSparyStatus(askText, idCode, ctx);
+                break;
+
             case "14":
                 //获取报警使能
                 getAlarmConfig(askText, idCode, ctx);
@@ -202,6 +227,94 @@ public class EnvInputServerHandler extends ChannelInboundHandlerAdapter {
                 log.error(">>当前数据为非法数据-未知命令>>" + askText);
         }
     }
+    //上报设备状态
+    private void getSparyStatus(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>上报设备状态上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##上报设备状态上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //上报设备状态
+        String answerText = "hm+8+0+7+end";
+        log.info(">>上报设备状态上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //上报设备状态请求到消息队列
+//        producer.sendWaterGege(askText);
+    }
+    //获取设备开关
+    private void getSparySwitch(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>获取设备开关上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##获取设备开关上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //TODO 获取设备开关请求
+        String answerText = "hm+158+12+1010101010101010+6+end";
+        log.info(">>获取设备开关上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //获取设备开关请求
+//        producer.sendWaterGege(askText);
+    }
+
+    //电表
+    private void uploadElectricityMeter(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>电表上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##电表上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //电表上传请求
+        String answerText = "hm+11+0+7+end";
+        log.info(">>电表上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //电表请求到消息队列
+//        producer.sendWaterGege(askText);
+    }
+
+    //水表
+    private void uploadWaterMeter(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>水表上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##水表上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //水表上传请求
+        String answerText = "hm+10+0+7+end";
+        log.info(">>水表上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //发送水表请求到消息队列
+//        producer.sendWaterGege(askText);
+    }
+
+    //PH
+    private void uploadPH(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>PH上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##PH上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //PH传请求
+        String answerText = "hm+9+0+7+end";
+        log.info(">>PH上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //发送PH请求到消息队列
+//        producer.sendWaterGege(askText);
+    }
+
+    //水压
+    private void uploadWaterGege(String askText, String deviceCode, ChannelHandlerContext ctx) {
+        System.out.println("==>水压上传请求 askText>>" + askText);
+        if (!cmdProService.isEffectiveDevice(deviceCode)) {
+            System.out.println("##水压上传请求-未注册设备 deviceCode=" + deviceCode);
+            return;
+        }
+        //水压上传请求
+        String answerText = "hm+8+0+7+end";
+        log.info(">>水压上传请求-应答数据>>" + answerText);
+        answerCmd(answerText, ctx);
+        //水压请求到消息队列
+        producer.sendWaterGege(askText);
+    }
 
     //平台消息推送请求
     private void uploadPlatformMessagePushInfo(String askText, String idCode, ChannelHandlerContext ctx) {

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/controller/Sheet1Controller.java

@@ -0,0 +1,55 @@
+package com.huimv.env.manage.controller;
+
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.huimv.env.manage.entity.Sheet1;
+import com.huimv.env.manage.service.ISheet1Service;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.CrossOrigin;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * <p>
+ *  前端控制器
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-29
+ */
+@RestController
+@CrossOrigin
+@RequestMapping("/sheet")
+public class Sheet1Controller {
+    @Autowired
+    private ISheet1Service sheet1Service;
+
+    /*@GetMapping("/updateCoun")
+    private void updateCoun(){
+        QueryWrapper<Sheet1> wrapper = new QueryWrapper<>();
+        wrapper.groupBy("code_coun");
+        List<Sheet1> sheet1s = sheet1Service.list(wrapper);
+
+
+        List<String>  codeTowns  = new ArrayList<>();
+        for (Sheet1 sheet1 : sheet1s) {
+            codeTowns.add(sheet1.getCodeTown());
+        }
+
+        sheet1Service.remove(new QueryWrapper<Sheet1>().notIn("code_town",codeTowns));
+
+    }*/
+     @GetMapping("/list")
+    private void list(){
+         this.list();
+
+     }
+
+
+
+}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/entity/Sheet1.java

@@ -0,0 +1,44 @@
+package com.huimv.env.manage.entity;
+
+import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import java.io.Serializable;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.experimental.Accessors;
+
+/**
+ * <p>
+ * 
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-29
+ */
+@Data
+@EqualsAndHashCode(callSuper = false)
+@Accessors(chain = true)
+@TableName("sheet1")
+public class Sheet1 implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private String nameProv;
+
+    private String codeProv;
+
+    private String nameCity;
+
+    private String codeCity;
+
+    private String nameCoun;
+
+    private String codeCoun;
+
+    private String nameTown;
+
+    private String codeTown;
+
+
+}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/mapper/Sheet1Mapper.java

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.mapper;
+
+import com.huimv.env.manage.entity.Sheet1;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+ * <p>
+ *  Mapper 接口
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-29
+ */
+public interface Sheet1Mapper extends BaseMapper<Sheet1> {
+
+}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/ISheet1Service.java

@@ -0,0 +1,16 @@
+package com.huimv.env.manage.service;
+
+import com.huimv.env.manage.entity.Sheet1;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ *  服务类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-29
+ */
+public interface ISheet1Service extends IService<Sheet1> {
+
+}

huimv-env-platform/huimv-env-manage/src/main/java/com/huimv/env/manage/service/impl/Sheet1ServiceImpl.java

@@ -0,0 +1,20 @@
+package com.huimv.env.manage.service.impl;
+
+import com.huimv.env.manage.entity.Sheet1;
+import com.huimv.env.manage.mapper.Sheet1Mapper;
+import com.huimv.env.manage.service.ISheet1Service;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ *  服务实现类
+ * </p>
+ *
+ * @author author
+ * @since 2022-08-29
+ */
+@Service
+public class Sheet1ServiceImpl extends ServiceImpl<Sheet1Mapper, Sheet1> implements ISheet1Service {
+
+}

huimv-env-platform/huimv-env-manage/src/main/resources/mapper/Sheet1Mapper.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.huimv.env.manage.mapper.Sheet1Mapper">
+
+    <!-- 通用查询映射结果 -->
+    <resultMap id="BaseResultMap" type="com.huimv.env.manage.entity.Sheet1">
+        <result column="name_prov" property="nameProv" />
+        <result column="code_prov" property="codeProv" />
+        <result column="name_city" property="nameCity" />
+        <result column="code_city" property="codeCity" />
+        <result column="name_coun" property="nameCoun" />
+        <result column="code_coun" property="codeCoun" />
+        <result column="name_town" property="nameTown" />
+        <result column="code_town" property="codeTown" />
+    </resultMap>
+
+</mapper>