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/m/view/InoutNoticePR.java | 22 ++++++++++------------
1 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
index 0cde589..151307e 100644
--- a/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
+++ b/igds-inout/src/main/java/com/ld/igds/m/view/InoutNoticePR.java
@@ -188,14 +188,14 @@
InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(companyId, deptId);
- if(Constant.YN_Y.equals(inoutSysConf.getNoticeTagIn())){
- List<InoutNoticeIn> noticeInList = inoutManagerService.getUnComNoticeIn(companyId);
+ List<InoutNoticeIn> noticeInList = inoutManagerService.getUnComNoticeIn(companyId);
- if (noticeInList != null && noticeInList.size() > 0) {
- inoutManagerService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
- return "success";
- }
+ if (noticeInList != null && noticeInList.size() > 0) {
+ inoutManagerService.updateSumNoticeIn(inoutSysConf.getDeptId(), noticeInList);
+ return "success";
}
+
+
return "fail";
}
@@ -269,13 +269,11 @@
InoutSysConf inoutSysConf = inoutManagerService.getCacheInoutSysConf(companyId, deptId);
- if(Constant.YN_Y.equals(inoutSysConf.getNoticeTagOut())){
- List<InoutNoticeOut> noticeOutList = inoutManagerService.getUnComNoticeOut(companyId);
+ List<InoutNoticeOut> noticeOutList = inoutManagerService.getUnComNoticeOut(companyId);
- if (noticeOutList != null && noticeOutList.size() > 0) {
- inoutManagerService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
- return "success";
- }
+ if (noticeOutList != null && noticeOutList.size() > 0) {
+ inoutManagerService.updateSumNoticeOut(inoutSysConf.getDeptId(), noticeOutList);
+ return "success";
}
return "fail";
}
--
Gitblit v1.9.3