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/Fbs9100StateService.java | 24 +++++++++++++++++-------
1 files changed, 17 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/whyc/service/Fbs9100StateService.java b/src/main/java/com/whyc/service/Fbs9100StateService.java
index 36ff3d6..70d323d 100644
--- a/src/main/java/com/whyc/service/Fbs9100StateService.java
+++ b/src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -224,6 +224,11 @@
* 杩欎釜鏄寜鐓ц澶噄p鏉ョ粺璁＄殑.
* 閫氳鏁呴殰>鏍稿鏀剧數>鍏呯數>鍐呴樆>娴厖,
* 濡傛灉涓�鎷栦簩鐨勮澶�,鏈変袱涓笉鍚岀姸鎬�,瀹炵幇鐘舵�佷紭鍏堢骇瑕嗙洊
+ *
+ * 璁惧鐨勬暟閲忕粺璁″拰璁惧鐘舵�佺殑缁熻,閫昏緫鏄笉鍚岀殑,鏁版嵁搴撶瓫閫夌殑鏃跺�欐潯浠堕�昏緫蹇呭畾鏄笉鍚岀殑: TODO
+ * 閫氬父鎯呭喌涓�,璁惧鏁伴噺缁熻,瑕佹帓闄ゆ帀涓�涓澶囦袱涓猧d鐨勪竴鎷栦簩鎯呭喌;
+ * 鑰岃澶囩姸鎬佺粺璁�,鍙渶瑕佸尯鍒嗕竴涓澶囩殑瀛楁,涓�涓澶囨湁澶氭潯璁板綍涔熸槸姝ｅ父鍚堢悊鐨�,閫氳繃鐘舵�佷紭鍏堢骇瑕嗙洊鏉ュ畾涔夋暣涓澶囩殑鐘舵��
+ *
* @param userId
* @param type 1-澶師鎺掗櫎钃勭數姹犺澶囦竴鎷栦簩鐨勭浜岀粍鐘舵�佺粺璁�
* @param type 2-缁熻鎵�鏈夎澶噄p鐨勭姸鎬�
@@ -234,20 +239,24 @@
Response response = new Response();
try {
Map<String, Integer> resultMap = new HashMap<>();
- resultMap.put("鐩存祦鍏呯數鏁伴噺", 0);
+ resultMap.put("鐩磋繛鍏呯數鏁伴噺", 0);
resultMap.put("棰勫厖鐢垫暟閲�", 0);
resultMap.put("鏍稿娴嬭瘯鏁伴噺", 0);
resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", 0);
resultMap.put("閫氳鏁呴殰鏁伴噺", 0);
List<Fbs9100State> fbs9100StateList = mapper.getListWithoutZJDYBTSE2(userId,type);
- //Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(Fbs9100State::getDevIp));
- Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(state ->
- String.format("%s_%s",state.getDevIp(), state.getDevId())));
+ //涓婇潰鐨勫垎缁勫瓧娈� 鍙鑳藉尯鍒� 涓嶅悓鐨勮澶囧氨琛屼簡. 鍥犱负濡傛灉鏄竴鎷栦簩鐨勬儏鍐�,涔熷彲閫氳繃鍚庨潰鐨勭姸鎬佷紭鍏堢骇鏉ヨ鐩�,璁惧涓嶄細閲嶅
+ //澶緵鍙互閫氳繃ip鏉ョ‘瀹氭槸鍝彴璁惧
+ Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(Fbs9100State::getDevIp));
+ //Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(state ->
+ // String.format("%s_%s",state.getDevIp(), state.getDevId())));
Set<String> deviceSet = deviceMap.keySet();
Calendar instance = Calendar.getInstance();
instance.add(Calendar.MINUTE, -1);
Date time = instance.getTime();
+ //杩欎釜閬嶅巻閲岄潰,鏄寜鐓roupingBy(瀛楁)鏉ヨ繘琛屽垎缁勭殑,鍙互瀛樺湪涓�涓澶囧涓褰�,鍗冲嚭鐜颁竴鎷栦簩鐨勬儏鍐�. 杩欎釜鏃跺�欐寜鐓т紭鍏堢骇杩涜瑕嗙洊鏉ュ畾涔夋暣涓澶囩殑鐘舵��
+ //涓婇潰鐨勫垎缁勫瓧娈� 鍙鑳藉尯鍒� 涓嶅悓鐨勮澶囧氨琛屼簡. 鍥犱负濡傛灉鏄竴鎷栦簩鐨勬儏鍐�,涔熷彲閫氳繃鐘舵�佷紭鍏堢骇鏉ヨ鐩�
for (String deviceIp : deviceSet) {
List<Fbs9100State> fbs9100States = deviceMap.get(deviceIp);
List<Integer> workStateList = fbs9100States.stream().map(Fbs9100State::getDevWorkstate).collect(Collectors.toList());
@@ -274,7 +283,7 @@
resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", resultMap.get("鍐呴樆娴嬭瘯鏁伴噺") + 1);
}
else if(workStateSet.contains(DeviceConstant.DEV_ONLINE_CHARGE)) {
- resultMap.put("鐩存祦鍏呯數鏁伴噺", resultMap.get("鐩存祦鍏呯數鏁伴噺") + 1);
+ resultMap.put("鐩磋繛鍏呯數鏁伴噺", resultMap.get("鐩磋繛鍏呯數鏁伴噺") + 1);
}
}
@@ -317,7 +326,7 @@
Response response = new Response();
try {
Map<String, Integer> resultMap = new HashMap<>();
- resultMap.put("鐩存祦鍏呯數鏁伴噺", 0);
+ resultMap.put("鐩磋繛鍏呯數鏁伴噺", 0);
resultMap.put("棰勫厖鐢垫暟閲�", 0);
resultMap.put("鏍稿娴嬭瘯鏁伴噺", 0);
resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", 0);
@@ -326,6 +335,7 @@
List<Fbs9100State> fbs9100StateList = mapper.getListWithoutZJDYBTSE2JY(type);
//Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(Fbs9100State::getDevIp));
+ //JY鐨勮澶�,ip閮戒竴鏍�,鎵�浠ュ尯鍒嗕笉鍚岀殑璁惧,闇�瑕侀�氳繃ip+id
Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(state ->String.format("%s_%s",state.getDevIp(), state.getDevId())));
Set<String> deviceSet = deviceMap.keySet();
Calendar instance = Calendar.getInstance();
@@ -357,7 +367,7 @@
resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", resultMap.get("鍐呴樆娴嬭瘯鏁伴噺") + 1);
}
else if(workStateSet.contains(DeviceConstant.DEV_ONLINE_CHARGE)) {
- resultMap.put("鐩存祦鍏呯數鏁伴噺", resultMap.get("鐩存祦鍏呯數鏁伴噺") + 1);
+ resultMap.put("鐩磋繛鍏呯數鏁伴噺", resultMap.get("鐩磋繛鍏呯數鏁伴噺") + 1);
}
}
--
Gitblit v1.9.1