From 2da22bb80f786b5ba45dbdf927102510b2c86c67 Mon Sep 17 00:00:00 2001
From: cl <418351270@qq.com>
Date: 星期三, 17 七月 2024 11:03:13 +0800
Subject: [PATCH] 修改OP020
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 49 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 35 insertions(+), 14 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 8843f0d..76bd2e0 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
@@ -8,18 +8,15 @@
import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
import com.jcdm.main.da.passingStationCollection.service.IDaPassingStationCollectionService;
+import com.jcdm.main.da.testDeviceInterfaceTemp.service.IDaTestDeviceInterfaceTempService;
import com.jcdm.main.om.productionOrde.service.IOmProductionOrdeInfoService;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
-
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
import org.springframework.boot.ApplicationArguments;
import org.springframework.boot.ApplicationRunner;
import org.springframework.stereotype.Component;
-import javax.annotation.Resource;
-import java.util.ArrayList;
import java.util.List;
import java.util.stream.Collectors;
@@ -43,27 +40,51 @@
private IOmProductionOrdeInfoService omProductionOrdeInfoService;
- @Resource
+ @Autowired
private IDaOpcuaConfigService daOpcuaConfigService;
-
+ @Autowired
+ private IDaTestDeviceInterfaceTempService daTestDeviceInterfaceTempService;
@Override
public void run(ApplicationArguments args) throws Exception {
- //鍒嗘010-065娈�
- Constants.OP020_OP065.add(Constants.OP020);
- Constants.OP020_OP065.add(Constants.OP030);
- Constants.OP020_OP065.add(Constants.OP040);
- Constants.OP020_OP065.add(Constants.OP050);
- Constants.OP020_OP065.add(Constants.OP060);
- Constants.OP020_OP065.add(Constants.OP065);
+
+ //PLC鍒癕ES鐗╂枡杞崲
+ Constants.materialMap.put("1","9900199052A");
+ Constants.materialMap.put("2","9900199053B");
+
+ //鍒嗘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.OP100_OP150.add(Constants.OP100_1);
+ Constants.OP100_OP150.add(Constants.OP100_2);
+ Constants.OP100_OP150.add(Constants.OP150);
+
+ //妯＄粍宸ヤ綅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);
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
daPassingStationCollectionService,
collectionParamConfService,
daParamCollectionService,
- omProductionOrdeInfoService);
+ omProductionOrdeInfoService,
+ daTestDeviceInterfaceTempService);
List<String> lists = getSubList();
System.out.println("璁㈤槄鍐呭锛�"+lists);
--
Gitblit v1.9.3