From 7243e0b4bd9a267a633d2e481e17646509b6868d Mon Sep 17 00:00:00 2001
From: YYC <1833023622@qq.com>
Date: 星期四, 07 九月 2023 19:36:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
index 4880842..fac6d43 100644
--- a/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
+++ b/igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java
@@ -29,10 +29,7 @@
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
import java.util.stream.Collectors;
@@ -301,16 +298,22 @@
return new DeviceControlResponse(OrderRespEnum.ORDER_ERROR.getCode(), "娌℃湁闇�瑕佹洿鏂扮殑璁惧淇℃伅锛侊紒");
}
+// 2023-08-31鏆傛椂绂佺敤锛屼娇鐢ㄤ粨搴撶紪鐮佽幏鍙栦粨搴撴墍鏈夎澶囩殑鍒嗘満淇℃伅
//鏍规嵁璁惧鎵�灞炲垎鏈鸿繘琛屽垎缁�
- Map<String, List<ExeDevice>> groupBy = param.getDeviceList().stream().collect(Collectors.groupingBy(ExeDevice::getSerId));
+// Map<String, List<ExeDevice>> groupBy = param.getDeviceList().stream().collect(Collectors.groupingBy(ExeDevice::getSerId));
+// DeviceControlResponse response = new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS.getCode(), "鍛戒护鍙戦�佹垚鍔燂紒");
+// DeviceSer deviceSer;
+// DeviceControlRequest request;
+// try {
+// for (String serId : groupBy.keySet()) {
+ Set<String> list = coreDeviceService.getCacheDeviceSerByDepotId(param.getCompanyId(), param.getDepotId());
DeviceControlResponse response = new DeviceControlResponse(OrderRespEnum.ORDER_SUCCESS.getCode(), "鍛戒护鍙戦�佹垚鍔燂紒");
-
DeviceSer deviceSer;
DeviceControlRequest request;
try {
- for (String serId : groupBy.keySet()) {
+ for (String serId : list) {
deviceSer = coreSerService.getCacheSer(param.getCompanyId(), serId);
if (null == deviceSer) {
log.info("鏍规嵁浠撳簱{}鑾峰彇璁惧鐘舵�侊紝鍒嗘満缂栫爜{}鐨勫垎鏈轰笉瀛樺湪锛屽彇娑堟墽琛屻��", param.getDepotId(), serId);
--
Gitblit v1.9.3