From dfd45b0998e4b9279e8ed8a33fbf82fc4e8b6015 Mon Sep 17 00:00:00 2001
From: whycxzp <glperry@163.com>
Date: 星期四, 06 三月 2025 14:39:26 +0800
Subject: [PATCH] 区分默认通用,太供,晋源,代码逻辑微调
---
src/main/java/com/whyc/service/Fbs9100StateService.java | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/whyc/service/Fbs9100StateService.java b/src/main/java/com/whyc/service/Fbs9100StateService.java
index 70d323d..1cbd980 100644
--- a/src/main/java/com/whyc/service/Fbs9100StateService.java
+++ b/src/main/java/com/whyc/service/Fbs9100StateService.java
@@ -6,6 +6,7 @@
import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo;
import com.whyc.constant.DeviceConstant;
+import com.whyc.constant.YamlProperties;
import com.whyc.dto.BattTestData;
import com.whyc.dto.Response;
import com.whyc.dto.paramter.FbsStatePar;
@@ -248,7 +249,12 @@
List<Fbs9100State> fbs9100StateList = mapper.getListWithoutZJDYBTSE2(userId,type);
//涓婇潰鐨勫垎缁勫瓧娈� 鍙鑳藉尯鍒� 涓嶅悓鐨勮澶囧氨琛屼簡. 鍥犱负濡傛灉鏄竴鎷栦簩鐨勬儏鍐�,涔熷彲閫氳繃鍚庨潰鐨勭姸鎬佷紭鍏堢骇鏉ヨ鐩�,璁惧涓嶄細閲嶅
//澶緵鍙互閫氳繃ip鏉ョ‘瀹氭槸鍝彴璁惧
- Map<String, List<Fbs9100State>> deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(Fbs9100State::getDevIp));
+ Map<String, List<Fbs9100State>> deviceMap = null;
+ if(YamlProperties.systemSubType == 3){ //鏅嬫簮 - 鍥犱负鎵�鏈夎澶囧叡鐢ㄤ竴涓猧p, 鎵�浠ラ渶瑕佸姞涓奷evId
+ deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(state -> String.format("%s_%s",state.getDevIp(), state.getDevId())));
+ }else{ //榛樿閫氱敤
+ deviceMap = fbs9100StateList.stream().collect(Collectors.groupingBy(state -> String.valueOf(state.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();
--
Gitblit v1.9.1