1、设备监控修复。

mh-admin/src/main/resources/application-dev.yml

@@ -98,7 +98,7 @@ spring:
       # 主库数据源
       master:
         #添加allowMultiQueries=true 在批量更新时才不会出错
-        url: jdbc:postgresql://127.0.0.1:5432/eemcs
+        url: jdbc:postgresql://127.0.0.1:5432/eemcs_hw
         username: postgres
         password: mh@803
       # 从库数据源

mh-admin/src/main/resources/application-druid.yml

@@ -7,7 +7,7 @@ spring:
             # 主库数据源
             master:
                 #添加allowMultiQueries=true 在批量更新时才不会出错
-                url: jdbc:postgresql://127.0.0.1:5432/eemcs
+                url: jdbc:postgresql://127.0.0.1:5432/eemcs_hw
                 username: postgres
                 password: mh@803
             # 从库数据源

mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java

@@ -42,7 +42,7 @@ public class CollectionParamsManageVO {
     /**
      * 采集参数排序
      */
-    private int cmpOrderNum;
+    private int cpmOrderNum;
 
     @Override
     public String toString() {
@@ -56,7 +56,7 @@ public class CollectionParamsManageVO {
                 .append("curTime", curTime)
                 .append("paramType", paramType)
                 .append("dlOrderNum", dlOrderNum)
-                .append("cmpOrderNum", cmpOrderNum)
+                .append("cpmOrderNum", cpmOrderNum)
                 .toString();
     }
 }

mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java

@@ -236,6 +236,7 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
                         deviceMonitorVO.setCollectTime(param.getCurTime());
                         deviceMonitorVO.setCollectValue(String.valueOf(param.getCurValue()));
                         deviceMonitorVO.setParamType(param.getParamType());
+                        deviceMonitorVO.setOrderNum(param.getCpmOrderNum());
                     }
                     return deviceMonitorVO;
                 })
@@ -297,7 +298,7 @@ public class CollectionParamsManageServiceImpl implements ICollectionParamsManag
                         child.setValue(String.valueOf(param.getCurValue()));
                         child.setTime(param.getCurTime());
                         child.setParamType(param.getParamType());
-                        child.setOrderNum(param.getCmpOrderNum());
+                        child.setOrderNum(param.getCpmOrderNum());
                         return child;
                     })
                     .sorted(Comparator.comparing(DeviceOperateMonitorVO::getOrderNum))