From 537bfb7e43c78d5b3b98ba8a135b638f0461ea60 Mon Sep 17 00:00:00 2001
From: admin <15939171744@163.com>
Date: 星期日, 20 十月 2024 15:50:30 +0800
Subject: [PATCH] 优化
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 74 ++++++++++++++++++++++++------------
1 files changed, 49 insertions(+), 25 deletions(-)
diff --git a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
index 604b00f..3b31588 100644
--- a/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
+++ b/jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java
@@ -54,33 +54,56 @@
public void run(ApplicationArguments args) throws Exception {
//PLC鍒癕ES鐗╂枡杞崲
- Constants.materialMap.put("1","9900199052A");
- Constants.materialMap.put("2","9900199053B");
+ Constants.materialMap.put("1","9900200461");//寰崱鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276636)//9900200461
+ Constants.materialMap.put("2","9900207783");//寰潰鐢甸┍鍔ㄧ郴缁熸�绘垚(9999276639)//9900207783
- //鍒嗘010-090娈� 鐢佃姱宸ヤ綅
- Constants.OP020_OP090.add(Constants.OP020);
- Constants.OP020_OP090.add(Constants.OP030);
- Constants.OP020_OP090.add(Constants.OP040);
- Constants.OP020_OP090.add(Constants.OP050);
- Constants.OP020_OP090.add(Constants.OP060);
- Constants.OP020_OP090.add(Constants.OP090);
+ Constants.facMaterialMap.put("9900200461","9999276636");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
+ Constants.facMaterialMap.put("9900207783","9999276639");//鐢熶骇鐗╂枡杞伐鍘傜墿鏂欒姹傚伐鍗�
- //浜哄伐宸ヤ綅
- Constants.OP100_OP150.add(Constants.OP100_1);
- Constants.OP100_OP150.add(Constants.OP100_2);
- Constants.OP100_OP150.add(Constants.OP150);
+ //閫氶亾
+ Constants.thoroughfareMap.put(Constants.OP010,"JCDM035-1");
- //妯＄粍宸ヤ綅List
- Constants.ModuleList.add(Constants.OP110);
- Constants.ModuleList.add(Constants.OP120);
- Constants.ModuleList.add(Constants.OP130);
- Constants.ModuleList.add(Constants.OP140);
- //Constants.ModuleList.add(Constants.OP150);
- Constants.ModuleList.add(Constants.OP160);
- Constants.ModuleList.add(Constants.OP170);
- Constants.ModuleList.add(Constants.OP180);
- Constants.ModuleList.add(Constants.OP210);
- Constants.ModuleList.add(Constants.OP220);
+ Constants.thoroughfareMap.put(Constants.OP020,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP030,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP120_2,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP130,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP140,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP150,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP160,"JCDM035-2");
+ Constants.thoroughfareMap.put(Constants.OP165,"JCDM035-2");
+
+ Constants.thoroughfareMap.put(Constants.OP040,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP050,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP060,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP070,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP080,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP090,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP100,"JCDM035-3");
+ Constants.thoroughfareMap.put(Constants.OP110,"JCDM035-3");
+
+ Constants.thoroughfareMap.put(Constants.OP170,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP180,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP190,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP200,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP210,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP220,"JCDM035-4");
+ Constants.thoroughfareMap.put(Constants.OP230,"JCDM035-4");
+
+ //涓荤嚎浜哄伐宸ヤ綅
+ Constants.OP040_OP160.add(Constants.OP040);
+ Constants.OP040_OP160.add(Constants.OP080);
+ Constants.OP040_OP160.add(Constants.OP070);
+ Constants.OP040_OP160.add(Constants.OP100);
+ Constants.OP040_OP160.add(Constants.OP120_2);
+ Constants.OP040_OP160.add(Constants.OP165);
+
+ //鐜嚎浜哄伐宸ヤ綅
+ Constants.OP0170_OP220.add(Constants.OP170);
+ Constants.OP0170_OP220.add(Constants.OP180);
+ Constants.OP0170_OP220.add(Constants.OP190);
+ Constants.OP0170_OP220.add(Constants.OP200);
+ Constants.OP0170_OP220.add(Constants.OP210);
+ Constants.OP0170_OP220.add(Constants.OP220);
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
@@ -102,7 +125,8 @@
*/
public List<String> getSubList(){
List<String> lists = daOpcuaConfigService.list(new LambdaQueryWrapper<DaOpcuaConfig>()
- .eq(DaOpcuaConfig::getState, Constants.USE_ING))
+ .eq(DaOpcuaConfig::getState, Constants.USE_ING)
+ .eq(DaOpcuaConfig::getSubscribe,Constants.YES))
.stream().map(DaOpcuaConfig::getNode).collect(Collectors.toList());
return lists;
}
--
Gitblit v1.9.3