|
@@ -35,6 +35,7 @@ import vip.xiaonuo.coldchain.modular.monitortarget.param.*;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.service.MonitorTargetService;
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.entity.MonitorTargetRegion;
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
|
|
import vip.xiaonuo.coldchain.modular.monitortargetregion.service.MonitorTargetRegionService;
|
|
|
|
+import vip.xiaonuo.coldchain.modular.targetroom.service.TargetRoomService;
|
|
import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
|
|
import vip.xiaonuo.common.enums.CommonDeleteFlagEnum;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.enums.CommonSortOrderEnum;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
import vip.xiaonuo.common.exception.CommonException;
|
|
@@ -59,9 +60,37 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
private MonitorDeviceService monitorDeviceService;
|
|
private MonitorDeviceService monitorDeviceService;
|
|
@Resource
|
|
@Resource
|
|
private MonitorTargetMapper monitorTargetMapper;
|
|
private MonitorTargetMapper monitorTargetMapper;
|
|
|
|
+ @Resource
|
|
|
|
+ private TargetRoomService targetRoomService;
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public Page<MonitorTarget> page(MonitorTargetPageParam monitorTargetPageParam) {
|
|
public Page<MonitorTarget> page(MonitorTargetPageParam monitorTargetPageParam) {
|
|
|
|
+ SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
|
|
+ QueryWrapper<MonitorTarget> queryWrapper = new QueryWrapper<MonitorTarget>().checkSqlInjection();
|
|
|
|
+ if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
|
|
|
|
+ queryWrapper.lambda().like(MonitorTarget::getName, monitorTargetPageParam.getName());
|
|
|
|
+ }
|
|
|
|
+ if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getRoomId())) {
|
|
|
|
+ queryWrapper.lambda().eq(MonitorTarget::getRoomId, monitorTargetPageParam.getRoomId());
|
|
|
|
+ }
|
|
|
|
+ if (ObjectUtil.isAllNotEmpty(monitorTargetPageParam.getSortField(), monitorTargetPageParam.getSortOrder())) {
|
|
|
|
+ CommonSortOrderEnum.validate(monitorTargetPageParam.getSortOrder());
|
|
|
|
+ queryWrapper.orderBy(true, monitorTargetPageParam.getSortOrder().equals(CommonSortOrderEnum.ASC.getValue()), StrUtil.toUnderlineCase(monitorTargetPageParam.getSortField()));
|
|
|
|
+ } else {
|
|
|
|
+ queryWrapper.lambda().orderByAsc(MonitorTarget::getId);
|
|
|
|
+ }
|
|
|
|
+ queryWrapper.lambda().eq(MonitorTarget::getCreateOrg, loginUser.getOrgId()).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
|
+ Page<MonitorTarget> page = this.page(CommonPageRequest.defaultPage(), queryWrapper);
|
|
|
|
+ //获取设备区域列表并赋值返回
|
|
|
|
+ page.getRecords().forEach(monitorTarget -> {
|
|
|
|
+ monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
|
|
+ monitorTarget.setCreateOrgName(loginUser.getOrgName());
|
|
|
|
+ });
|
|
|
|
+ return page;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Override
|
|
|
|
+ public Page<MonitorTarget> pageWithRoom(MonitorTargetPageParam monitorTargetPageParam) {
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
QueryWrapper<MonitorTarget> queryWrapper = new QueryWrapper<MonitorTarget>().checkSqlInjection();
|
|
QueryWrapper<MonitorTarget> queryWrapper = new QueryWrapper<MonitorTarget>().checkSqlInjection();
|
|
if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
|
|
if (ObjectUtil.isNotEmpty(monitorTargetPageParam.getName())) {
|
|
@@ -79,6 +108,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
page.getRecords().forEach(monitorTarget -> {
|
|
page.getRecords().forEach(monitorTarget -> {
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
monitorTarget.setCreateOrgName(loginUser.getOrgName());
|
|
monitorTarget.setCreateOrgName(loginUser.getOrgName());
|
|
|
|
+ monitorTarget.setRoomName(targetRoomService.queryEntity(monitorTarget.getRoomId()).getName());
|
|
});
|
|
});
|
|
return page;
|
|
return page;
|
|
}
|
|
}
|
|
@@ -98,6 +128,21 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
this.updateById(monitorTarget);
|
|
this.updateById(monitorTarget);
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Override
|
|
|
|
+ public void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam) {
|
|
|
|
+ MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddWithRoomParam, MonitorTarget.class);
|
|
|
|
+ this.save(monitorTarget);
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ @Transactional(rollbackFor = Exception.class)
|
|
|
|
+ @Override
|
|
|
|
+ public void editWithRoom(MonitorTargetEditWithRoomParam monitorTargetEditWithRoomParam) {
|
|
|
|
+ MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditWithRoomParam.getId());
|
|
|
|
+ BeanUtil.copyProperties(monitorTargetEditWithRoomParam, monitorTarget);
|
|
|
|
+ this.updateById(monitorTarget);
|
|
|
|
+ }
|
|
|
|
+
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Override
|
|
@Override
|
|
public void delete(List<MonitorTargetIdParam> monitorTargetIdParamList) {
|
|
public void delete(List<MonitorTargetIdParam> monitorTargetIdParamList) {
|
|
@@ -167,6 +212,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
//获取设备区域列表并赋值返回
|
|
//获取设备区域列表并赋值返回
|
|
rlt.getRecords().forEach(monitorTarget -> {
|
|
rlt.getRecords().forEach(monitorTarget -> {
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
monitorTarget.setMonitorTargetRegionList(monitorTargetRegionService.getRegionListByTargetId(monitorTarget.getId()));
|
|
|
|
+ monitorTarget.setRoomName(targetRoomService.queryEntity(monitorTarget.getRoomId()).getName());
|
|
});
|
|
});
|
|
return rlt;
|
|
return rlt;
|
|
}
|
|
}
|