From 5adce825013b49f0614db1746cffe43a7502de82 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期二, 22 八月 2023 23:07:46 +0800
Subject: [PATCH] 更新MODBUS-TCP协议 1
---
igds-verb/src/main/java/com/ld/igds/verb/manager/VerbManager.java | 32 ++++++++++++++++----------------
1 files changed, 16 insertions(+), 16 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..38ea75f 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,11 +25,10 @@
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 javax.annotation.Resource;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -41,19 +43,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;
@@ -243,11 +243,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());
--
Gitblit v1.9.3