1、修改主机参数展示；

user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java

@@ -375,6 +375,7 @@ public class ChillersServiceImpl implements ChillersService {
         for (MeterManageEntity meterManageEntity : meterManageEntities) {
             // 匹配HostListVO展示给前端
             String funCode = ExchangeStringUtil.addZeroForNum(meterManageEntity.getFuncCode(), 2);
+            Long meterType = meterManageEntity.getMtType();
 
             String curValue = new BigDecimal(String.valueOf(meterManageEntity.getCurValue() == null ? 0.00 : meterManageEntity.getCurValue())).setScale(1, RoundingMode.HALF_UP).toString();
             switch (meterManageEntity.getRegisterAddr()) {
@@ -398,8 +399,8 @@ public class ChillersServiceImpl implements ChillersService {
                         hostListVO.setEvapEnteringChWTemp(curValue);
                     }
                     break;
-                case "0015":
+                case "0021":
-                    if (funCode.equals("03")) {
+                    if (funCode.equals("03") && meterType == 0) {
                         hostListVO.setEvapApproach(curValue);
                     }
                     break;
@@ -414,7 +415,7 @@ public class ChillersServiceImpl implements ChillersService {
                     }
                     break;
                 case "0023":
-                    if (funCode.equals("03")) {
+                    if (funCode.equals("03") && meterType == 0) {
                         hostListVO.setCondApproach(curValue);
                     }
                     break;
@@ -429,14 +430,17 @@ public class ChillersServiceImpl implements ChillersService {
                     }
                     break;
                 case "0014":
-                    if (funCode.equals("03")) {
+                    if (funCode.equals("03") && meterType == 0) {
                         hostListVO.setRealTimeCop(curValue);
                     }
                     break;
                 case "0122":
                     if (funCode.equals("03")) {
-                        hostListVO.setRealTimeWarning(curValue);
+                        BigDecimal warn = new BigDecimal(curValue);
-                        hostListVO.setRealTimeFault(curValue);
+                        String warnStr = warn.compareTo(BigDecimal.ZERO) > 0 ? "主机报警" : "无报警";
+                        String faultStr = warn.compareTo(BigDecimal.ZERO) > 0 ? "主机故障" : "无故障";
+                        hostListVO.setRealTimeWarning(warnStr);
+                        hostListVO.setRealTimeFault(faultStr);
                     }
                     break;
                 default: