From 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期五, 26 七月 2024 11:52:34 +0800
Subject: [PATCH] fix6
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 20 ++++++--------------
1 files changed, 6 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 6f85176..ef21404 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
@@ -7,6 +7,7 @@
import com.jcdm.main.da.opcuaconfig.domain.DaOpcuaConfig;
import com.jcdm.main.da.opcuaconfig.service.IDaOpcuaConfigService;
import com.jcdm.main.da.paramCollection.service.IDaParamCollectionService;
+import com.jcdm.main.da.passingStationCollection.service.ProductNewPassStationService;
import com.jcdm.main.da.passingStationCollection.service.impl.DaPassingStationCollectionServiceImpl;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
import com.jcdm.main.rm.repairRecord.service.IRmRepairRecordService;
@@ -47,6 +48,9 @@
@Resource
private IBsTechnologyRouteChildInfoService bsTechnologyRouteChildInfoService;
+ @Resource
+ private ProductNewPassStationService productNewPassStationService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -60,11 +64,9 @@
bsOrderSchedulingService,
lists,
rmRepairRecordService,
- bsTechnologyRouteChildInfoService);
-
-
+ bsTechnologyRouteChildInfoService,
+ productNewPassStationService);
miloService.subscriptionFromOpcUa(collect,100,opcUaSubscription);
-
}
/**
@@ -74,16 +76,6 @@
DaOpcuaConfig config = new DaOpcuaConfig();
config.setState(0);
List<DaOpcuaConfig> list = iDaOpcuaConfigService.selectDaOpcuaConfigList(config);
-// List<String> lists = new ArrayList<>();
-// if (CollUtil.isNotEmpty(list)){
-// lists = list.stream().map(DaOpcuaConfig::getNode).distinct().collect(Collectors.toList());
-// }
-// List<String> lists = new ArrayList<>();
-//// lists.add(OPCElement.OP010_SaveRequest);//璇锋眰淇濆瓨
-//// lists.add(OPCElement.OP010_CodeCheck);//璇锋眰妫�绱㈡潯鐮�
-//// lists.add(OPCElement.OP020_SaveRequest);//璇锋眰淇濆瓨
-// lists.add(OPCElement.OP120_SaveRequestLast);//璇锋眰淇濆瓨
-// lists.add(OPCElement.OP120_ZZ_CODE_CHECK);//璇锋眰淇濆瓨
return list;
}
}
--
Gitblit v1.9.3