1、兼容依跞流量计热量输出，目前为了快，固定判断项目id

user-service/src/main/java/com/mh/user/service/impl/DataResultServiceImpl.java

@@ -327,6 +327,10 @@ public class DataResultServiceImpl implements DataResultService {
                     momentCoolingStr = Constant.MOMENT_HOT;
                     outTempStr = Constant.TEMP;
                     intTempStr = Constant.PRE;
+                } else if (isHotCollection == 1 && projectId.equals("34")) {
+                    momentCoolingStr = "0003";
+                    outTempStr = "0035";
+                    intTempStr = "0033";
                 }
                 // 查询温度低的冷量计
                 String registerAddr = meterManageMapper.selectRegisterAddr(projectId, intTempStr);

user-service/src/main/java/com/mh/user/service/impl/MeterManageServiceImpl.java

@@ -142,6 +142,16 @@ public class MeterManageServiceImpl implements MeterManageService {
                             dto.setIntTemp(formatValue(meter.getCurValue()));
                         }
                     } else if (projectType == 1) {
+                        if (projectId == 34L) {
+                            // 1：热量计，瞬时热量，进出水温度
+                            if ("0003".equalsIgnoreCase(meter.getRegisterAddr())) {
+                                dto.setMomentCooling(formatValue(meter.getCurValue()));
+                            } else if ("0033".equalsIgnoreCase(meter.getRegisterAddr())) {
+                                dto.setOutTemp(formatValue(meter.getCurValue()));
+                            } else if ("0035".equalsIgnoreCase(meter.getRegisterAddr())) {
+                                dto.setIntTemp(formatValue(meter.getCurValue()));
+                            }
+                        } else {
                             // 1：热量计，瞬时热量，进出水温度
                             if ("0020".equalsIgnoreCase(meter.getRegisterAddr())) {
                                 dto.setMomentCooling(formatValue(meter.getCurValue()));
@@ -150,6 +160,7 @@ public class MeterManageServiceImpl implements MeterManageService {
                             } else if ("0075".equalsIgnoreCase(meter.getRegisterAddr())) {
                                 dto.setIntTemp(formatValue(meter.getCurValue()));
                             }
+                        }
                     } else if (projectType == 2) {
                         // 2：蒸汽流量计，瞬时流量，压力温度
                         if ("0006".equalsIgnoreCase(meter.getRegisterAddr())) {
@@ -289,6 +300,9 @@ 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")) {
+            // 判断是否依跞流量计
+            return 1;
         } else {
             return 0;
         }