fix(service): 修复设备消息服务中的监测点空值处理
- 注释掉CsDataSetServiceImpl中多余的数据类型过滤条件 - 移除DeviceMessageServiceImpl中未使用的BusinessException导入 - 为DeviceMessageServiceImpl添加Slf4j日志注解 - 修改监测点为空时的异常抛出逻辑为日志记录并返回 - 避免因监测点为空导致的服务异常中断
This commit is contained in:
@@ -38,7 +38,7 @@ public class CsDataSetServiceImpl extends ServiceImpl<CsDataSetMapper, CsDataSet
|
|||||||
.eq(CsDataSet::getPid,modelId)
|
.eq(CsDataSet::getPid,modelId)
|
||||||
.in(CsDataSet::getType, Arrays.asList(0,2))
|
.in(CsDataSet::getType, Arrays.asList(0,2))
|
||||||
.eq(CsDataSet::getStoreFlag,1)
|
.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)
|
.orderByAsc(CsDataSet::getIdx)
|
||||||
.list();
|
.list();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
package com.njcn.csdevice.service.impl;
|
package com.njcn.csdevice.service.impl;
|
||||||
|
|
||||||
import cn.hutool.core.collection.CollectionUtil;
|
import cn.hutool.core.collection.CollectionUtil;
|
||||||
import com.njcn.common.pojo.exception.BusinessException;
|
|
||||||
import com.njcn.csdevice.api.CsDeviceUserFeignClient;
|
import com.njcn.csdevice.api.CsDeviceUserFeignClient;
|
||||||
import com.njcn.csdevice.param.DeviceMessageParam;
|
import com.njcn.csdevice.param.DeviceMessageParam;
|
||||||
import com.njcn.csdevice.pojo.po.CsLinePO;
|
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.User;
|
||||||
import com.njcn.user.pojo.po.app.AppInfoSet;
|
import com.njcn.user.pojo.po.app.AppInfoSet;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
|
|
||||||
import java.util.*;
|
import java.util.*;
|
||||||
@@ -25,6 +25,7 @@ import java.util.stream.Collectors;
|
|||||||
|
|
||||||
@Service
|
@Service
|
||||||
@RequiredArgsConstructor
|
@RequiredArgsConstructor
|
||||||
|
@Slf4j
|
||||||
class DeviceMessageServiceImpl implements DeviceMessageService {
|
class DeviceMessageServiceImpl implements DeviceMessageService {
|
||||||
|
|
||||||
private final AppUserFeignClient appUserFeignClient;
|
private final AppUserFeignClient appUserFeignClient;
|
||||||
@@ -95,7 +96,8 @@ class DeviceMessageServiceImpl implements DeviceMessageService {
|
|||||||
lineList = csLinePOService.findByNdid(id);
|
lineList = csLinePOService.findByNdid(id);
|
||||||
}
|
}
|
||||||
if (CollectionUtil.isEmpty(lineList)){
|
if (CollectionUtil.isEmpty(lineList)){
|
||||||
throw new BusinessException("监测点为空");
|
log.error("监测点为空");
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
for (CsLinePO item : lineList) {
|
for (CsLinePO item : lineList) {
|
||||||
if (Objects.isNull(item.getPosition()) || item.getPosition().isEmpty()){
|
if (Objects.isNull(item.getPosition()) || item.getPosition().isEmpty()){
|
||||||
|
|||||||
Reference in New Issue
Block a user