diff --git a/user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java b/user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java index 786b021..0b49f4f 100644 --- a/user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java +++ b/user-service/src/main/java/com/mh/user/service/chillers/impl/ChillersServiceImpl.java @@ -316,6 +316,7 @@ public class ChillersServiceImpl implements ChillersService { if (proId != null && !proId.equalsIgnoreCase("")) { deviceQueryWrapper.eq("project_id", proId); } + deviceQueryWrapper.eq("device_type", 0); List devicesManageEntityList = devicesManageMapper.selectList(deviceQueryWrapper.orderByAsc("id")); if (devicesManageEntityList != null && !devicesManageEntityList.isEmpty()) { HostListVO hostListVO = new HostListVO(); diff --git a/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java b/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java index 76b2e46..81fe843 100644 --- a/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java +++ b/user-service/src/main/java/com/mh/user/utils/AnalysisReceiveOrder485.java @@ -46,7 +46,7 @@ public class AnalysisReceiveOrder485 { //解析冷量表 public void analysisCloudOrder485(final String dataStr1, final DeviceCodeParamEntity deviceCodeParam) { -// threadPoolService.execute(() -> { + threadPoolService.execute(() -> { // 去掉空格 String dataStr = dataStr1.replace(" ", "").toUpperCase(); // 检验报文 @@ -124,7 +124,7 @@ public class AnalysisReceiveOrder485 { } else { log.info("冷量计校验失败===>" + dataStr); } -// }); + }); } public String analysisCloudQueue(QueueParam queueParam) {