From d2a436897e8e01c0da56daac413732367938a920 Mon Sep 17 00:00:00 2001 From: zy_Java <654600784@qq.com> Date: Wed, 17 Mar 2021 11:48:42 +0800 Subject: [PATCH] 202103 --- .../beneficiation/api/DebugController.java | 2 +- .../beneficiation/bean/vo/ParameterVo.java | 5 +++++ .../service/ParameterService.java | 22 +++++++++++++++---- .../src/main/resources/application.yml | 4 ++-- .../resources/application-greenvalley.yml | 5 +++-- tall/src/main/resources/application.yml | 4 ++-- 6 files changed, 31 insertions(+), 11 deletions(-) diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java b/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java index 23148be1..45bd13a0 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/api/DebugController.java @@ -23,7 +23,7 @@ public class DebugController { @RequestMapping(value="",method = RequestMethod.GET,produces = {"application/json;charset=UTF-8"}) public JsonResponse debug(HttpServletRequest request) throws Exception { - return JsonResponse.newInstance().ok("测试"); + return JsonResponse.newInstance().ok("测aaaaaa11"); } diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java index 2675ffa6..0974712e 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/bean/vo/ParameterVo.java @@ -154,6 +154,11 @@ public class ParameterVo { this.maxValue = maxValue; } + public ThresholdValue(String type, String key) { + this.type = type; + this.key = key; + } + public ThresholdValue() { } } diff --git a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java index 7c1cf23d..2a2daab9 100644 --- a/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java +++ b/beneficiation/src/main/java/com/ccsens/beneficiation/service/ParameterService.java @@ -71,7 +71,7 @@ public class ParameterService implements IParameterService{ }); } parameterInfo.setTransducers(transducers); - //查询变频器和电磁阀 + //查询电耳 List parameters = recordDao.queryParameter(); if(CollectionUtil.isNotEmpty(parameters)){ parameters.forEach(parameter -> { @@ -82,11 +82,25 @@ public class ParameterService implements IParameterService{ value.setKey("实时" + a); value.setType("thresholdValue" + a); //查询设备的阀值1 - value.setThresholdValue1(recordDao.getThresholdValue(value.getId(),1)); + ParameterVo.ThresholdValue thresholdValue1 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue1)){ + thresholdValue1 = new ParameterVo.ThresholdValue("thresholdValue1","阀值1"); + } + value.setThresholdValue1(thresholdValue1); + //阀值2 - value.setThresholdValue2(recordDao.getThresholdValue(value.getId(),2)); + ParameterVo.ThresholdValue thresholdValue2 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue2)){ + thresholdValue2 = new ParameterVo.ThresholdValue("thresholdValue2","阀值2"); + } + value.setThresholdValue2(thresholdValue2); + //阀值3 - value.setThresholdValue3(recordDao.getThresholdValue(value.getId(),3)); + ParameterVo.ThresholdValue thresholdValue3 = recordDao.getThresholdValue(value.getId(), 1); + if(ObjectUtil.isNull(thresholdValue3)){ + thresholdValue3 = new ParameterVo.ThresholdValue("thresholdValue3","阀值3"); + } + value.setThresholdValue3(thresholdValue3); i++; } } diff --git a/beneficiation/src/main/resources/application.yml b/beneficiation/src/main/resources/application.yml index ac92adb9..a47f2a7b 100644 --- a/beneficiation/src/main/resources/application.yml +++ b/beneficiation/src/main/resources/application.yml @@ -1,6 +1,6 @@ spring: profiles: - active: test - include: common, util-test + active: dev + include: common, util-dev diff --git a/tall/src/main/resources/application-greenvalley.yml b/tall/src/main/resources/application-greenvalley.yml index fa815963..aea6965e 100644 --- a/tall/src/main/resources/application-greenvalley.yml +++ b/tall/src/main/resources/application-greenvalley.yml @@ -12,9 +12,9 @@ spring: type: com.alibaba.druid.pool.DruidDataSource rabbitmq: host: 127.0.0.1 - password: admin + password: 111111 port: 5672 - username: 111111 + username: admin redis: database: 0 host: 127.0.0.1 @@ -34,6 +34,7 @@ eureka: ip-address: 82.156.116.247 gatewayUrl: http://82.156.116.247 /gateway/ notGatewayUrl: http://82.156.116.247 / +smsCode: 1 file: domain: http://82.156.116.247 /gateway/tall/v1.0/ imgDomain: http://82.156.116.247 /gateway/tall/v1.0/uploads \ No newline at end of file diff --git a/tall/src/main/resources/application.yml b/tall/src/main/resources/application.yml index b5408a3a..9e02c3e8 100644 --- a/tall/src/main/resources/application.yml +++ b/tall/src/main/resources/application.yml @@ -1,5 +1,5 @@ spring: profiles: - active: dev - include: util-dev,common + active: greenvalley + include: util-greenvalley,common