From 94929e66d58d2898199b2fe63ccd91903a5e2179 Mon Sep 17 00:00:00 2001
From: xy <748613696@qq.com>
Date: Tue, 26 May 2026 10:53:38 +0800
Subject: [PATCH] =?UTF-8?q?fix(service):=20=E4=BF=AE=E5=A4=8D=E8=AE=BE?=
 =?UTF-8?q?=E5=A4=87=E6=B6=88=E6=81=AF=E6=9C=8D=E5=8A=A1=E4=B8=AD=E7=9A=84?=
 =?UTF-8?q?=E7=9B=91=E6=B5=8B=E7=82=B9=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 注释掉CsDataSetServiceImpl中多余的数据类型过滤条件
- 移除DeviceMessageServiceImpl中未使用的BusinessException导入
- 为DeviceMessageServiceImpl添加Slf4j日志注解
- 修改监测点为空时的异常抛出逻辑为日志记录并返回
- 避免因监测点为空导致的服务异常中断
---
 .../njcn/csdevice/service/impl/CsDataSetServiceImpl.java    | 2 +-
 .../csdevice/service/impl/DeviceMessageServiceImpl.java     | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
index 463999f..58b13d5 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsDataSetServiceImpl.java
@@ -38,7 +38,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
                 .eq(CsDataSet::getPid,modelId)
                 .in(CsDataSet::getType, Arrays.asList(0,2))
                 .eq(CsDataSet::getStoreFlag,1)
-                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
+//                .and(i->i.eq(CsDataSet::getDataType,"Stat").or().isNull(CsDataSet::getDataType))
                 .orderByAsc(CsDataSet::getIdx)
                 .list();
     }
diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java
index dc21b98..795f2eb 100644
--- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java
+++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/DeviceMessageServiceImpl.java
@@ -1,7 +1,6 @@
 package com.njcn.csdevice.service.impl;
 
 import cn.hutool.core.collection.CollectionUtil;
-import com.njcn.common.pojo.exception.BusinessException;
 import com.njcn.csdevice.api.CsDeviceUserFeignClient;
 import com.njcn.csdevice.param.DeviceMessageParam;
 import com.njcn.csdevice.pojo.po.CsLinePO;
@@ -18,6 +17,7 @@ import com.njcn.user.api.UserFeignClient;
 import com.njcn.user.pojo.po.User;
 import com.njcn.user.pojo.po.app.AppInfoSet;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
 
 @Service
 @RequiredArgsConstructor
+@Slf4j
 class DeviceMessageServiceImpl implements DeviceMessageService {
 
     private final AppUserFeignClient appUserFeignClient;
@@ -95,7 +96,8 @@ class DeviceMessageServiceImpl implements DeviceMessageService {
             lineList = csLinePOService.findByNdid(id);
         }
         if (CollectionUtil.isEmpty(lineList)){
-            throw new BusinessException("监测点为空");
+            log.error("监测点为空");
+            return;
         }
         for (CsLinePO item : lineList) {
             if (Objects.isNull(item.getPosition()) || item.getPosition().isEmpty()){