|
@@ -42,6 +42,8 @@ public class ProjectAlarmRuleController {
|
|
|
private IProjectAlarmRuleService projectAlarmRuleService;
|
|
|
@Autowired
|
|
|
private IProjectAlarmRuleObjRelService projectAlarmRuleObjRelService;
|
|
|
+ @Autowired
|
|
|
+ private ProjectAlarmRuleMapper projectAlarmRuleMapper;
|
|
|
|
|
|
@ApiOperation(value = "创建项目报警规则")
|
|
|
@PostMapping("/create")
|
|
@@ -105,28 +107,40 @@ public class ProjectAlarmRuleController {
|
|
|
@PostMapping("/queryPage")
|
|
|
public CommonResult<PageList<ProjectAlarmRuleListItemVO>> queryProjectAlarmRule(
|
|
|
@Valid @RequestBody PageQueryProjectAlarmRuleDTO pageQueryProjectAlarmRuleDTO) {
|
|
|
- IPage<ProjectAlarmRule> pagedList = projectAlarmRuleService.pageQueryProjectAlarmRule(pageQueryProjectAlarmRuleDTO);
|
|
|
- if(pagedList.getRecords().size()>0){
|
|
|
- List<String> projectIds = pagedList.getRecords().stream().map(ProjectAlarmRule::getProjectId).collect(Collectors.toList());
|
|
|
- List<ProjectAlarmRuleObjRel> relationList = projectAlarmRuleObjRelService.queryRelationListByProjectIds(projectIds);
|
|
|
- Map<String, ProjectAlarmRuleObjRel> relationMap = relationList.stream().collect(Collectors.toMap(ProjectAlarmRuleObjRel::getProjectId, rule -> rule));
|
|
|
- IPage<ProjectAlarmRuleListItemVO> pagedResultList = pagedList.convert(item -> {
|
|
|
- try {
|
|
|
- return ConvertProjectAlarmRuleTool.INSTANCE.convert2ResponseListItemDTO(item);
|
|
|
- } catch (Exception e) {
|
|
|
- throw new IllegalArgumentException("分页查询,ProjectAlarmRule实体类转换为列表对象发生异常", e);
|
|
|
- }
|
|
|
- });
|
|
|
- pagedResultList.getRecords().forEach(projectAlarmRuleListItemVO -> {
|
|
|
- String projectId = projectAlarmRuleListItemVO.getProjectId();
|
|
|
- if(relationMap.containsKey(projectId)){
|
|
|
- projectAlarmRuleListItemVO.setRelListItemList((List<ProjectAlarmRuleObjRel>) relationMap.get(projectId));
|
|
|
- }
|
|
|
- });
|
|
|
- return ResultHelper.multi(pagedResultList);
|
|
|
- }
|
|
|
|
|
|
- return ResultHelper.multi(new ArrayList<>());
|
|
|
+ int page = pageQueryProjectAlarmRuleDTO.getPage();
|
|
|
+ int size = pageQueryProjectAlarmRuleDTO.getSize();
|
|
|
+ pageQueryProjectAlarmRuleDTO.setStartIndex((page - 1) * size);
|
|
|
+ int count = projectAlarmRuleMapper.queryCount(pageQueryProjectAlarmRuleDTO);
|
|
|
+ List<ProjectAlarmRuleListItemVO> projectAlarmRuleListItemVOS = projectAlarmRuleMapper.queryList(pageQueryProjectAlarmRuleDTO);
|
|
|
+ return ResultHelper.multi(projectAlarmRuleListItemVOS, count);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+// IPage<ProjectAlarmRule> pagedList = projectAlarmRuleService.pageQueryProjectAlarmRule(pageQueryProjectAlarmRuleDTO);
|
|
|
+// if(pagedList.getRecords().size()>0){
|
|
|
+// List<String> projectIds = pagedList.getRecords().stream().map(ProjectAlarmRule::getProjectId).collect(Collectors.toList());
|
|
|
+// List<ProjectAlarmRuleObjRel> relationList = projectAlarmRuleObjRelService.queryRelationListByProjectIds(projectIds);
|
|
|
+// Map<String, ProjectAlarmRuleObjRel> relationMap = relationList.stream().collect(Collectors.toMap(ProjectAlarmRuleObjRel::getProjectId, rule -> rule));
|
|
|
+// IPage<ProjectAlarmRuleListItemVO> pagedResultList = pagedList.convert(item -> {
|
|
|
+// try {
|
|
|
+// return ConvertProjectAlarmRuleTool.INSTANCE.convert2ResponseListItemDTO(item);
|
|
|
+// } catch (Exception e) {
|
|
|
+// throw new IllegalArgumentException("分页查询,ProjectAlarmRule实体类转换为列表对象发生异常", e);
|
|
|
+// }
|
|
|
+// });
|
|
|
+// pagedResultList.getRecords().forEach(projectAlarmRuleListItemVO -> {
|
|
|
+// String projectId = projectAlarmRuleListItemVO.getProjectId();
|
|
|
+// if(relationMap.containsKey(projectId)){
|
|
|
+// projectAlarmRuleListItemVO.setRelListItemList((List<ProjectAlarmRuleObjRel>) relationMap.get(projectId));
|
|
|
+// }
|
|
|
+// });
|
|
|
+// return ResultHelper.multi(pagedResultList);
|
|
|
+// }
|
|
|
+// return ResultHelper.multi(new ArrayList<>());
|
|
|
}
|
|
|
}
|
|
|
|