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 ServiceImpli.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()){