From 2b8f91e31b512c2868dc5cc26edf5d5d1167c557 Mon Sep 17 00:00:00 2001
From: whyclxw <810412026@qq.com>
Date: 星期四, 06 三月 2025 10:04:35 +0800
Subject: [PATCH] Merge branch 'master' of http://118.89.139.230:10101/r/fg_v2.0
---
src/main/java/com/whyc/service/BattInfService.java | 28 ++++++++++++++++++++++++++++
1 files changed, 28 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/whyc/service/BattInfService.java b/src/main/java/com/whyc/service/BattInfService.java
index 567f4c5..b6ce121 100644
--- a/src/main/java/com/whyc/service/BattInfService.java
+++ b/src/main/java/com/whyc/service/BattInfService.java
@@ -628,6 +628,10 @@
/**
* 鑾峰彇鐢垫睜,璁惧,鐢垫簮,鏈烘埧绔欑偣 璁℃暟/绠＄悊鍏冮椤碉細鍩虹璧勬簮淇℃伅
*
+ * 璁惧鐨勬暟閲忕粺璁″拰璁惧鐘舵�佺殑缁熻,閫昏緫鏄笉鍚岀殑,鏁版嵁搴撶瓫閫夌殑鏃跺�欐潯浠堕�昏緫蹇呭畾鏄笉鍚岀殑: TODO
+ * 閫氬父鎯呭喌涓�,璁惧鏁伴噺缁熻,瑕佹帓闄ゆ帀涓�涓澶囦袱涓猧d鐨勪竴鎷栦簩鎯呭喌;
+ * 鑰岃澶囩姸鎬佺粺璁�,鍙渶瑕佸尯鍒嗕竴涓澶囩殑瀛楁,涓�涓澶囨湁澶氭潯璁板綍涔熸槸姝ｅ父鍚堢悊鐨�,閫氳繃鐘舵�佷紭鍏堢骇瑕嗙洊鏉ュ畾涔夋暣涓澶囩殑鐘舵��
+ *
* @param userId
* @return
*/
@@ -652,6 +656,30 @@
}
}
+ public Response getDevCountMapForSZ(int userId) {
+ try {
+ Map<String, Object> map = new HashMap<>();
+ int battGroupCount = battInfMapper.getBattGroupNum(userId);
+ //鐢垫睜鍗曚綋鎬绘暟
+ int battGroupMonCount = battInfMapper.getBattGroupMonNum(userId);
+ int devCount = battInfMapper.getDevNum(userId);
+ int powerNum = powerInfService.getNum(userId);
+ List<StationInf> stationInfList = stationInfService.getStationInfList(userId);
+ int stationNum = stationInfService.getStation(userId);
+ int hrDisNum = testInfService.getHrQuarterZC(userId);
+ map.put("battGroupCount", battGroupCount);
+ map.put("battGroupMonCount", battGroupMonCount);
+ map.put("devCount", devCount);
+ map.put("powerNum", powerNum);
+ map.put("stationNum",stationNum);
+ map.put("stationInfList",stationInfList);
+ map.put("checkCapNum",hrDisNum);
+ return new Response().setII(1,true, map,"");
+ }catch (Exception e){
+ return new Response<>().set(1,false,"鍙戠敓寮傚父:"+e.getCause());
+ }
+ }
+
//灞辫タ鏅嬫簮鐗瑰畾鎺ュ彛
public Response getDevCountMapJY() {
try {
--
Gitblit v1.9.1