diff --git a/mh-admin/src/main/resources/application-dev.yml b/mh-admin/src/main/resources/application-dev.yml index c9f729d..32329be 100644 --- a/mh-admin/src/main/resources/application-dev.yml +++ b/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 # 从库数据源 diff --git a/mh-admin/src/main/resources/application-druid.yml b/mh-admin/src/main/resources/application-druid.yml index 40af773..ed7a72c 100644 --- a/mh-admin/src/main/resources/application-druid.yml +++ b/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 # 从库数据源 diff --git a/mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java b/mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java index ff5b115..9730235 100644 --- a/mh-common/src/main/java/com/mh/common/core/domain/vo/CollectionParamsManageVO.java +++ b/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(); } } diff --git a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java b/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java index 6988fed..1afd39d 100644 --- a/mh-system/src/main/java/com/mh/system/service/device/impl/CollectionParamsManageServiceImpl.java +++ b/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))