新建项目

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/AllData.java

@@ -0,0 +1,12 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class AllData {
+    private String trceId;
+    private String messageVersion;
+    private String event;
+    private DataContent content;
+    private String timestamp;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/CommonMessage.java

@@ -0,0 +1,9 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class CommonMessage {
+    private String gatewayEui;
+    private String nodeEui;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/ContentApplication.java

@@ -0,0 +1,9 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ContentApplication {
+    private String applicationId;
+    private String netType;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/ContentNode.java

@@ -0,0 +1,21 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class ContentNode {
+    private String rawHex;
+    private String netId;
+    private String fType;
+    private String destAddr;
+    private String srcAddr;
+    private String random;
+    private String fcnt;
+    private String rssi;
+    private String snr;
+    private String payload;
+    private String crc;
+    private String crcHex;
+    private String encryptedPayload;
+    private String encryptType;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/DataContent.java

@@ -0,0 +1,11 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class DataContent {
+    private ContentApplication application;
+    private CommonMessage commonMessage;
+    private NodeUplinkPacket nodeUplinkPacket;
+    private String data;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/NodeGateWay.java

@@ -0,0 +1,21 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+
+@Data
+public class NodeGateWay {
+    private String tmst;
+    private String rxFreq;
+    private String dr;
+    private String rssi;
+    private String snr;
+    private String payloadLength;
+    private String cr;
+    private String crc;
+    private String bandwidth;
+    private String status;
+    private String ifChain;
+    private String rfChain;
+    private String realTime;
+}

huimv-env-common/src/main/java/com/huimv/env/common/entity/vo/NodeUplinkPacket.java

@@ -0,0 +1,9 @@
+package com.huimv.env.common.entity.vo;
+
+import lombok.Data;
+
+@Data
+public class NodeUplinkPacket {
+    private NodeGateWay gateway;
+    private ContentNode node;
+}

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

@@ -10,120 +10,14 @@ package com.huimv.env.common.utils;
  **/
 public class Const {
 
-    //温度
-    public final static String QUEUE_ENV_TEMP = "topic.env.temp.queue";
-    public final static String ROUTING_KEY_ENV_TEMP = "topic.env.temp.key";
-    public final static String EXCHANGE_ENV_TEMP = "topic.env.temp.exchange";
 
-    //目标温度
-    public final static String QUEUE_ENV_TARGET_TEMP = "topic.env.target.temp.queue";
-    public final static String ROUTING_KEY_ENV_TARGET_TEMP = "topic.env.target.temp.key";
-    public final static String EXCHANGE_ENV_TARGET_TEMP = "topic.env.target.temp.exchange";
-
-    //湿度
-    public final static String QUEUE_ENV_HUMI = "topic.env.humi.queue";
-    public final static String ROUTING_KEY_ENV_HUMI = "topic.env.humi.key";
-    public final static String EXCHANGE_ENV_HUMI = "topic.env.humi.exchange";
-
-    //日龄
-    public final static String QUEUE_ENV_DAYAGE = "topic.env.dayage.queue";
-    public final static String ROUTING_KEY_ENV_DAYAGE = "topic.env.dayage.key";
-    public final static String EXCHANGE_ENV_DAYAGE = "topic.env.dayage.exchange";
-
-    //通风
-    public final static String QUEUE_ENV_FENG = "topic.env.feng.queue";
-    public final static String ROUTING_KEY_ENV_FENG = "topic.env.feng.key";
-    public final static String EXCHANGE_ENV_FENG = "topic.env.feng.exchange";
-
-    //舍外
-    public final static String QUEUE_ENV_OUT_TEMP = "topic.env.out.temp.queue";
-    public final static String ROUTING_KEY_ENV_OUT_TEMP = "topic.env.out.temp.key";
-    public final static String EXCHANGE_ENV_OUT_TEMP = "topic.env.out.temp.exchange";
-
-    //舍内 平均温度
-    public final static String QUEUE_ENV_IN_TEMP = "topic.env.in.temp.queue";
-    public final static String ROUTING_KEY_ENV_IN_TEMP = "topic.env.in.temp.key";
-    public final static String EXCHANGE_ENV_IN_TEMP = "topic.env.in.temp.exchange";
-
-    //报警
-    public final static String QUEUE_ENV_WARNING = "topic.env.warning.queue";
-    public final static String ROUTING_KEY_ENV_WARNING = "topic.env.warning.key";
-    public final static String EXCHANGE_ENV_WARNING = "topic.env.warning.exchange";
-
-    //风机状态
-    public final static String QUEUE_ENV_FENG_STATUS = "topic.env.feng.status.queue";
-    public final static String ROUTING_KEY_ENV_FENG_STATUS = "topic.env.feng.status.key";
-    public final static String EXCHANGE_ENV_FENG_STATUS = "topic.env.feng.status.exchange";
-
-    //湿帘状态
-    public final static String QUEUE_ENV_SHILIAN_STATUS = "topic.env.shilian.status.queue";
-    public final static String ROUTING_KEY_ENV_SHILIAN_STATUS = "topic.env.shilian.status.key";
-    public final static String EXCHANGE_ENV_SHILIAN_STATUS = "topic.env.shilian.status.exchange";
-
-    //喷雾状态
-    public final static String QUEUE_ENV_PENWU_STATUS = "topic.env.penwu.status.queue";
-    public final static String ROUTING_KEY_ENV_PENWU_STATUS = "topic.env.penwu.status.key";
-    public final static String EXCHANGE_ENV_PENWU_STATUS = "topic.env.penwu.status.exchange";
-
-    //日龄温度配置上传
-    public final static String QUEUE_ENV_DAYAGE_PEIZHI = "topic.env.dayage.peizhi.queue";
-    public final static String ROUTING_KEY_ENV_DAYAGE_PEIZHI = "topic.env.dayage.peizhi.key";
-    public final static String EXCHANGE_ENV_DAYAGE_PEIZHI = "topic.env.dayage.peizhi.exchange";
-
-    //风机配置
-    public final static String QUEUE_ENV_FENG_PEIZHI = "topic.env.feng.peizhi.queue";
-    public final static String ROUTING_KEY_ENV_FENG_PEIZHI = "topic.env.feng.peizhi.key";
-    public final static String EXCHANGE_ENV_FENG_PEIZHI = "topic.env.feng.peizhi.exchange";
-
-    //co2
-    public final static String QUEUE_ENV_CO2_DATA = "topic.env.co2.data.queue";
-    public final static String ROUTING_KEY_ENV_CO2_DATA = "topic.env.co2.data.key";
-    public final static String EXCHANGE_ENV_CO2_DATA = "topic.env.co2.data.exchange";
-
-    //压力
-    public final static String QUEUE_ENV_YALI_DATA = "topic.env.yali.data.queue";
-    public final static String ROUTING_KEY_ENV_YALI_DATA = "topic.env.yali.data.key";
-    public final static String EXCHANGE_ENV_YALI_DATA = "topic.env.yali.data.exchange";
-
-    //水暖
-    public final static String QUEUE_ENV_SHUINUAN_DATA = "topic.env.shuinuan.data.queue";
-    public final static String ROUTING_KEY_ENV_SHUINUAN_DATA = "topic.env.shuinuan.data.key";
-    public final static String EXCHANGE_ENV_SHUINUAN_DATA = "topic.env.shuinuan.data.exchange";
-
-    //位置
-    public final static String QUEUE_ENV_WEIZHI_DATA = "topic.env.weizhi.data.queue";
-    public final static String ROUTING_KEY_ENV_WEIZHI_DATA = "topic.env.weizhi.data.key";
-    public final static String EXCHANGE_ENV_WEIZHI_DATA = "topic.env.weizhi.data.exchange";
 
     //水表
-    public final static String QUEUE_ENV_SHUIBIAO_DATA = "topic.env.SHUIBIAO.data.queue";
-    public final static String ROUTING_KEY_ENV_SHUIBIAO_DATA = "topic.env.SHUIBIAO.data.key";
-    public final static String EXCHANGE_ENV_SHUIBIAO_DATA = "topic.env.SHUIBIAO.data.exchange";
-
-    //电表
-    public final static String QUEUE_ENV_DIANBIAO_DATA = "topic.env.dianbiao.data.queue";
-    public final static String ROUTING_KEY_ENV_DIANBIAO_DATA = "topic.env.dianbiao.data.key";
-    public final static String EXCHANGE_ENV_DIANBIAO_DATA = "topic.env.dianbiao.data.exchange";
-
-    //加热器
-    public final static String QUEUE_ENV_JIARE_STATUS = "topic.env.jiare.status.queue";
-    public final static String ROUTING_KEY_ENV_JIARE_STATUS = "topic.env.jiare.status.key";
-    public final static String EXCHANGE_ENV_JIARE_STATUS = "topic.env.jiare.status.exchange";
-
-    //小窗
-    public final static String QUEUE_ENV_XIAOCHUANG_STATUS = "topic.env.xiaochuang.status.queue";
-    public final static String ROUTING_KEY_ENV_XIAOCHUANG_STATUS = "topic.env.xiaochuang.status.key";
-    public final static String EXCHANGE_ENV_XIAOCHUANG_STATUS = "topic.env.xiaochuang.status.exchange";
+    public final static String QUEUE_ENV_SHUI_HUIMV_DATA = "topic.env.shui.huimv.data.queue";
+    public final static String ROUTING_KEY_ENV_SHUI_HUIMV_DATA = "topic.env.shui.huimv.data.key";
+    public final static String EXCHANGE_ENV_SHUI_HUIMV_DATA = "topic.env.shui.huimv.data.exchange";
 
-    //导流板
-    public final static String QUEUE_ENV_DAOLIU_STATUS = "topic.env.daoliu.status.queue";
-    public final static String ROUTING_KEY_ENV_DAOLIU_STATUS = "topic.env.daoliu.status.key";
-    public final static String EXCHANGE_ENV_DAOLIU_STATUS = "topic.env.daoliu.status.exchange";
 
-    //照明
-    public final static String QUEUE_ENV_ZHAOMING_STATUS = "topic.env.zhaoming.status.queue";
-    public final static String ROUTING_KEY_ENV_ZHAOMING_STATUS = "topic.env.zhaoming.status.key";
-    public final static String EXCHANGE_ENV_ZHAOMING_STATUS = "topic.env.zhaoming.status.exchange";
 
 
 }

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

@@ -7,7 +7,6 @@ import org.springframework.boot.autoconfigure.domain.EntityScan;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;
 import org.springframework.context.annotation.ComponentScan;
 import org.springframework.context.annotation.ComponentScans;
-import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
 
 @ComponentScans({@ComponentScan("com.huimv.env.common.utils"), @ComponentScan("com.huimv.env.common.service"),@ComponentScan("com.huimv.env.common.config")})
 @EntityScan(value = "com.huimv.env.common.entity")

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

@@ -1,3 +1,4 @@
+/*
 package com.huimv.env.device.config;
 
 import com.huimv.env.common.utils.Const;
@@ -8,6 +9,7 @@ import org.springframework.amqp.core.TopicExchange;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 
+*/
 /**
  * @Project : huimv.shiwan
  * @Package : com.huimv.biosafety.uface.controller
@@ -15,7 +17,8 @@ import org.springframework.context.annotation.Configuration;
  * @Version : 1.0
  * @Author : ZhuoNing
  * @Create : 2020-12-25
- **/
+ **//*
+
 @Configuration
 public class TopicRabbitMQConfig {
     //温度
@@ -128,3 +131,4 @@ public class TopicRabbitMQConfig {
         return BindingBuilder.bind(warningQueue()).to(warningExchange()).with(Const.ROUTING_KEY_ENV_WARNING);
     }
 }
+*/

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

@@ -1,319 +1,37 @@
-//package com.huimv.env.device.listener;
-//
-//import com.huimv.env.common.utils.Const;
-//import com.huimv.env.common.utils.MathUtil2;
-//import com.huimv.env.device.service.IDeviceService;
-//import lombok.extern.slf4j.Slf4j;
-//import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-//import org.springframework.amqp.rabbit.annotation.RabbitListener;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.stereotype.Component;
-//
-//import java.util.Map;
-//
-//@Component
-//@Slf4j
-//public class DeviceListener {
-//    @Autowired
-//    private IDeviceService deviceService;
-//
-//    @Autowired
-//    private MathUtil2 mathUtil;
-//
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_CO2_DATA)
-//    @RabbitHandler
-//    public void processEnvCO2(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 11 接收CO2数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveCO2(dataArray);
-//        }catch (Exception e){
-//            System.out.println("co2异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_YALI_DATA)
-//    @RabbitHandler
-//    public void processEnvYali(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 11 接收压力数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveYaLI(dataArray);
-//        }catch (Exception e){
-//            System.out.println("压力异常"+e);
-//        }
-//    }
-//
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_TEMP)
-//    @RabbitHandler
-//    public void processEnvTemp(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 11 接收温度数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveTemp(dataArray);
-//        }catch (Exception e){
-//            System.out.println("温度异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_TARGET_TEMP)
-//    @RabbitHandler
-//    public void processEnvTargetTemp(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 17 接收目标温度数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveTargetTemp(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_HUMI)
-//    @RabbitHandler
-//    public void processEnvHumi(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 12 接收湿度数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveHumi(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_DAYAGE)
-//    @RabbitHandler
-//    public void processEnvDayAge(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 13 接收日龄数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveDayAge(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_FENG)
-//    @RabbitHandler
-//    public void processEnvFeng(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 14 接收风机数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveFeng(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_OUT_TEMP)
-//    @RabbitHandler
-//    public void processOutTemp(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 15 接收舍外温度数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveOutTemp(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_IN_TEMP)
-//    @RabbitHandler
-//    public void processInTemp(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 16 接收舍内温度数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveInTemp(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_WARNING)
-//    @RabbitHandler
-//    public void processWning(Map RawMap)   {
-//        System.out.println(">>>>>>>>>>>>>> 17 接收报警数据 RawMap>>" + RawMap.toString());
-//        try {
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveWarning(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_FENG_STATUS)
-//    @RabbitHandler
-//    public void processFengStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 17 接收风机状态数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveFengStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("湿度异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_SHILIAN_STATUS)
-//    @RabbitHandler
-//    public void processShiLianStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 18 接收湿帘状态数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveShiLianStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收湿帘异常"+e);
-//        }
-//
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_PENWU_STATUS)
-//    @RabbitHandler
-//    public void processPenWuStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 19 接收喷雾状态数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.savePenWuStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收喷雾状态异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_DAYAGE_PEIZHI)
-//    @RabbitHandler
-//    public void processDayAgePeiZhi(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 19 接收日龄配置数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveDayAgePeiZhi(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收日龄配置异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_FENG_PEIZHI)
-//    @RabbitHandler
-//    public void processFengPeiZhi(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 19 接收风机配置数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveFengPeiZhi(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收风机配置异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_SHUINUAN_DATA)
-//    @RabbitHandler
-//    public void processShuiNuanData(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 8 接收水暖配置数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveShuiNuan(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收水暖配置数据异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_WEIZHI_DATA)
-//    @RabbitHandler
-//    public void processWeiZhiData(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 9 接收位置数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveWeiZhi(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收水暖配置数据异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_SHUIBIAO_DATA)
-//    @RabbitHandler
-//    public void processShuiBiaoData(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 31 接收水表数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveShuiBiao(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收水表数据数据异常"+e);
-//        }
-//    }
-//
-//    @RabbitListener(queues = Const.QUEUE_ENV_DIANBIAO_DATA)
-//    @RabbitHandler
-//    public void processDianBiaoData(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 32 接收电表数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveDianBiao(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收电表数据数据异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_JIARE_STATUS)
-//    @RabbitHandler
-//    public void processJiaReStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 64 接收加热器状态数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveJiaReStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收加热器状态异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_XIAOCHUANG_STATUS)
-//    @RabbitHandler
-//    public void processXiaoChuangStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 65 接收小窗状态数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveXiaoChuangStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收小窗状态异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_DAOLIU_STATUS)
-//    @RabbitHandler
-//    public void processDaoLiuStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 66 接收导流板状态 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveDaoLiuStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收导流板状态异常"+e);
-//        }
-//    }
-//    @RabbitListener(queues = Const.QUEUE_ENV_ZHAOMING_STATUS)
-//    @RabbitHandler
-//    public void processZhaoMingStatus(Map RawMap)   {
-//        try {
-//            System.out.println(">>>>>>>>>>>>>> 67 接收照明数据 RawMap>>" + RawMap.toString());
-//            String askText = RawMap.get("askText").toString();
-//            String[] dataArray = askText.split("\\+");
-//            deviceService.saveZhaoMingStatus(dataArray);
-//        }catch (Exception e){
-//            System.out.println("接收照明数据异常"+e);
-//        }
-//    }
-//
-//
-//}
+package com.huimv.env.device.listener;
+
+import cn.hutool.json.JSON;
+import cn.hutool.json.JSONUtil;
+import com.huimv.env.common.entity.vo.AllData;
+import com.huimv.env.common.utils.Const;
+import com.huimv.env.common.utils.MathUtil2;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.amqp.rabbit.annotation.RabbitHandler;
+import org.springframework.amqp.rabbit.annotation.RabbitListener;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import java.util.Map;
+
+@Component
+@Slf4j
+public class DeviceListener {
+
+    @Autowired
+    private MathUtil2 mathUtil;
+
+
+    @RabbitListener(queues = Const.QUEUE_ENV_SHUI_HUIMV_DATA)
+    @RabbitHandler
+    public void processReceive(Map<String,String> rawMap)   {
+        System.out.println(">>>>>>>>>>>>>> 11 接收数据 RawMap>>" + rawMap.toString());
+        try {
+            String askText = rawMap.get("askText");
+            AllData allData = JSONUtil.toBean(askText, AllData.class);
+            System.out.println(allData.toString());
+        }catch (Exception e){
+            System.out.println("数据异常"+e);
+        }
+    }
+
+}

huimv-env-device/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-device
 
   datasource:
-    url: jdbc:mysql://121.36.134.218/huimv-farm-env?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://121.36.134.218/huimv-env-hylintech?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: hylintech
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver

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

@@ -18,312 +18,21 @@ import org.springframework.context.annotation.Configuration;
  **/
 @Configuration
 public class TopicRabbitMQConfig {
-    //温度
-    @Bean
-    public Queue tempQueue() {
-        return new Queue(Const.QUEUE_ENV_TEMP);
-    }
-    @Bean
-    TopicExchange tempExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_TEMP);
-    }
-    @Bean
-    Binding bindingTempExchangeMessage() {
-        return BindingBuilder.bind(tempQueue()).to(tempExchange()).with(Const.ROUTING_KEY_ENV_TEMP);
-    }
-
-    //目标温度
-    @Bean
-    public Queue targetTempQueue() {
-        return new Queue(Const.QUEUE_ENV_TARGET_TEMP);
-    }
-    @Bean
-    TopicExchange targetTempExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_TARGET_TEMP);
-    }
-    @Bean
-    Binding bindingTargetTempExchangeMessage() {
-        return BindingBuilder.bind(targetTempQueue()).to(targetTempExchange()).with(Const.ROUTING_KEY_ENV_TARGET_TEMP);
-    }
-    //湿度
-    @Bean
-    public Queue humiQueue() {
-        return new Queue(Const.QUEUE_ENV_HUMI);
-    }
-    @Bean
-    TopicExchange humiExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_HUMI);
-    }
-    @Bean
-    Binding bindingTumiExchangeMessage() {
-        return BindingBuilder.bind(humiQueue()).to(humiExchange()).with(Const.ROUTING_KEY_ENV_HUMI);
-    }
-
-    //日龄
-    @Bean
-    public Queue dayAgeQueue() {
-        return new Queue(Const.QUEUE_ENV_DAYAGE);
-    }
-    @Bean
-    TopicExchange dayAgeExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_DAYAGE);
-    }
-    @Bean
-    Binding bindingDayAgeExchangeMessage() {
-        return BindingBuilder.bind(dayAgeQueue()).to(dayAgeExchange()).with(Const.ROUTING_KEY_ENV_DAYAGE);
-    }
-
-    //通风
-    @Bean
-    public Queue fengQueue() {
-        return new Queue(Const.QUEUE_ENV_FENG);
-    }
-    @Bean
-    TopicExchange fengExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_FENG);
-    }
-    @Bean
-    Binding bindingFengExchangeMessage() {
-        return BindingBuilder.bind(fengQueue()).to(fengExchange()).with(Const.ROUTING_KEY_ENV_FENG);
-    }
-
-    //舍外
-    @Bean
-    public Queue outTempQueue() {
-        return new Queue(Const.QUEUE_ENV_OUT_TEMP);
-    }
-    @Bean
-    TopicExchange outTempExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_OUT_TEMP);
-    }
-    @Bean
-    Binding bindingOutTempExchangeMessage() {
-        return BindingBuilder.bind(outTempQueue()).to(outTempExchange()).with(Const.ROUTING_KEY_ENV_OUT_TEMP);
-    }
-
-    //舍内 平均温度
-    @Bean
-    public Queue inTempQueue() {
-        return new Queue(Const.QUEUE_ENV_IN_TEMP);
-    }
-    @Bean
-    TopicExchange inTempExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_IN_TEMP);
-    }
-    @Bean
-    Binding bindingInTempExchangeMessage() {
-        return BindingBuilder.bind(inTempQueue()).to(inTempExchange()).with(Const.ROUTING_KEY_ENV_IN_TEMP);
-    }
-
-    //报警
-    @Bean
-    public Queue warningQueue() {
-        return new Queue(Const.QUEUE_ENV_WARNING);
-    }
-    @Bean
-    TopicExchange warningExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_WARNING);
-    }
-    @Bean
-    Binding bindingWarningExchangeMessage() {
-        return BindingBuilder.bind(warningQueue()).to(warningExchange()).with(Const.ROUTING_KEY_ENV_WARNING);
-    }
-
-    //湿帘状态
-    @Bean
-    public Queue shilianStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_SHILIAN_STATUS);
-    }
-    @Bean
-    TopicExchange shilianStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_SHILIAN_STATUS);
-    }
-    @Bean
-    Binding bindingshilianStatusExchangeMessage() {
-        return BindingBuilder.bind(shilianStatusQueue()).to(shilianStatusExchange()).with(Const.ROUTING_KEY_ENV_SHILIAN_STATUS);
-    }
-
-    //喷雾状态
-    @Bean
-    public Queue penwuStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_PENWU_STATUS);
-    }
-    @Bean
-    TopicExchange penwuStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_PENWU_STATUS);
-    }
-    @Bean
-    Binding bindingpenwuStatusExchangeMessage() {
-        return BindingBuilder.bind(penwuStatusQueue()).to(penwuStatusExchange()).with(Const.ROUTING_KEY_ENV_PENWU_STATUS);
-    }
-
-    //日龄温度曲线配置
-    @Bean
-    public Queue dayagePeizhiQueue() {
-        return new Queue(Const.QUEUE_ENV_DAYAGE_PEIZHI);
-    }
-    @Bean
-    TopicExchange dayagePeizhiExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_DAYAGE_PEIZHI);
-    }
-    @Bean
-    Binding bindingdayagePeizhiExchangeMessage() {
-        return BindingBuilder.bind(dayagePeizhiQueue()).to(dayagePeizhiExchange()).with(Const.ROUTING_KEY_ENV_DAYAGE_PEIZHI);
-    }
-
-    //风机状态
-    @Bean
-    public Queue fengPeizhiQueue() {
-        return new Queue(Const.QUEUE_ENV_FENG_PEIZHI);
-    }
-    @Bean
-    TopicExchange fengPeizhiExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_FENG_PEIZHI);
-    }
-    @Bean
-    Binding bindingfengPeizhiExchangeMessage() {
-        return BindingBuilder.bind(fengPeizhiQueue()).to(fengPeizhiExchange()).with(Const.ROUTING_KEY_ENV_FENG_PEIZHI);
-    }
-
-
-    //CO2
-    @Bean
-    public Queue co2DataQueue() {
-        return new Queue(Const.QUEUE_ENV_CO2_DATA);
-    }
-    @Bean
-    TopicExchange co2DatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_CO2_DATA);
-    }
-    @Bean
-    Binding bindingCo2DatExchangeMessage() {
-        return BindingBuilder.bind(co2DataQueue()).to(co2DatExchange()).with(Const.ROUTING_KEY_ENV_CO2_DATA);
-    }
 
