From 0bdd92857e4dd960d77acb714d25b7cc2ee0789b Mon Sep 17 00:00:00 2001 From: 潘志宝 <979469083@qq.com> Date: 星期三, 18 六月 2025 14:20:16 +0800 Subject: [PATCH] 所有关口进线的二级界面(表格/曲线)均增加(CCPP/135/CDQ/TRT/余热)的选项。 --- ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java index 79c8fb7..48e62cc 100644 --- a/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java +++ b/ansteel-biz/src/main/java/com/iailab/module/ansteel/api/controller/admin/PowerController.java @@ -302,6 +302,13 @@ params.put("groupName", entity.getNodeName()); } list = powerNetDropdownService.list(params); + + // 追加公共 2025-06-18 + Map<String, Object> paramsCom = new HashMap<>(); + paramsCom.put("groupName", "COMMON1"); + List<PowerNetDropdownEntity> comList = powerNetDropdownService.list(paramsCom); + list.addAll(comList); + List<String> points = list.stream().map(item -> { return item.getCurCos(); }).collect(Collectors.toList()); @@ -728,9 +735,20 @@ log.info("PowerDemandEntity is null"); return success(result); } + List<PowerNetDropdownEntity> list = new ArrayList<>(); Map<String, Object> params0 = new HashMap<>(); params0.put("groupName", entity.getName()); - List<PowerNetDropdownEntity> list = powerNetDropdownService.list(params0); + List<PowerNetDropdownEntity> list0 = powerNetDropdownService.list(params0); + if (!CollectionUtils.isEmpty(list0)) { + list.addAll(list0); + } + Map<String, Object> params1 = new HashMap<>(); + params1.put("groupName", "COMMON1"); + List<PowerNetDropdownEntity> list1 = powerNetDropdownService.list(params1); + if (!CollectionUtils.isEmpty(list1)) { + list.addAll(list1); + } + List<String> points = list.stream().map(item -> { return item.getCurCos(); }).collect(Collectors.toList()); -- Gitblit v1.9.3