From 61b40ca50044c8b20b6ea21028398e068ca103a0 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 12 八月 2023 16:16:14 +0800
Subject: [PATCH] 调整DEVICE的字段和缓存，增加支持根据ID直接获取设备信息，优化MODBUS-TCP协议 实现
---
igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java | 13 ++++---------
1 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
index 3bba0c7..eae9542 100644
--- a/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
+++ b/igds-inout/src/main/java/com/ld/igds/inout/manager/InoutCommonManager.java
@@ -4,13 +4,11 @@
import com.ld.igds.inout.InoutConstant;
import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.inout.service.InoutService;
-import com.ld.igds.io.dto.WeightDto;
import com.ld.igds.m.service.InoutCommonService;
import com.ld.igds.models.DicTrigger;
import com.ld.igds.models.InoutConf;
import com.ld.igds.models.InoutSysConf;
import com.ld.igds.sys.service.DicTriggerService;
-import com.ld.igds.util.ContextUtil;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -32,6 +30,8 @@
private DicTriggerService dicTriggerService;
@Resource
private InoutService inoutService;
+ @Resource
+ private InoutEventControlManager inoutEventControl;
/**
* 鑾峰彇鍑哄叆搴撶殑鏁翠釜娴佺▼淇℃伅
@@ -110,16 +110,12 @@
if (null == listInoutConf) return new InoutConf(sort);
if (StringUtils.isEmpty(sort)) sort = "1";
- InoutConf result = null;
for (InoutConf conf : listInoutConf) {
if (sort.equals(conf.getSort()) && type.equals(conf.getType())) {
return conf;
}
}
-
- if (null == result) return new InoutConf(sort);
-
- return result;
+ return new InoutConf(sort);
}
@@ -162,12 +158,11 @@
public void initInoutScreen(String companyId, String deptId) {
if (StringUtils.isEmpty(companyId)) return;
if (StringUtils.isEmpty(deptId)) return;
- inoutService.notifyToScreen(companyId, deptId, null);
+ inoutEventControl.initInoutScreen(companyId, deptId, null);
}
public List<InoutData> getListInoutCache(String deptId) {
return inoutService.getListInoutCache(deptId);
-
}
public List<InoutData> getCompleteListInoutCache(String deptId) {
--
Gitblit v1.9.3