|
@@ -138,7 +138,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
public void add(MonitorTargetAddParam monitorTargetAddParam) {
|
|
public void add(MonitorTargetAddParam monitorTargetAddParam) {
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddParam, MonitorTarget.class);
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddParam, MonitorTarget.class);
|
|
this.save(monitorTarget);
|
|
this.save(monitorTarget);
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -164,7 +164,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
@Override
|
|
@Override
|
|
public List<MonitorTarget> getTargetListByRoom(String roomId) {
|
|
public List<MonitorTarget> getTargetListByRoom(String roomId) {
|
|
LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<MonitorTarget> queryWrapper = new LambdaQueryWrapper<>();
|
|
- queryWrapper.eq(MonitorTarget::getRoomId,roomId).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
|
|
|
+ queryWrapper.eq(MonitorTarget::getRoomId, roomId).eq(MonitorTarget::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
return list(queryWrapper);
|
|
return list(queryWrapper);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -173,7 +173,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
public void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam) {
|
|
public void addWithRoom(MonitorTargetAddWithRoomParam monitorTargetAddWithRoomParam) {
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddWithRoomParam, MonitorTarget.class);
|
|
MonitorTarget monitorTarget = BeanUtil.toBean(monitorTargetAddWithRoomParam, MonitorTarget.class);
|
|
this.save(monitorTarget);
|
|
this.save(monitorTarget);
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@Transactional(rollbackFor = Exception.class)
|
|
@@ -182,7 +182,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditWithRoomParam.getId());
|
|
MonitorTarget monitorTarget = this.queryEntity(monitorTargetEditWithRoomParam.getId());
|
|
BeanUtil.copyProperties(monitorTargetEditWithRoomParam, monitorTarget);
|
|
BeanUtil.copyProperties(monitorTargetEditWithRoomParam, monitorTarget);
|
|
this.updateById(monitorTarget);
|
|
this.updateById(monitorTarget);
|
|
-
|
|
|
|
|
|
+
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
@@ -199,6 +199,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
|
|
|
/**
|
|
/**
|
|
* 批量更新离线设备
|
|
* 批量更新离线设备
|
|
|
|
+ *
|
|
* @param allSensorCodes
|
|
* @param allSensorCodes
|
|
*/
|
|
*/
|
|
@Override
|
|
@Override
|
|
@@ -206,8 +207,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
// 构建查询建大仁科条件
|
|
// 构建查询建大仁科条件
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
LambdaQueryWrapper<MonitorTargetRegion> queryWrapper = new LambdaQueryWrapper<>();
|
|
queryWrapper.likeRight(MonitorTargetRegion::getModelName, "RS");
|
|
queryWrapper.likeRight(MonitorTargetRegion::getModelName, "RS");
|
|
- queryWrapper.in(MonitorTargetRegion::getSensorCode,allSensorCodes);
|
|
|
|
- queryWrapper.eq(MonitorTargetRegion::getDeleteFlag,CommonDeleteFlagEnum.NOT_DELETE);
|
|
|
|
|
|
+ queryWrapper.in(MonitorTargetRegion::getSensorCode, allSensorCodes);
|
|
|
|
+ queryWrapper.eq(MonitorTargetRegion::getDeleteFlag, CommonDeleteFlagEnum.NOT_DELETE);
|
|
List<MonitorTargetRegion> targetRegions = monitorTargetRegionService.list(queryWrapper);
|
|
List<MonitorTargetRegion> targetRegions = monitorTargetRegionService.list(queryWrapper);
|
|
Set<String> monitorTargetIds = targetRegions.stream()
|
|
Set<String> monitorTargetIds = targetRegions.stream()
|
|
.filter(monitorTargetRegion -> monitorTargetRegion.getDeviceCode() != null)
|
|
.filter(monitorTargetRegion -> monitorTargetRegion.getDeviceCode() != null)
|
|
@@ -239,7 +240,12 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
|
|
monitorTargetPageParam.setOrgId(StpLoginUserUtil.getLoginUser().getOrgId());
|
|
}
|
|
}
|
|
Page<MonitorTarget> page = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
|
|
Page<MonitorTarget> page = new Page<>(monitorTargetPageParam.getCurrent(), monitorTargetPageParam.getSize());
|
|
- Page<MonitorTarget> monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam);
|
|
|
|
|
|
+ Page<MonitorTarget> monitorTargetPage;
|
|
|
|
+ if (StrUtil.isNotBlank(monitorTargetPageParam.getType()) && monitorTargetPageParam.getType().equals("1")) {
|
|
|
|
+ monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, null);
|
|
|
|
+ } else {
|
|
|
|
+ monitorTargetPage = (Page<MonitorTarget>) monitorTargetMapper.selectMonitorTargetByPage(page, monitorTargetPageParam, "true");
|
|
|
|
+ }
|
|
monitorTargetPage.getRecords().forEach(monitorTarget -> {
|
|
monitorTargetPage.getRecords().forEach(monitorTarget -> {
|
|
monitorTarget.setRoomName(targetRoomService.getById(monitorTarget.getRoomId()).getName());
|
|
monitorTarget.setRoomName(targetRoomService.getById(monitorTarget.getRoomId()).getName());
|
|
});
|
|
});
|
|
@@ -293,6 +299,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
|
|
|
/**
|
|
/**
|
|
* jackzhou 重写 2025-1-7 新方法 selectMonitorTargetByPage
|
|
* jackzhou 重写 2025-1-7 新方法 selectMonitorTargetByPage
|
|
|
|
+ *
|
|
* @param monitorTargetPageParam
|
|
* @param monitorTargetPageParam
|
|
* @return
|
|
* @return
|
|
*/
|
|
*/
|
|
@@ -333,10 +340,14 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
}
|
|
}
|
|
|
|
|
|
@Override
|
|
@Override
|
|
- public TargetStatus getTargetCount(String name, String roomId) {
|
|
|
|
|
|
+ public TargetStatus getTargetCount(String name, String roomId, String type) {
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
SaBaseLoginUser loginUser = StpLoginUserUtil.getLoginUser();
|
|
- List<StatusCount> countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId());
|
|
|
|
- Long total = 0L;
|
|
|
|
|
|
+ List<StatusCount> countByStatusList;
|
|
|
|
+ if (StrUtil.isNotBlank(type) && type.equals("1")) {
|
|
|
|
+ countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId(), type, null);
|
|
|
|
+ } else {
|
|
|
|
+ countByStatusList = monitorTargetMapper.getCountByStatus(name, roomId, loginUser.getOrgId(), type, "true");
|
|
|
|
+ }
|
|
Long online = 0L;
|
|
Long online = 0L;
|
|
Long offline = 0L;
|
|
Long offline = 0L;
|
|
for (StatusCount statusCount : countByStatusList) {
|
|
for (StatusCount statusCount : countByStatusList) {
|
|
@@ -346,7 +357,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
offline = statusCount.getCount();
|
|
offline = statusCount.getCount();
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- total = online + offline;
|
|
|
|
|
|
+ long total = online + offline;
|
|
return new TargetStatus(total, online, offline);
|
|
return new TargetStatus(total, online, offline);
|
|
}
|
|
}
|
|
|
|
|
|
@@ -393,7 +404,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
MonitorTarget monitorTarget = this.getById(monitorTargetId);
|
|
MonitorTarget monitorTarget = this.getById(monitorTargetId);
|
|
if (Objects.nonNull(monitorTarget)) {
|
|
if (Objects.nonNull(monitorTarget)) {
|
|
monitorTarget.setStatus(monitorStatusEnum.getCode());
|
|
monitorTarget.setStatus(monitorStatusEnum.getCode());
|
|
-
|
|
|
|
|
|
+
|
|
return this.updateById(monitorTarget);
|
|
return this.updateById(monitorTarget);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -444,7 +455,7 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
private Map<Integer, String[]> ordinarySelect() {
|
|
private Map<Integer, String[]> ordinarySelect() {
|
|
Map<Integer, String[]> map = new HashMap<>();
|
|
Map<Integer, String[]> map = new HashMap<>();
|
|
|
|
|
|
- List<TargetRoom> list = targetRoomService.myList(null);
|
|
|
|
|
|
+ List<TargetRoom> list = targetRoomService.myList(null, null);
|
|
List<String> billingNameList = list.stream().map(TargetRoom::getName).toList();
|
|
List<String> billingNameList = list.stream().map(TargetRoom::getName).toList();
|
|
map.put(0, billingNameList.toArray(new String[0]));
|
|
map.put(0, billingNameList.toArray(new String[0]));
|
|
return map;
|
|
return map;
|