fix6

wujian

2024-07-26 778d3d8b387ca0a8d1b51ef68f783fb0b407ef20

 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;
    }
}