diff --git a/user-service/src/main/java/com/mh/user/strategy/PressureTransStrategy.java b/user-service/src/main/java/com/mh/user/strategy/PressureTransStrategy.java index 85f11b8..fdffa4b 100644 --- a/user-service/src/main/java/com/mh/user/strategy/PressureTransStrategy.java +++ b/user-service/src/main/java/com/mh/user/strategy/PressureTransStrategy.java @@ -55,7 +55,7 @@ public class PressureTransStrategy implements DeviceStrategy { } else if (Constant.BRAND_RU_YI.equals(brand)) { str = str + "0300040001"; } else if (Constant.BRAND_MEI_YI.equals(brand)) { - str = str + "0304040002"; // 压力输出值 + str = str + "0300040001"; // 压力输出值 } else { str = str + "0300000002"; // 压力变送器(新的协议) } @@ -88,8 +88,9 @@ public class PressureTransStrategy implements DeviceStrategy { data = ExchangeStringUtil.hexToDec(checkStr.substring(6, 10));//十六进制转整形 wtHeight = Double.parseDouble(data) / 100 * 0.102; //通过压力求水高 } else if (Constant.BRAND_MEI_YI.equals(brand)) { - data = ExchangeStringUtil.hexToDec(checkStr.substring(6, 14));//十六进制转整形 - wtHeight = Double.parseDouble(data); + // 14030206D637B9 + data = ExchangeStringUtil.hexToDec(checkStr.substring(6, 10));//十六进制转整形 + wtHeight = Double.parseDouble(data) / 100 * 0.102; //通过压力求水高 } Double tankHeight; // 默认是高区域