From c1513223bb5c51f501c4ed73506090d9267068ba Mon Sep 17 00:00:00 2001
From: VVT789 <67089238+VVT789@users.noreply.github.com>
Date: 星期一, 17 三月 2025 23:26:45 +0800
Subject: [PATCH] Merge pull request #5 from Andy-Yin/develop1.0
---
zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java | 13 +++----------
1 files changed, 3 insertions(+), 10 deletions(-)
diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
index 2ec479d..8d01836 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java
@@ -126,25 +126,18 @@
*/
@PreAuthorize("@ss.hasPermi('energyindex:energyindex:remove')")
@Log(title = "鎸囨爣淇℃伅", businessType = BusinessType.DELETE)
- @DeleteMapping("/{nodeId}/{indexIds}")
- public AjaxResult remove(@PathVariable String nodeId, @PathVariable String[] indexIds) {
+ @DeleteMapping("/{indexIds}")
+ public AjaxResult remove(@PathVariable String[] indexIds) {
List<EnergyIndex> energyIndexList = energyIndexService.getEnergyIndexByIds(
Arrays.asList(indexIds));
- List<String> deleteIds = energyIndexList.stream()
- .filter(f -> StringUtils.isBlank(f.getMeterId()))
- .map(EnergyIndex::getIndexId)
- .collect(Collectors.toList());
List<String> removeLink = energyIndexList.stream()
.filter(f -> StringUtils.isNotBlank(f.getMeterId()))
.map(EnergyIndex::getIndexId)
.collect(Collectors.toList());
if (!removeLink.isEmpty()) {
- energyIndexService.removeNodeIndex(nodeId, removeLink);
+ energyIndexService.removeNodeIndex(removeLink);
}
- if (!deleteIds.isEmpty()) {
- energyIndexService.deleteEnergyIndexByIds(nodeId, deleteIds.toArray(new String[0]));
- }
return AjaxResult.success();
}
--
Gitblit v1.9.3