-    //CO2
-    @Bean
-    public Queue yaliDataQueue() {
-        return new Queue(Const.QUEUE_ENV_YALI_DATA);
-    }
-    @Bean
-    TopicExchange yaliDatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_YALI_DATA);
-    }
-    @Bean
-    Binding bindingYaliDatExchangeMessage() {
-        return BindingBuilder.bind(yaliDataQueue()).to(yaliDatExchange()).with(Const.ROUTING_KEY_ENV_YALI_DATA);
-    }
-
-
-    //水暖
-    @Bean
-    public Queue shuinuanDataQueue() {
-        return new Queue(Const.QUEUE_ENV_SHUINUAN_DATA);
-    }
-    @Bean
-    TopicExchange shuinuanDatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_SHUINUAN_DATA);
-    }
-    @Bean
-    Binding bindingshuinuanDatExchangeMessage() {
-        return BindingBuilder.bind(shuinuanDataQueue()).to(shuinuanDatExchange()).with(Const.ROUTING_KEY_ENV_SHUINUAN_DATA);
-    }
-
-    //位置
-    @Bean
-    public Queue weizhiDataQueue() {
-        return new Queue(Const.QUEUE_ENV_WEIZHI_DATA);
-    }
-    @Bean
-    TopicExchange weizhiDatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_WEIZHI_DATA);
-    }
-    @Bean
-    Binding bindingweizhiDatExchangeMessage() {
-        return BindingBuilder.bind(weizhiDataQueue()).to(weizhiDatExchange()).with(Const.ROUTING_KEY_ENV_WEIZHI_DATA);
-    }
 
     // 水表
     @Bean
     public Queue shuibiaoDataQueue() {
-        return new Queue(Const.QUEUE_ENV_SHUIBIAO_DATA);
+        return new Queue(Const.QUEUE_ENV_SHUI_HUIMV_DATA);
     }
     @Bean
     TopicExchange shuibiaoDatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_SHUIBIAO_DATA);
