From 6b1c7e3fa773aa75ea34b346d4104ba70064f52c Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期四, 31 八月 2023 14:35:53 +0800
Subject: [PATCH] 调整设备状态解析2
---
igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java | 51 ++++++++++++++++++++++++++++-----------------------
1 files changed, 28 insertions(+), 23 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 025a32a..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
@@ -5,7 +5,10 @@
import com.ld.igds.common.CoreSerService;
import com.ld.igds.common.DepotStatusService;
import com.ld.igds.common.dto.DepotSerData;
-import com.ld.igds.constant.*;
+import com.ld.igds.constant.BizType;
+import com.ld.igds.constant.DepotType;
+import com.ld.igds.constant.DeviceType;
+import com.ld.igds.constant.RespCodeEnum;
import com.ld.igds.data.PageResponse;
import com.ld.igds.io.RemoteControlService;
import com.ld.igds.io.RemoteManager;
@@ -22,15 +25,11 @@
import com.ld.igds.util.ContextUtil;
import com.ld.igds.verb.AreationModel;
import com.ld.igds.verb.dto.VerbParam;
-import com.ld.igds.verb.service.CoreAreationService;
import lombok.extern.slf4j.Slf4j;
-import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import javax.annotation.Resource;
+import java.util.*;
import java.util.stream.Collectors;
@@ -41,19 +40,17 @@
@Component
public class VerbManager {
- @Autowired
+ @Resource
private CoreCommonService coreCommonService;
- @Autowired
+ @Resource
private CoreDeviceService coreDeviceService;
- @Autowired
+ @Resource
private ExeOrderService exeOrderService;
- @Autowired
+ @Resource
private RemoteManager remoteManager;
- @Autowired
+ @Resource
private CoreSerService coreSerService;
- @Autowired
- private CoreAreationService areationService;
- @Autowired
+ @Resource
private DepotStatusService depotCheckService;
private RemoteControlService remoteControlService;
@@ -113,6 +110,8 @@
if (item.getType().equals(DeviceType.TYPE_0B.getCode()))
listResult.add(item);
if (item.getType().equals(DeviceType.TYPE_0C.getCode()))
+ listResult.add(item);
+ if (item.getType().equals(DeviceType.TYPE_04.getCode()))
listResult.add(item);
//娴呭渾浠撳姞涓婂叾浠栬澶�
@@ -243,11 +242,11 @@
// 鑾峰彇鍒嗘満淇℃伅
DeviceSer deviceSer = coreSerService.getCacheSer(param.getCompanyId(), serId);
- if (Constant.YN_N.equals(deviceSer.getStatus())) {
- return new DeviceControlResponse(
- OrderRespEnum.ORDER_ERROR.getCode(),
- "褰撳墠璁惧鎵�灞炴帶鍒舵煖[" + deviceSer.getName() + "]涓嶅湪绾匡紝鎵ц澶辫触銆�");
- }
+// if (Constant.YN_N.equals(deviceSer.getStatus())) {
+// return new DeviceControlResponse(
+// OrderRespEnum.ORDER_ERROR.getCode(),
+// "褰撳墠璁惧鎵�灞炴帶鍒舵煖[" + deviceSer.getName() + "]涓嶅湪绾匡紝鎵ц澶辫触銆�");
+// }
DeviceControlRequest request = new DeviceControlRequest();
request.setDepotId(param.getDepotId());
@@ -299,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