diff --git a/user-service/src/main/java/com/mh/user/constants/Constant.java b/user-service/src/main/java/com/mh/user/constants/Constant.java index 3ba79f5..669f589 100644 --- a/user-service/src/main/java/com/mh/user/constants/Constant.java +++ b/user-service/src/main/java/com/mh/user/constants/Constant.java @@ -47,6 +47,18 @@ public class Constant { // 压力值 public static String PRE = "0012"; + // 累积热量 + public static String TOTAL_HOT_YILUO = "0016"; + + // 瞬时热量 + public static String MOMENT_HOT_YILUO = "0002"; + + // 进水温度值 + public static String INT_TEMP_YILUO = "0032"; + + // 出水温度值 + public static String OUT_TEMP_YILUO = "0034"; + // 项目图片存储路径 public static String PROJECT_IMG_PATH = "\\images\\"; diff --git a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java index a271a0b..b409930 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java @@ -328,9 +328,9 @@ public class DataResultServiceImpl implements DataResultService { outTempStr = Constant.TEMP; intTempStr = Constant.PRE; } else if (isHotCollection == 1 && projectId.equals("34")) { - momentCoolingStr = "0003"; - outTempStr = "0035"; - intTempStr = "0033"; + momentCoolingStr = Constant.MOMENT_HOT_YILUO; + outTempStr = Constant.OUT_TEMP_YILUO; + intTempStr = Constant.INT_TEMP_YILUO; } // 查询温度低的冷量计 String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr); diff --git a/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java b/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java index 9a174dc..824b4e4 100644 --- a/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java @@ -25,6 +25,7 @@ import org.springframework.stereotype.Service; import java.util.*; import java.util.stream.Collectors; +import static com.mh.user.constants.Constant.TOTAL_HOT_YILUO; import static java.util.stream.Collectors.toList; /** @@ -144,11 +145,11 @@ public class MeterManageServiceImpl implements MeterManageService { } else if (projectType == 1) { if (projectId == 34L) { // 1:热量计,瞬时热量,进出水温度 - if ("0003".equalsIgnoreCase(meter.getRegisterAddr())) { + if (Constant.MOMENT_HOT_YILUO.equalsIgnoreCase(meter.getRegisterAddr())) { dto.setMomentCooling(formatValue(meter.getCurValue())); - } else if ("0033".equalsIgnoreCase(meter.getRegisterAddr())) { + } else if (Constant.INT_TEMP_YILUO.equalsIgnoreCase(meter.getRegisterAddr())) { dto.setOutTemp(formatValue(meter.getCurValue())); - } else if ("0035".equalsIgnoreCase(meter.getRegisterAddr())) { + } else if (Constant.OUT_TEMP_YILUO.equalsIgnoreCase(meter.getRegisterAddr())) { dto.setIntTemp(formatValue(meter.getCurValue())); } } else { @@ -300,7 +301,7 @@ public class MeterManageServiceImpl implements MeterManageService { } else if (meterManageMapper.queryIsHotCollection(systemId, projectId, "0002", Constant.FLOW_METER) > 0 || projectId.equals("20")) { // 判断是否包含蒸汽流量计 return 2; - } else if (meterManageMapper.queryIsHotCollection(systemId, projectId, "0017", Constant.COOLING_METER) > 0 || projectId.equals("34")) { + } else if (meterManageMapper.queryIsHotCollection(systemId, projectId, TOTAL_HOT_YILUO, Constant.COOLING_METER) > 0 || projectId.equals("34")) { // 判断是否依跞流量计 return 1; } else { diff --git a/user-service/src/main/resources/application-prod.yml b/user-service/src/main/resources/application-prod.yml index b2aa58a..1b0e7b4 100644 --- a/user-service/src/main/resources/application-prod.yml +++ b/user-service/src/main/resources/application-prod.yml @@ -5,7 +5,8 @@ spring: name: jnd-user-service datasource: #添加allowMultiQueries=true 在批量更新时才不会出错 - url: jdbc:sqlserver://127.0.0.1:32012;DatabaseName=mh_jnd2;allowMultiQueries=true +# url: jdbc:sqlserver://127.0.0.1:32012;DatabaseName=mh_jnd2;allowMultiQueries=true + url: jdbc:sqlserver://111.230.50.186:32012;DatabaseName=mh_jnd2;allowMultiQueries=true driver-class-name: com.microsoft.sqlserver.jdbc.SQLServerDriver username: jnd password: Mh@803tech diff --git a/user-service/src/test/java/com/mh/user/UserServiceApplicationTests.java b/user-service/src/test/java/com/mh/user/UserServiceApplicationTests.java index 48ad4e5..3356d29 100644 --- a/user-service/src/test/java/com/mh/user/UserServiceApplicationTests.java +++ b/user-service/src/test/java/com/mh/user/UserServiceApplicationTests.java @@ -3,6 +3,7 @@ package com.mh.user; import com.mh.user.entity.DeviceManageEntity; import com.mh.user.entity.GaugeEntity; import com.mh.user.job.PushDataToAIJob; +import com.mh.user.service.DataResultService; import com.mh.user.service.chillers.DealDataService; import com.mh.user.service.chillers.DeviceManageService; import com.mh.user.service.chillers.GaugeService; @@ -29,6 +30,14 @@ class UserServiceApplicationTests { @Autowired private PushDataToAIJob pushDataToAIJob; + @Autowired + private DataResultService dataResultService; + + @Test + public void testQueryFiveData() { + dataResultService.queryDataResultMiData("34","2026-07-16 15:57",1,10000,0, "8小时"); + } + @Test public void testPushAi() { pushDataToAIJob.pushDataToAIJob();