From 04b8eff075a04db23e6f908855699b4d2954588c Mon Sep 17 00:00:00 2001 From: yyt <306727702@qq.com> Date: 星期四, 23 五月 2024 18:47:01 +0800 Subject: [PATCH] 380新产品,优化 --- jcdm-main/src/main/java/com/jcdm/main/plcserver/CustomRunner.java | 37 ++++++++++++++++++++----------------- 1 files changed, 20 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..57f569a 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,13 +55,13 @@ OPCUaSubscription opcUaSubscription = new OPCUaSubscription( miloService, collectionParamConfService, - daParamCollectionService - ,passingStationCollectionServiceImpl, - lists); - - - miloService.subscriptionFromOpcUa(collect,opcUaSubscription); - + daParamCollectionService, + passingStationCollectionServiceImpl, + bsOrderSchedulingService, + lists, + rmRepairRecordService, + bsTechnologyRouteChildInfoService); + miloService.subscriptionFromOpcUa(collect,100,opcUaSubscription); } /** @@ -57,17 +69,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