+        return new TopicExchange(Const.EXCHANGE_ENV_SHUI_HUIMV_DATA);
     }
     @Bean
     Binding bindingshuibiaoDatExchangeMessage() {
-        return BindingBuilder.bind(shuibiaoDataQueue()).to(shuibiaoDatExchange()).with(Const.ROUTING_KEY_ENV_SHUIBIAO_DATA);
-    }
-
-    //电表
-    @Bean
-    public Queue dianbiaoDataQueue() {
-        return new Queue(Const.QUEUE_ENV_DIANBIAO_DATA);
-    }
-    @Bean
-    TopicExchange dianbiaoDatExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_DIANBIAO_DATA);
-    }
-    @Bean
-    Binding bindingdianbiaoDatExchangeMessage() {
-        return BindingBuilder.bind(dianbiaoDataQueue()).to(dianbiaoDatExchange()).with(Const.ROUTING_KEY_ENV_DIANBIAO_DATA);
-    }
-
-    //加热器
-    @Bean
-    public Queue jiareStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_JIARE_STATUS);
-    }
-    @Bean
-    TopicExchange jiareStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_JIARE_STATUS);
-    }
-    @Bean
-    Binding bindingjiareStatusExchangeMessage() {
-        return BindingBuilder.bind(jiareStatusQueue()).to(jiareStatusExchange()).with(Const.ROUTING_KEY_ENV_JIARE_STATUS);
-    }
-
-    //小窗
-    @Bean
-    public Queue xiaochuangStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_XIAOCHUANG_STATUS);
-    }
-    @Bean
-    TopicExchange xiaochuangStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_XIAOCHUANG_STATUS);
-    }
-    @Bean
-    Binding bindingxiaochuangStatusExchangeMessage() {
-        return BindingBuilder.bind(xiaochuangStatusQueue()).to(xiaochuangStatusExchange()).with(Const.ROUTING_KEY_ENV_XIAOCHUANG_STATUS);
+        return BindingBuilder.bind(shuibiaoDataQueue()).to(shuibiaoDatExchange()).with(Const.ROUTING_KEY_ENV_SHUI_HUIMV_DATA);
     }
 
