From 8dd7af51db4cf768fbf92002b5b62f7fb9d1c929 Mon Sep 17 00:00:00 2001
From: baoshiwei <baoshiwei@shlanbao.cn>
Date: 星期二, 06 五月 2025 15:04:59 +0800
Subject: [PATCH] refactor(zhitan):调整模型代码和优化能源统计功能
---
zhitan-admin/src/main/java/com/zhitan/web/controller/model/EnergyIndexController.java | 43 ++++++++++++++++++++++---------------------
1 files changed, 22 insertions(+), 21 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 7a2cc00..f169f8c 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
@@ -18,18 +18,12 @@
import org.springframework.web.bind.annotation.*;
import org.springframework.web.multipart.MultipartFile;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
import java.util.stream.Collectors;
import java.util.stream.Stream;
/**
- * 鎸囨爣淇℃伅Controller
- *
- * @author fanxinfu
- * @date 2020-02-14
+ * 鎸囨爣淇℃伅鎺у埗鍣�
*/
@RestController
@RequestMapping("/basicsetting/energyindex")
@@ -39,7 +33,11 @@
private IEnergyIndexService energyIndexService;
/**
- * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
+ * 鍒嗛〉鏌ヨ鎸囨爣淇℃伅
+ * @param energyIndex 鏌ヨ鏉′欢
+ * @param pageNum 褰撳墠椤电爜
+ * @param pageSize 椤甸潰澶у皬
+ * @return 鍒嗛〉鏁版嵁
*/
@PreAuthorize("@ss.hasPermi('energyindex:energyindex:query')")
@GetMapping("/list")
@@ -51,7 +49,9 @@
}
/**
- * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
+ * 鏉′欢鏌ヨ鎸囨爣淇℃伅锛堜笉甯﹀垎椤碉級
+ * @param query 鏌ヨ鏉′欢
+ * @return 鎸囨爣鍒楄〃
*/
@GetMapping("/filter")
public AjaxResult filter(EnergyIndexQuery query) {
@@ -60,7 +60,9 @@
}
/**
- * 鏌ヨ鎸囨爣淇℃伅鍒楄〃
+ * 鏌ヨ閲囬泦鎸囨爣鍒楄〃锛堢敤浜庤澶囧叧鑱旓級
+ * @param deviceId 璁惧ID
+ * @return 鍒嗛〉鏁版嵁
*/
@PreAuthorize("@ss.hasPermi('energyindex:energyindex:query')")
@GetMapping("/collectIndex")
@@ -132,20 +134,19 @@
@Log(title = "鎸囨爣淇℃伅", businessType = BusinessType.DELETE)
@DeleteMapping("/{indexIds}")
public AjaxResult remove(@PathVariable String[] indexIds) {
+ // 姝ラ1: 鍙傛暟鏍￠獙
+ if (ObjectUtils.isEmpty(indexIds)) return AjaxResult.success();
- List<String> indexIdList = Arrays.asList(indexIds);
- if (ObjectUtils.isEmpty(indexIdList)) {
- return AjaxResult.success();
- }
- // 鏌ヨ妯″瀷鑺傜偣鐐逛綅淇℃伅
+ // 姝ラ2: 妫�鏌ユ槸鍚﹁妯″瀷鍏宠仈
List<ModelNodeIndexInfo> modelNodeIndexInfoList = energyIndexService.getModelNodeIndexInfoListByIndexIds(indexIds);
- if (ObjectUtils.isNotEmpty(modelNodeIndexInfoList)) {
- ModelNodeIndexInfo modelNodeIndexInfo = modelNodeIndexInfoList.stream().findFirst().get();
- return AjaxResult.error("閲囬泦鎸囨爣 " + modelNodeIndexInfo.getIndexName() + " 宸茶妯″瀷 " + modelNodeIndexInfo.getModelName() + " 鍏宠仈锛屼笉鑳藉垹闄わ紒");
+ if (!modelNodeIndexInfoList.isEmpty()) {
+ // 瀛樺湪鍏宠仈鍏崇郴杩斿洖閿欒
+ ModelNodeIndexInfo firstItem = modelNodeIndexInfoList.get(0);
+ return AjaxResult.error("鎸囨爣 " + firstItem.getIndexName() + " 宸茶妯″瀷 " + firstItem.getModelName() + " 鍏宠仈锛屼笉鑳藉垹闄わ紒");
}
- energyIndexService.removeEnergyIndex(indexIdList);
-
+ // 姝ラ3: 鎵ц鍒犻櫎
+ energyIndexService.removeEnergyIndex(Arrays.asList(indexIds));
return AjaxResult.success();
}
--
Gitblit v1.9.3