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 669f589..3dce9e6 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 @@ -62,4 +62,13 @@ public class Constant { // 项目图片存储路径 public static String PROJECT_IMG_PATH = "\\images\\"; + // 瞬时冷量 + public static String MOMENT_HOT_YILUO_1 = "4176"; + + // 进水温度值 + public static String INT_TEMP_YILUO_1 = "4182"; + + // 出水温度值 + public static String OUT_TEMP_YILUO_1 = "4184"; + } 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 b409930..1b60a6c 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 @@ -331,6 +331,10 @@ public class DataResultServiceImpl implements DataResultService { momentCoolingStr = Constant.MOMENT_HOT_YILUO; outTempStr = Constant.OUT_TEMP_YILUO; intTempStr = Constant.INT_TEMP_YILUO; + } else if (projectId.equals("35")) { + momentCoolingStr = Constant.MOMENT_HOT_YILUO_1; + outTempStr = Constant.OUT_TEMP_YILUO_1; + intTempStr = Constant.INT_TEMP_YILUO_1; } // 查询温度低的冷量计 String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr); diff --git a/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java b/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java index 813b3e9..c21e022 100644 --- a/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java @@ -93,7 +93,7 @@ public class ModbusProtocolStrategy implements ProtocolStrategy { int dataLengthInt = Integer.parseInt(dataLength, 16); // 截取数据域 String data = receiveData; - if ("2".equals(deviceCodeParamEntity.getDeviceType())) { + if ("2".equals(deviceCodeParamEntity.getDeviceType()) && !"35".equals(deviceCodeParamEntity.getProjectId())) { data = data.substring(data.length() - 8, data.length() - 6) + data.substring(data.length() - 6, data.length() - 4) + data.substring(data.length() - 12, data.length() - 10)