From bfb802a739cecfe289eef5aa2c0dda9b89998b6b Mon Sep 17 00:00:00 2001
From: mh <ljf25604@163.com>
Date: Fri, 30 Aug 2024 13:53:36 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E4=B8=BB=E6=9C=BA=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0=E8=BF=87=E6=BB=A4=E6=9D=A1=E4=BB=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mh/user/service/chillers/impl/ChillersServiceImpl.java    | 1 +
 .../main/java/com/mh/user/utils/AnalysisReceiveOrder485.java  | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

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<DevicesManageEntity> 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) {