-    //导流板
-    @Bean
-    public Queue daoliuStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_DAOLIU_STATUS);
-    }
-    @Bean
-    TopicExchange daoliuStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_DAOLIU_STATUS);
-    }
-    @Bean
-    Binding bindingdaoliuStatusExchangeMessage() {
-        return BindingBuilder.bind(daoliuStatusQueue()).to(daoliuStatusExchange()).with(Const.ROUTING_KEY_ENV_DAOLIU_STATUS);
-    }
 
-    //照明
-    @Bean
-    public Queue zhaomingStatusQueue() {
-        return new Queue(Const.QUEUE_ENV_ZHAOMING_STATUS);
-    }
-    @Bean
-    TopicExchange zhaomingStatusExchange() {
-        return new TopicExchange(Const.EXCHANGE_ENV_ZHAOMING_STATUS);
-    }
-    @Bean
-    Binding bindingzhaomingStatusExchangeMessage() {
-        return BindingBuilder.bind(zhaomingStatusQueue()).to(zhaomingStatusExchange()).with(Const.ROUTING_KEY_ENV_ZHAOMING_STATUS);
-    }
 }

huimv-env-input/src/main/java/com/huimv/env/input/controller/ReceiveData.java

@@ -0,0 +1,22 @@
+package com.huimv.env.input.controller;
+
+import com.huimv.env.input.producer.Producer;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.Map;
+
+
+@RestController
+public class ReceiveData {
+
+    @Autowired
+    private Producer producer;
+
+    @PostMapping("/receiveData")
+    public void test(@RequestBody String map) {
+        producer.sendShuiBiaoData(map);
+    }
+}

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

