From 15ef33c98e26f95aa6fa14f9cb24c140bc876fb0 Mon Sep 17 00:00:00 2001
From: wujian <14790700720@163.com>
Date: 星期三, 03 四月 2024 14:57:57 +0800
Subject: [PATCH] change 通信逻辑
---
jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 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 970139d..e566d30 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
@@ -1,12 +1,15 @@
package com.jcdm.main.plcserver;
+import com.jcdm.main.bs.orderScheduling.service.IBsOrderSchedulingService;
+import com.jcdm.main.bs.technologyRouteChild.service.IBsTechnologyRouteChildInfoService;
import com.jcdm.main.da.collectionParamConf.service.IDaCollectionParamConfService;
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.impl.DaPassingStationCollectionServiceImpl;
import com.jcdm.main.plcserver.sub.OPCUaSubscription;
+import com.jcdm.main.rm.repairRecord.service.IRmRepairRecordService;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
@@ -35,6 +38,15 @@
@Resource
private IDaOpcuaConfigService iDaOpcuaConfigService;
+ @Resource
+ private IBsOrderSchedulingService bsOrderSchedulingService;
+
+ @Resource
+ private IRmRepairRecordService rmRepairRecordService;
+
+ @Resource
+ private IBsTechnologyRouteChildInfoService bsTechnologyRouteChildInfoService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -43,9 +55,12 @@
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
collectionParamConfService,
- daParamCollectionService
- ,passingStationCollectionServiceImpl,
- lists);
+ daParamCollectionService,
+ passingStationCollectionServiceImpl,
+ bsOrderSchedulingService,
+ lists,
+ rmRepairRecordService,
+ bsTechnologyRouteChildInfoService);
miloService.subscriptionFromOpcUa(collect,opcUaSubscription);
@@ -57,6 +72,7 @@
*/
public List<DaOpcuaConfig> getSubList(){
DaOpcuaConfig config = new DaOpcuaConfig();
+ config.setState(1L);
List<DaOpcuaConfig> list = iDaOpcuaConfigService.selectDaOpcuaConfigList(config);
// List<String> lists = new ArrayList<>();
// if (CollUtil.isNotEmpty(list)){
--
Gitblit v1.9.3