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 | 42 +++++++++++++++++++++++++-----------------
1 files changed, 25 insertions(+), 17 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..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
@@ -1,12 +1,16 @@
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.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;
import com.kangaroohy.milo.service.MiloService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.ApplicationArguments;
@@ -35,6 +39,18 @@
@Resource
private IDaOpcuaConfigService iDaOpcuaConfigService;
+ @Resource
+ private IBsOrderSchedulingService bsOrderSchedulingService;
+
+ @Resource
+ private IRmRepairRecordService rmRepairRecordService;
+
+ @Resource
+ private IBsTechnologyRouteChildInfoService bsTechnologyRouteChildInfoService;
+
+ @Resource
+ private ProductNewPassStationService productNewPassStationService;
+
@Override
public void run(ApplicationArguments args) throws Exception {
@@ -43,13 +59,14 @@
OPCUaSubscription opcUaSubscription = new OPCUaSubscription(
miloService,
collectionParamConfService,
- daParamCollectionService
- ,passingStationCollectionServiceImpl,
- lists);
-
-
- miloService.subscriptionFromOpcUa(collect,opcUaSubscription);
-
+ daParamCollectionService,
+ passingStationCollectionServiceImpl,
+ bsOrderSchedulingService,
+ lists,
+ rmRepairRecordService,
+ bsTechnologyRouteChildInfoService,
+ productNewPassStationService);
+ miloService.subscriptionFromOpcUa(collect,100,opcUaSubscription);
}
/**
@@ -57,17 +74,8 @@
*/
public List<DaOpcuaConfig> getSubList(){
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