@@ -24,172 +24,11 @@ public class Producer {
     RabbitTemplate rabbitTemplate;  //使用RabbitTemplate,这提供了接收/发送等等方法
 
 
-    public String sendTempAskToMQ(String askText){
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_TEMP, Const.ROUTING_KEY_ENV_TEMP, map);
-        return "ok";
-    }
-
-    public String sendDayAge(String askText){
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_DAYAGE, Const.ROUTING_KEY_ENV_DAYAGE, map);
-        return "ok";
-    }
-
-    public String sendFeng(String askText){
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_FENG, Const.ROUTING_KEY_ENV_FENG, map);
-        return "ok";
-    }
-
-    public String sendOutTemp(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_OUT_TEMP, Const.ROUTING_KEY_ENV_OUT_TEMP, map);
-        return "ok";
-    }
-
-    public String sendInTemp(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_IN_TEMP, Const.ROUTING_KEY_ENV_IN_TEMP, map);
-        return "ok";
-    }
-
-    public String sendTemp(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_TEMP, Const.ROUTING_KEY_ENV_TEMP, map);
-        return "ok";
-    }
-
-    public String sendHumi(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_HUMI, Const.ROUTING_KEY_ENV_HUMI, map);
-        return "ok";
-    }
-
-    public String sendWarning(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_WARNING, Const.ROUTING_KEY_ENV_WARNING, map);
-        return "ok";
-    }
-
-    public String uploadFengStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_FENG_STATUS, Const.ROUTING_KEY_ENV_FENG_STATUS, map);
-        return "ok";
-    }
-
-    public String  senTargetnTemp(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_TARGET_TEMP, Const.ROUTING_KEY_ENV_TARGET_TEMP, map);
-        return "ok";
-
-    }
-
-    public String sendShiLianStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_SHILIAN_STATUS, Const.ROUTING_KEY_ENV_SHILIAN_STATUS, map);
-        return "ok";
-    }
-
-    public String sendPengWuStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_PENWU_STATUS, Const.ROUTING_KEY_ENV_PENWU_STATUS, map);
-        return "ok";
-    }
-    public String sendDayAgePeiZhi(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_DAYAGE_PEIZHI, Const.ROUTING_KEY_ENV_DAYAGE_PEIZHI, map);
-        return "ok";
-    }
-    public String sendTongFengPeiZhi(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_FENG_PEIZHI, Const.ROUTING_KEY_ENV_FENG_PEIZHI, map);
-        return "ok";
-    }
-
-
-    public String sendCo2(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_CO2_DATA, Const.ROUTING_KEY_ENV_CO2_DATA, map);
-        return "ok";
-    }
-
-    public String sendYaLi(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_YALI_DATA, Const.ROUTING_KEY_ENV_YALI_DATA, map);
-        return "ok";
-    }
-
-    public String  sendShuiNuan(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_SHUINUAN_DATA, Const.ROUTING_KEY_ENV_SHUINUAN_DATA, map);
-        return "ok";
-    }
-
-    public String  sendWeiZhi(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_WEIZHI_DATA, Const.ROUTING_KEY_ENV_WEIZHI_DATA, map);
-        return "ok";
-
-    }
-
     public String sendShuiBiaoData(String askText) {
         Map map = new HashMap();
         map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_SHUIBIAO_DATA, Const.ROUTING_KEY_ENV_SHUIBIAO_DATA, map);
