大屏数据

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

@@ -10,54 +10,64 @@ package com.huimv.env.common.utils;
  **/
 public class Const {
     // 温度
-    public final static String ROUTING_KEY_TEMP = "topic.temp.key";
-    public final static String QUEUE_TEMP = "topic.temp.queue";
-    public final static String EXCHANGE_TEMP = "topic.temp.exchange";
+    public final static String ROUTING_KEY_TEMP = "topic.temp.key1";
+//    public final static String QUEUE_TEMP = "topic.temp.queue";
+    public final static String QUEUE_TEMP = "topic.temp.queue1";
+    public final static String EXCHANGE_TEMP = "topic.temp.exchange1";
 
     // 湿度
-    public final static String ROUTING_KEY_HUMI = "topic.humi.key";
-    public final static String QUEUE_HUMI = "topic.humi.queue";
-    public final static String EXCHANGE_HUMI = "topic.humi.exchange";
+    public final static String ROUTING_KEY_HUMI = "topic.humi.key1";
+//    public final static String QUEUE_HUMI = "topic.humi.queue";
+    public final static String QUEUE_HUMI = "topic.humi.queue1";
+    public final static String EXCHANGE_HUMI = "topic.humi.exchange1";
 
     // 氨气
-    public final static String ROUTING_KEY_AMMONIA = "topic.ammonia.key";
+    public final static String ROUTING_KEY_AMMONIA = "topic.ammonia.key1";
+//    public final static String QUEUE_AMMONIA = "topic.ammonia.queue";
     public final static String QUEUE_AMMONIA = "topic.ammonia.queue";
-    public final static String EXCHANGE_AMMONIA = "topic.ammonia.exchange";
+    public final static String EXCHANGE_AMMONIA = "topic.ammonia.exchange1";
 
     // 传感器
-    public final static String ROUTING_KEY_SENSOR = "topic.sensor.key";
-    public final static String QUEUE_SENSOR = "topic.sensor.queue";
-    public final static String EXCHANGE_SENSOR = "topic.sensor.exchange";
+    public final static String ROUTING_KEY_SENSOR = "topic.sensor.key1";
+//    public final static String QUEUE_SENSOR = "topic.sensor.queue";
+    public final static String QUEUE_SENSOR = "topic.sensor.queue1";
+    public final static String EXCHANGE_SENSOR = "topic.sensor.exchange1";
 
     //设备状态
-    public final static String ROUTING_KEY_DEVICE_STATUS = "topic.deviceStatus.key";
-    public final static String QUEUE_DEVICE_STATUS = "topic.deviceStatus.queue";
-    public final static String EXCHANGE_DEVICE_STATUS = "topic.deviceStatus.exchange";
+    public final static String ROUTING_KEY_DEVICE_STATUS = "topic.deviceStatus.key1";
+//    public final static String QUEUE_DEVICE_STATUS = "topic.deviceStatus.queue";
+    public final static String QUEUE_DEVICE_STATUS = "topic.deviceStatus.queue1";
+    public final static String EXCHANGE_DEVICE_STATUS = "topic.deviceStatus.exchange1";
 
     //平台推送短信
-    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_PUSH_MESSAGE = "topic.pushMessage.key1";
+//    public final static String QUEUE_PUSH_MESSAGE = "topic.pushMessage.queue";
+    public final static String QUEUE_PUSH_MESSAGE = "topic.pushMessage.queue1";
+    public final static String EXCHANGE_PUSH_MESSAGE = "topic.pushMessage.exchange1";
 
     // 水压
-    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";
+    public final static String ROUTING_KEY_WATER_GEGE = "topic.waterGege.key1";
+//    public final static String QUEUE_WATER_GEGE = "topic.waterGege.queue";
+    public final static String QUEUE_WATER_GEGE = "topic.waterGege.queue1";
+    public final static String EXCHANGE_WATER_GEGE = "topic.waterGege.exchange1";
 
     // PH
-    public final static String ROUTING_KEY_PH = "topic.ph.key";
-    public final static String QUEUE_PH = "topic.ph.queue";
-    public final static String EXCHANGE_PH = "topic.ph.exchange";
+    public final static String ROUTING_KEY_PH = "topic.ph.key1";
+//    public final static String QUEUE_PH = "topic.ph.queue";
+    public final static String QUEUE_PH = "topic.ph.queue1";
+    public final static String EXCHANGE_PH = "topic.ph.exchange1";
 
     // 水表
-    public final static String ROUTING_KEY_WATER_METER = "topic.waterMeter.key";
-    public final static String QUEUE_WATER_METER = "topic.waterMeter.queue";
-    public final static String EXCHANGE_WATER_METER = "topic.waterMeter.exchange";
+    public final static String ROUTING_KEY_WATER_METER = "topic.waterMeter.key1";
+//    public final static String QUEUE_WATER_METER = "topic.waterMeter.queue";
+    public final static String QUEUE_WATER_METER = "topic.waterMeter.queue1";
+    public final static String EXCHANGE_WATER_METER = "topic.waterMeter.exchange1";
 
     // 电表
-    public final static String ROUTING_KEY_ELECTRICITY_METER = "topic.electricityMeter.key";
-    public final static String QUEUE_ELECTRICITY_METER = "topic.electricityMeter.queue";
-    public final static String EXCHANGE_ELECTRICITY_METER = "topic.electricityMeter.exchange";
+    public final static String ROUTING_KEY_ELECTRICITY_METER = "topic.electricityMeter.key1";
+//    public final static String QUEUE_ELECTRICITY_METER = "topic.electricityMeter.queue";
+    public final static String QUEUE_ELECTRICITY_METER = "topic.electricityMeter.queue1";
+    public final static String EXCHANGE_ELECTRICITY_METER = "topic.electricityMeter.exchange1";
 
     public final static Integer ERR_TODAY_WATER_CODE = 10050;
     public final static String ERR_TODAY_WATER_INFO = "今天水量数据不存在";

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

@@ -18,6 +18,7 @@ import com.huimv.env.device.service.IDeviceService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.client.RestTemplate;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
@@ -71,7 +72,6 @@ public class DeviceServiceImpl implements IDeviceService {
     private EnvElectricityDayService envElectricityDayService;
     @Resource
     private EnvElectricityMonthService envElectricityMonthService;
-
     //保存每天的用水量
     @Override
     public void saveDayWaterConsumption(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) throws ParseException {
@@ -214,9 +214,11 @@ public class DeviceServiceImpl implements IDeviceService {
     @Override
     public void saveTempFlow(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         EnvTempEntity envTempEntity = new EnvTempEntity();
-        envTempEntity.setDeviceCode(dataJo.getString("deviceCode"));
+        String deviceCode = dataJo.getString("deviceCode");
+        BigDecimal bigDecimal = new BigDecimal(mathUtil.countTemp(dataJo.getIntValue("value")));
+        envTempEntity.setDeviceCode(deviceCode);
         envTempEntity.setSensorSn(dataJo.getInteger("sensorSn"));
-        envTempEntity.setTemp(new BigDecimal(mathUtil.countTemp(dataJo.getIntValue("value"))));
+        envTempEntity.setTemp(bigDecimal);
         envTempEntity.setAskTime(dateUtil.handleAskTime(dataJo.getString("askTime")));
         envTempEntity.setAddTime(nowTimestamp);
         envTempEntity.setAddDate(todayDate);
@@ -225,15 +227,22 @@ public class DeviceServiceImpl implements IDeviceService {
         envTempEntity.setUnitId(envDeviceRegisterEntity.getUnitId());
         envTempEntity.setDataUnit(dataJo.getString("dataUnit"));
         envTempEntityRepo.saveAndFlush(envTempEntity);
+        if ("121".equals(deviceCode)){
+            RestTemplate restTemplate = new RestTemplate();
+            restTemplate.getForObject("http://139.9.167.178:9050/info/saveData/save?type=1&value="+bigDecimal,String.class);
+        }
     }
 
     //保存湿度流水数据
     @Override
     public void saveHumiFlow(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         EnvHumiEntity envHumiEntity = new EnvHumiEntity();
-        envHumiEntity.setDeviceCode(dataJo.getString("deviceCode"));
+        String deviceCode = dataJo.getString("deviceCode");
+        BigDecimal bigDecimal = new BigDecimal(mathUtil.countHumi(dataJo.getIntValue("value")));
+
+        envHumiEntity.setDeviceCode(deviceCode);
         envHumiEntity.setSensorSn(dataJo.getInteger("sensorSn"));
-        envHumiEntity.setHumi(new BigDecimal(mathUtil.countHumi(dataJo.getIntValue("value"))));
+        envHumiEntity.setHumi(bigDecimal);
         envHumiEntity.setAskTime(dateUtil.handleAskTime(dataJo.getString("askTime")));
         envHumiEntity.setAddTime(nowTimestamp);
         envHumiEntity.setAddDate(todayDate);
@@ -242,15 +251,21 @@ public class DeviceServiceImpl implements IDeviceService {
         envHumiEntity.setUnitId(envDeviceRegisterEntity.getUnitId());
         envHumiEntity.setDataUnit(dataJo.getString("dataUnit"));
         envHumiEntityRepo.saveAndFlush(envHumiEntity);
+        if ("121".equals(deviceCode)){
+            RestTemplate restTemplate = new RestTemplate();
+            restTemplate.getForObject("http://139.9.167.178:9050/info/saveData/save?type=2&value="+bigDecimal,String.class);
+        }
     }
 
     //保存氨气流水数据
     @Override
     public void saveAmmoniaFlow(JSONObject dataJo, EnvDeviceRegisterEntity envDeviceRegisterEntity, Timestamp nowTimestamp, Date todayDate, String farmCode) {
         EnvAmmoniaEntity envAmmoniaEntity = new EnvAmmoniaEntity();
-        envAmmoniaEntity.setDeviceCode(dataJo.getString("deviceCode"));
+        String deviceCode = dataJo.getString("deviceCode");
+        BigDecimal bigDecimal = new BigDecimal(mathUtil.countMeter(dataJo.getIntValue("value")));
+        envAmmoniaEntity.setDeviceCode(deviceCode);
         envAmmoniaEntity.setSensorSn(dataJo.getInteger("sensorSn"));
-        envAmmoniaEntity.setAmmonia(new BigDecimal(mathUtil.countMeter(dataJo.getIntValue("value"))));
+        envAmmoniaEntity.setAmmonia(bigDecimal);
         envAmmoniaEntity.setAskTime(dateUtil.handleAskTime(dataJo.getString("askTime")));
         envAmmoniaEntity.setAddTime(nowTimestamp);
         envAmmoniaEntity.setAddDate(todayDate);
@@ -259,6 +274,12 @@ public class DeviceServiceImpl implements IDeviceService {
         envAmmoniaEntity.setUnitId(envDeviceRegisterEntity.getUnitId());
         envAmmoniaEntity.setDataUnit(dataJo.getString("dataUnit"));
         envAmmoniaEntityRepo.saveAndFlush(envAmmoniaEntity);
+        System.out.println("111111111"+deviceCode + "   "  +bigDecimal);
+        if ("121".equals(deviceCode)){
+            RestTemplate restTemplate = new RestTemplate();
+            String forObject = restTemplate.getForObject("http://139.9.167.178:9050/info/saveData/save?type=3&value=" + bigDecimal, String.class);
+            System.out.println("2222222"+forObject);
+        }
     }
     //保存水压流水数据
     @Override

huimv-env-platform/huimv-env-device/src/main/resources/application-dev.yml

@@ -6,7 +6,7 @@ spring:
     name: huimv-env-device
 
   datasource:
-    url: jdbc:mysql://115.238.57.190:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
+    url: jdbc:mysql://122.112.224.199:3306/huimv-env-platform?useUnicode=true&characterEncoding=UTF-8&useSSL=false&autoReconnect=true&serverTimezone=Asia/Shanghai
     username: root
     password: hm123456
     driver-class-name: com.mysql.cj.jdbc.Driver
@@ -27,7 +27,7 @@ spring:
 #    #虚拟host 可以不设置,使用server默认host
 #    virtual-host: /
   rabbitmq:
-    host: 192.168.1.82
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin

huimv-env-platform/huimv-env-input/src/main/resources/application-dev.yml

@@ -27,7 +27,8 @@ spring:
 #    #虚拟host 可以不设置,使用server默认host
 #    virtual-host: /
   rabbitmq:
-    host: 192.168.1.82
+#    host: 192.168.1.82
+    host: 121.36.134.218
     port: 5672
     username: admin
     password: admin

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

@@ -42,24 +42,9 @@ spring:
 
   #redis
   redis:
-    database: 0
-    host: 192.168.1.68
+    host: 122.112.224.199
     port: 6379
     password: hm123456
-    timeout: 5000ms
-    jedis:
-      pool:
-        max-active: 20
-        max-wait: -1
-        max-idle: 10
-        min-idle: 0
-    lettuce:
-      pool:
-        max-active: 3
-        min-idle: 2
-        max-idle: 3
-        max-wait: 1
-      shutdown-timeout: 100
 
   data:
     redis:

huimv-env-platform/huimv-env-lamp/src/main/java/com/huimv/env/lamp/server/LampInputServerHandler.java

@@ -77,18 +77,20 @@ public class LampInputServerHandler extends ChannelInboundHandlerAdapter {
         String clientAskText = data.toString(CharsetUtil.UTF_8);
         //保存实例内的客户端请求
         appendClientAsk(clientAskText);
+
         //临时写入耳标数据到文件
 //        writeTxt(clientAskText,"all");
     }
 
     @Override
     public void channelReadComplete(ChannelHandlerContext ctx) throws Exception {
-        if (askTextSb.toString().indexOf("end") != -1) {
+        if (askTextSb.toString().contains("end")) {
             // {处理客户端消息}
             handleClientAskCmd(askTextSb.toString(), ctx);
             //清空重置;
-            askTextSb.delete(0, askTextSb.length());
+//            askTextSb.delete(0, askTextSb.length());
         }
+        askTextSb.delete(0, askTextSb.length());
     }
 
     @Override
@@ -99,7 +101,7 @@ public class LampInputServerHandler extends ChannelInboundHandlerAdapter {
     }
     @Override
     public void exceptionCaught(ChannelHandlerContext ctx, Throwable cause) throws Exception {
-        if (cause.getMessage().indexOf("Connection reset") != -1) {
+        if (cause.getMessage().contains("Connection reset")) {
             log.info("相关采集器设备正在重启:" + cause.toString());
         }
 //        cause.printStackTrace();
@@ -118,19 +120,20 @@ public class LampInputServerHandler extends ChannelInboundHandlerAdapter {
      */
     private void handleClientAskCmd(String clientAskText, ChannelHandlerContext ctx) throws ParseException, IOException {
         clientAskText = clientAskText.replaceAll("\r", "").replaceAll("\n", "");
+        System.out.println("clientAskText"+clientAskText);
         //{处理非正常命令}
-//        int countPlus = regexUtil.countPlus(clientAskText);
+        int countPlus = regexUtil.countPlus(clientAskText);
 //        if (countPlus < 4) {
 //            System.out.println("当前数据为不完整数据，故丢弃.>>" + clientAskText);
 //        } else {
         //--处理客户端请求数据
         //{拆分粘包数据}
-        JSONArray askJa = parseAskCmdPackage(clientAskText);
-        for (int a = 0; a < askJa.size(); a++) {
-            String askText = askJa.getString(a);
-            //{处理请求命令}
-            askCmdActuator(askText, ctx);
-        }
+            JSONArray askJa = parseAskCmdPackage(clientAskText);
+            for (int a = 0; a < askJa.size(); a++) {
+                String askText = askJa.getString(a);
+                //{处理请求命令}
+                askCmdActuator(askText, ctx);
+            }
 //        }
     }
 

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

@@ -1,8 +1,11 @@
 package com.huimv.env.manage.controller;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.alibaba.fastjson.JSONObject;
+import com.huimv.env.manage.entity.BaseFarm;
 import com.huimv.env.manage.exception.ExceptionEnum;
 import com.huimv.env.manage.exception.MiException;
+import com.huimv.env.manage.service.IBaseFarmService;
 import com.huimv.env.manage.token.*;
 
 import com.huimv.env.manage.utils.Result;
@@ -25,13 +28,10 @@ import java.util.Map;
 @CrossOrigin
 @RequestMapping(value = "/my")
 public class LoginController {
-
-
-
     @Autowired
     ILoginService iLoginService;
-
-
+    @Autowired
+    IBaseFarmService baseFarmService;
 
     @RequestMapping("/logout")
     public Result logout(@RequestParam(name = "accountName", required = true) String accountName, @RequestParam(name = "password", required = true) String password) {
@@ -87,19 +87,20 @@ public class LoginController {
         if(result.getCode() == 10000){
 
             SysAccountMultilevel accountEntity = (SysAccountMultilevel) result.getData();
+            Integer lastFarmId = accountEntity.getLastFarmId();
             Integer id = accountEntity.getId();
-
-
             AccessToken accessToken = new AccessToken();
             accessToken.setCreated(new Date());
             accessToken.setAccountName(accountName);
             accessToken.setCode(result.getCode());
             accessToken.setMessage(result.getMessage());
-            accessToken.setFarmId(accountEntity.getLastFarmId()+"");
+            accessToken.setFarmId(lastFarmId+"");
             String token = TokenSign.sign(accountName,id,accountEntity.getFarmIds());
             accessToken.setToken(token);
-
-            accessToken.setFarmName("青山牧场");
+            BaseFarm byId = baseFarmService.getById(lastFarmId);
+            if (ObjectUtil.isNotEmpty(byId)){
+                accessToken.setFarmName(byId.getFarmName());
+            }
 //            accessToken.setOpenId(accountEntity.getOpenId());
 //            accessToken.setImgUrl(accountEntity.getImgUrl());
 //            accessToken.setWechatName(accountEntity.getWechatName());

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

@@ -228,7 +228,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
         QueryWrapper<LampConfig> wrapper = new QueryWrapper<>();
         wrapper.eq("unit_id",unitId).last("ORDER BY CAST( REPLACE(location,\"号产床\",\"\")AS SIGNED) ");
         List<LampConfig> lampConfigs = lampConfigMapper.selectList(wrapper);
-        for (LampConfig lampConfig : lampConfigs) {
+       /* for (LampConfig lampConfig : lampConfigs) {
             String deviceId = lampConfig.getDeviceId();
             LampTemp lampTemp = lampTempMapper.selectOne(new QueryWrapper<LampTemp>().eq("device_id", deviceId).orderByDesc("add_time").last("limit 1"));
             if (ObjectUtil.isEmpty(lampTemp)){
@@ -236,7 +236,7 @@ public class LampConfigServiceImpl extends ServiceImpl<LampConfigMapper, LampCon
             }else {
                 lampConfig.setRemark(lampTemp.getTemp());
             }
-        }
+        }*/
         return ResultUtil.isNull(lampConfigs);
     }
 

huimv-env-platform/huimv-env-produce/src/main/resources/application.properties

@@ -1,7 +1,7 @@
 #spring.profiles.active=dev
 #spring.profiles.active=prod
-spring.profiles.active=qingshan_1
-#spring.profiles.active=qingshan
+#spring.profiles.active=qingshan_1
+spring.profiles.active=qingshan
 
 
 # mysql:/cache: