Browse Source

1、兼容晨鸣药业依跞冷量计输出,目前为了快,固定判断项目id

dev
3067418132@qq.com 1 day ago
parent
commit
04ce84fa92
  1. 9
      user-service/src/main/java/com/mh/user/constants/Constant.java
  2. 4
      user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java
  3. 2
      user-service/src/main/java/com/mh/user/strategy/ModbusProtocolStrategy.java

9
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 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";
} }

4
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; momentCoolingStr = Constant.MOMENT_HOT_YILUO;
outTempStr = Constant.OUT_TEMP_YILUO; outTempStr = Constant.OUT_TEMP_YILUO;
intTempStr = Constant.INT_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); String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr);

2
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); int dataLengthInt = Integer.parseInt(dataLength, 16);
// 截取数据域 // 截取数据域
String data = receiveData; 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 = data.substring(data.length() - 8, data.length() - 6)
+ data.substring(data.length() - 6, data.length() - 4) + data.substring(data.length() - 6, data.length() - 4)
+ data.substring(data.length() - 12, data.length() - 10) + data.substring(data.length() - 12, data.length() - 10)

Loading…
Cancel
Save