diff --git a/user-service/src/main/java/com/mh/user/config/DruidConfig.java b/user-service/src/main/java/com/mh/user/config/DruidConfig.java index d6ced5c..fe70a5e 100644 --- a/user-service/src/main/java/com/mh/user/config/DruidConfig.java +++ b/user-service/src/main/java/com/mh/user/config/DruidConfig.java @@ -88,9 +88,9 @@ public class DruidConfig { ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean(new StatViewServlet(), "/druid/*"); //白名单： -// servletRegistrationBean.addInitParameter("allow","127.0.0.1,139.196.87.48"); + servletRegistrationBean.addInitParameter("allow","127.0.0.1"); //IP黑名单 (存在共同时，deny优先于allow) : 如果满足deny的话提示:Sorry, you are not permitted to view this page. - servletRegistrationBean.addInitParameter("deny","192.168.1.222"); +// servletRegistrationBean.addInitParameter("deny","192.168.1.222"); //登录查看信息的账号密码, 用于登录Druid监控后台 servletRegistrationBean.addInitParameter("loginUsername", "mhtech"); servletRegistrationBean.addInitParameter("loginPassword", "mh9082@!!qwedss"); diff --git a/user-service/src/main/java/com/mh/user/controller/NowDataController.java b/user-service/src/main/java/com/mh/user/controller/NowDataController.java index c444987..f9fac55 100644 --- a/user-service/src/main/java/com/mh/user/controller/NowDataController.java +++ b/user-service/src/main/java/com/mh/user/controller/NowDataController.java @@ -17,7 +17,11 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RestController; +import java.math.BigDecimal; +import java.math.RoundingMode; import java.text.SimpleDateFormat; +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -42,6 +46,9 @@ public class NowDataController { @Autowired DeviceFloorService deviceFloorService; + @Autowired + CollectionParamsManageService collectingManagerService; + @SysLogger(title = "实时监控", optDesc = "实时查看每楼栋热水运行情况") @PostMapping("/queryNow") public HttpResult queryNowData(@RequestParam(value = "buildingId") String buildingId) { @@ -51,15 +58,22 @@ public class NowDataController { String maxWaterTemp = nowDataService.selectMaxTemp(buildingId); String buildingName = buildingService.queryBuildingName(buildingId);//获取楼栋名称 - SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - String curDate = sdf1.format(date); - curDate = curDate.substring(0, 13) + ":00:00"; + +// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// Date date = new Date(); +// String curDate = sdf1.format(date); +// curDate = curDate.substring(0, 13) + ":00:00"; + String curDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00:00")); NowPublicDataEntity nowPublicData = new NowPublicDataEntity(); nowPublicData.setBuildingId(buildingId); nowPublicData.setBuildingName(buildingName); - if (avgWaterTemp != null) { + + // 判断是否有回水温度 + CollectionParamsManageEntity collectionParamsManageEntity = collectingManagerService.selectDeviceInstallByOtherName("回水温度", buildingId); + if (collectionParamsManageEntity != null && collectionParamsManageEntity.getCurValue().compareTo(BigDecimal.ZERO) > 0) { + nowPublicData.setBackWaterTemp(collectionParamsManageEntity.getCurValue().setScale(1, RoundingMode.HALF_UP).toString()); + } else if (avgWaterTemp != null) { nowPublicData.setBackWaterTemp(avgWaterTemp); } else { nowPublicData.setBackWaterTemp("0"); @@ -117,10 +131,12 @@ public class NowDataController { String maxWaterTemp = nowDataService.selectMaxTemp(buildingId); String buildingName = buildingService.queryBuildingName(buildingId);//获取楼栋名称 - SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - Date date = new Date(); - String curDate = sdf1.format(date); - curDate = curDate.substring(0, 13) + ":00:00"; +// SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); +// Date date = new Date(); +// String curDate = sdf1.format(date); +// curDate = curDate.substring(0, 13) + ":00:00"; + + String curDate = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00:00")); NowPublicDataEntity nowPublicData = new NowPublicDataEntity(); nowPublicData.setBuildingId(buildingId); @@ -306,10 +322,10 @@ public class NowDataController { @SysLogger(title = "压力变化表", optDesc = "压力变化查询") @PostMapping("/waterPressure") public HttpResult queryWaterPressure(@RequestParam(value = "buildingID") String buildingID, - @RequestParam(value = "curDate") String curDate, - @RequestParam(value = "level", defaultValue = "0") int level, - @RequestParam(value = "page") int page, - @RequestParam(value = "limit") int limit) { + @RequestParam(value = "curDate") String curDate, + @RequestParam(value = "level", defaultValue = "0") int level, + @RequestParam(value = "page") int page, + @RequestParam(value = "limit") int limit) { try { List list; int count; @@ -323,7 +339,7 @@ public class NowDataController { } return HttpResult.ok(count, list); } catch (Exception e) { - return HttpResult.error("查询出错!"+e.getMessage()); + return HttpResult.error("查询出错!" + e.getMessage()); } } diff --git a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java b/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java index 5f9e8a9..d5d774b 100644 --- a/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java +++ b/user-service/src/main/java/com/mh/user/job/CollectionLoopRunner.java @@ -67,10 +67,10 @@ public class CollectionLoopRunner implements ApplicationRunner { // 获取天气数据 getWeatherInfoJob.getWeatherInfo(); // 启动netty端口 - NettyEchoServer nettyEchoServer = new NettyEchoServer(); - nettyEchoServer.bind(8098); +// NettyEchoServer nettyEchoServer = new NettyEchoServer(); +// nettyEchoServer.bind(8098); // 初始化mqtt订阅记录 -// initializeMqttSubscription(); + initializeMqttSubscription(); } /** diff --git a/user-service/src/main/java/com/mh/user/job/DealDataJob.java b/user-service/src/main/java/com/mh/user/job/DealDataJob.java index e1547b3..37e5479 100644 --- a/user-service/src/main/java/com/mh/user/job/DealDataJob.java +++ b/user-service/src/main/java/com/mh/user/job/DealDataJob.java @@ -73,7 +73,7 @@ public class DealDataJob { /** * 采集 */ - @Scheduled(cron = "35 0/2 * * * ?") +// @Scheduled(cron = "35 0/2 * * * ?") // @Scheduled(cron = "0 0/1 * * * ?") // @Scheduled(cron = "0 0/5 * * * ?") //5分钟 public void collect() { diff --git a/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java b/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java index 1d4ad40..a13f092 100644 --- a/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/HeatPumpStrategy.java @@ -704,10 +704,12 @@ public class HeatPumpStrategy implements DeviceStrategy { } else {//2 sValue = "不运行"; //制冷 } - } else if (paramTypeId == 7 || paramTypeId == 10) { + } else if (paramTypeId == 7 || paramTypeId == 10 || (paramTypeId == 12 && "回水温度".equals(collectionParamsManageEntity.getOtherName()))) { //7设定温度,10水箱水温 //7设定温度,10水箱水温 if (paramTypeId == 7) { dataType = "tempSet"; + } else if (paramTypeId == 12) { + dataType = "waterTemp"; } else { dataType = "waterTemp"; } @@ -718,7 +720,9 @@ public class HeatPumpStrategy implements DeviceStrategy { NowPublicDataEntity publicData = new NowPublicDataEntity(); publicData.setBuildingId(deviceInstallEntity.getBuildingId()); publicData.setUseWaterTemp(avgTemp); - publicData.setBackWaterTemp(avgTemp); + if ("回水温度".equals(collectionParamsManageEntity.getOtherName()) && paramTypeId == 12) { + publicData.setBackWaterTemp(sValue); + } String pumpId = nowDataService.selectMinPumpId(deviceInstallEntity.getBuildingId()); // 如果是华夏，则取新增得字段标识为热泵ID String name = dealDataService.customName(); diff --git a/user-service/src/main/java/com/mh/user/strategy/SystemParamsStrategy.java b/user-service/src/main/java/com/mh/user/strategy/SystemParamsStrategy.java index 443022f..b9a57d2 100644 --- a/user-service/src/main/java/com/mh/user/strategy/SystemParamsStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/SystemParamsStrategy.java @@ -14,6 +14,7 @@ import lombok.extern.slf4j.Slf4j; import org.springframework.context.ApplicationContext; import java.math.BigDecimal; +import java.math.RoundingMode; /** * @author LJF @@ -78,6 +79,12 @@ public class SystemParamsStrategy implements DeviceStrategy { collectionParamsManageEntity.getOtherName(), dataStr);//保存时间点温度 log.info("系统参数id：" + deviceInstallEntity.getDeviceAddr() + ",压力值：" + dataStr + ",保存数据库成功！楼栋名称：" + deviceInstallEntity.getBuildingName()); + } else if (collectionParamsManageEntity.getParamTypeId() == 12) { + // 回水温度 + NowPublicDataEntity publicData = new NowPublicDataEntity(); + publicData.setBackWaterTemp(new BigDecimal(dataStr).setScale(1, RoundingMode.HALF_UP).toString()); + publicData.setBuildingId(deviceInstallEntity.getBuildingId()); + nowDataService.updateNowPublicData(publicData); } return dataStr; } else {// 写 diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml index 0726e50..f7d599c 100644 --- a/user-service/src/main/resources/application-prod.yml +++ b/user-service/src/main/resources/application-prod.yml @@ -81,16 +81,16 @@ spring: # password: Mhtech@803 # # 珠海北师大 - url: jdbc:sqlserver://127.0.0.1:8033;DatabaseName=chws_bsdz;allowMultiQueries=true;encrypt=false - driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver - username: chws_bsdz - password: Mhtech@803803 +# url: jdbc:sqlserver://127.0.0.1:8033;DatabaseName=chws_bsdz;allowMultiQueries=true;encrypt=false +# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver +# username: chws_bsdz +# password: Mhtech@803803 #南方学院 -# url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false -# driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver -# username: chws_nfxy -# password: minghan@123456 + url: jdbc:sqlserver://175.178.153.91:8033;DatabaseName=chws_nfxy;allowMultiQueries=true;encrypt=false + driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver + username: chws_nfxy + password: minghan@123456 filters: stat,wall,config max-active: 100