From bca95d5419b95e605a0c880c80db9070f449e1d3 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期三, 26 二月 2025 14:14:11 +0800
Subject: [PATCH] 设备状态表数量差异,接口更新
---
src/main/java/com/whyc/service/Fbs9100StateService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/whyc/service/Fbs9100StateService.java b/src/main/java/com/whyc/service/Fbs9100StateService.java
index b8928eb..36ff3d6 100644
--- a/src/main/java/com/whyc/service/Fbs9100StateService.java
+++ b/src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -234,14 +234,16 @@
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(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);
@@ -272,7 +274,7 @@
resultMap.put("鍐呴樆娴嬭瘯鏁伴噺", resultMap.get("鍐呴樆娴嬭瘯鏁伴噺") + 1);
}
else if(workStateSet.contains(DeviceConstant.DEV_ONLINE_CHARGE)) {
- resultMap.put("鍦ㄧ嚎娴厖鏁伴噺", resultMap.get("鍦ㄧ嚎娴厖鏁伴噺") + 1);
+ resultMap.put("鐩存祦鍏呯數鏁伴噺", resultMap.get("鐩存祦鍏呯數鏁伴噺") + 1);
}
}
@@ -315,7 +317,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);
@@ -323,7 +325,8 @@
List<Fbs9100State> fbs9100StateList = mapper.getListWithoutZJDYBTSE2JY(type);
- Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(Fbs9100State::getDevIp));
+ //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);
@@ -354,7 +357,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