|
@@ -39,6 +39,7 @@ import vip.xiaonuo.coldchain.modular.monitortargetregion.param.MonitorTargetRegi
|
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.param.MonitorTargetRegionIdParam;
|
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.param.MonitorTargetRegionPageParam;
|
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
|
|
|
+import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
|
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
|
import vip.xiaonuo.common.page.CommonPageRequest;
|
|
@@ -80,6 +81,7 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
|
|
|
} else {
|
|
|
queryWrapper.lambda().orderByAsc(MonitorTargetRegion::getId);
|
|
|
}
|
|
|
+ queryWrapper.lambda().eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
Page<MonitorTargetRegion> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
for (MonitorTargetRegion monitorTargetRegion : page.getRecords()) {
|
|
|
String targetId = monitorTargetService.getById(monitorTargetRegion.getMonitorTargetId()).getName();
|
|
@@ -151,8 +153,16 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
|
|
|
@Override
|
|
|
public List<MonitorTargetRegion> getRegionListByTargetId(String targetId) {
|
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<MonitorTargetRegion>();
|
|
|
- queryWrapper.eq(MonitorTargetRegion::getMonitorTargetId, targetId);
|
|
|
- return list(queryWrapper);
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getMonitorTargetId, targetId).eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);;
|
|
|
+ List<MonitorTargetRegion> list = list(queryWrapper);
|
|
|
+ for (MonitorTargetRegion monitorTargetRegion : list) {
|
|
|
+ MonitorDevice monitorDevice = monitorDeviceService.getById(monitorTargetRegion.getMonitorDeviceId());
|
|
|
+ if (ObjectUtil.isNull(monitorDevice)) {
|
|
|
+ throw new CommonException("找不到监控设备,请检查监控对象是否有误");
|
|
|
+ }
|
|
|
+ monitorTargetRegion.setDeviceName(monitorDevice.getDeviceName());
|
|
|
+ }
|
|
|
+ return list;
|
|
|
}
|
|
|
|
|
|
@Override
|
|
@@ -183,7 +193,7 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
|
|
|
@Override
|
|
|
public List<String> getTargetIdListByDeviceId(String deviceCode) {
|
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(MonitorTargetRegion::getDeviceCode,deviceCode);
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getDeviceCode,deviceCode).eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);;
|
|
|
List<String> targetIdList = new ArrayList<>();
|
|
|
for (MonitorTargetRegion monitorTargetRegion : list(queryWrapper)) {
|
|
|
targetIdList.add(monitorTargetRegion.getMonitorTargetId());
|
|
@@ -194,14 +204,15 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
|
|
|
@Override
|
|
|
public List<MonitorTargetRegion> listByTargetId(String targetId) {
|
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(MonitorTargetRegion::getMonitorTargetId, targetId);
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getMonitorTargetId, targetId).eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);;
|
|
|
return list(queryWrapper);
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
public MonitorTargetRegion findOneByDeviceCodeAndSensorNo(String deviceCode, Integer sensorNo) {
|
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
- queryWrapper.eq(MonitorTargetRegion::getDeviceCode, deviceCode).eq(MonitorTargetRegion::getSensorRoute,sensorNo);
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getDeviceCode, deviceCode).eq(MonitorTargetRegion::getSensorRoute,sensorNo)
|
|
|
+ .eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);;
|
|
|
return getOne(queryWrapper);
|
|
|
}
|
|
|
|
|
@@ -216,9 +227,20 @@ public class MonitorTargetRegionServiceImpl extends ServiceImpl<MonitorTargetReg
|
|
|
if (deviceId != null) {
|
|
|
queryWrapper.eq(MonitorTargetRegion::getMonitorDeviceId, deviceId);
|
|
|
}
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
return list(queryWrapper);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public List<String> listByDeviceCodeByTargetId(String targetId) {
|
|
|
+ LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getMonitorTargetId, targetId).eq(MonitorTargetRegion::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
+ List<MonitorTargetRegion> list = list(queryWrapper);
|
|
|
+ List<String> codeList = new ArrayList<>();
|
|
|
+ list.forEach(code -> codeList.add(code.getDeviceCode()));
|
|
|
+ return codeList;
|
|
|
+ }
|
|
|
+
|
|
|
private void fillParentLocationInfo(List<MonitorTargetRegion> resourceList) {
|
|
|
if (CollUtil.isNotEmpty(resourceList)) {
|
|
|
List<MonitorTargetRegion> locationTypes = resourceList.stream().filter(distinctByKey(MonitorTargetRegion::getParentId)).collect(Collectors.toList());
|