-        return "ok";
-    }
-
-    public String sendDianBiaoData(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_DIANBIAO_DATA, Const.ROUTING_KEY_ENV_DIANBIAO_DATA, map);
-        return "ok";
-    }
-
-    public String sendJiaReStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_JIARE_STATUS, Const.ROUTING_KEY_ENV_JIARE_STATUS, map);
+        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_SHUI_HUIMV_DATA, Const.ROUTING_KEY_ENV_SHUI_HUIMV_DATA, map);
         return "ok";
     }
 
-    public String sendXiaoChuangStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_XIAOCHUANG_STATUS, Const.ROUTING_KEY_ENV_XIAOCHUANG_STATUS, map);
-        return "ok";
-    }
-
-    public String sendDaoLiuStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_DAOLIU_STATUS, Const.ROUTING_KEY_ENV_DAOLIU_STATUS, map);
-        return "ok";
-    }
-
-    public String sendZhaoMingStatus(String askText) {
-        Map map = new HashMap();
-        map.put("askText",askText);
-        rabbitTemplate.convertAndSend(Const.EXCHANGE_ENV_ZHAOMING_STATUS, Const.ROUTING_KEY_ENV_ZHAOMING_STATUS, map);
-        return "ok";
-    }
 }

huimv-env-input/src/main/resources/application-prod.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-input
 
   datasource:
-    url: jdbc:mysql://121.36.134.218/huimv-farm-env?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://121.36.134.218/huimv-env-hylintech?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: hylintech
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver