mysql版本
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
hdy
3 天以前 51eb318f6df9ebc7d1ff47522e33b2ee7cea1ba8 
 billion-main/src/main/java/com/billion/main/plcServer/CustomRunner.java


@@ -22,13 +22,10 @@


public class CustomRunner implements ApplicationRunner {


    @Autowired


    private MiloService miloService;




    @Autowired


    public IDaParamCollectionService daParamCollectionService;




    @Autowired


    public IDaStationCollectionService daStationCollectionService;




    @Autowired


    public IOmProductionOrderInfoService omProductionOrderInfoService;


    @Autowired


@@ -50,7 +47,6 @@


        Constants.PLC1.add(Constants.C020);


        Constants.PLC1.add(Constants.C030);


        Constants.PLC1.add(Constants.C050);


        Constants.PLC1.add(Constants.C060);


        //PLC2设备//排查上下线


        Constants.PLC2.add(Constants.OP005);


        Constants.PLC2.add(Constants.OP010);


@@ -110,14 +106,12 @@


        Constants.PLC4.add(Constants.OP050);


        Constants.PLC4.add(Constants.OP110);


        Constants.PLC4.add(Constants.OP140);




        //上线工位


        Constants.ONLINE.add(Constants.C005);


        Constants.ONLINE.add(Constants.OP005);


        //下线工位


        Constants.OFFLINE.add(Constants.C070);


        Constants.OFFLINE.add(Constants.C060);


        Constants.OFFLINE.add(Constants.OP310);


        Constants.OFFLINE.add(Constants.P010);




        OPCUaSubscription OPCUaSubscription = new OPCUaSubscription(miloService,


                daParamCollectionService,


@@ -137,77 +131,87 @@




    public List<String> getList(){


        List<String> lists = new ArrayList<>();


        //PLC1


        lists.add("PLC1.C005.RecordData");


        lists.add("PLC1.C005.WorkOrderRequest");//请求工单


        lists.add("PLC1.C010.RecordData");


        lists.add("PLC1.C020.RecordData");


        lists.add("PLC1.C030.RecordData");


        lists.add("PLC1.C050.RecordData");


        lists.add("PLC1.C060.RecordData");


        lists.add("PLC1.C070.RecordData");


        //PLC2


        lists.add("PLC2.OP005.RecordData");


        lists.add("PLC2.OP010.WorkOrderRequest");//请求工单


        lists.add("PLC2.OP020.RecordData");


        lists.add("PLC2.OP040.RecordData");


        lists.add("PLC2.OP045.RecordData");


        lists.add("PLC2.OP060.RecordData");


        lists.add("PLC2.OP070.RecordData");


        lists.add("PLC2.OP075.RecordData");


        lists.add("PLC2.OP080.RecordData");


        lists.add("PLC2.OP090.RecordData");


        lists.add("PLC2.OP095-1.RecordData");


        lists.add("PLC2.OP095-2.RecordData");


        lists.add("PLC2.OP100-1.RecordData");


        lists.add("PLC2.OP100-2.RecordData");


        lists.add("PLC2.OP120.RecordData");


        lists.add("PLC2.P010.RecordData");


        lists.add("PLC2.P010.WorkOrderRequest");//请求工单


        //PLC3


        lists.add("PLC3.OP130.RecordData");


        lists.add("PLC3.OP145-1.RecordData");


        lists.add("PLC3.OP145-2.RecordData");


        lists.add("PLC3.OP150-1.RecordData");


        lists.add("PLC3.OP150-2.RecordData");


        lists.add("PLC3.OP160.RecordData");


        lists.add("PLC3.OP165-1.RecordData");


        lists.add("PLC3.OP165-2.RecordData");


        lists.add("PLC3.OP170-1.RecordData");


        lists.add("PLC3.OP170-2.RecordData");


        lists.add("PLC3.OP180.RecordData");


        lists.add("PLC3.OP190-1.RecordData");


        lists.add("PLC3.OP190-2.RecordData");


        lists.add("PLC3.OP200-1.RecordData");


        lists.add("PLC3.OP200-2.RecordData");


        lists.add("PLC3.OP210-1.RecordData");


        lists.add("PLC3.OP210-2.RecordData");


        lists.add("PLC3.OP220-1.RecordData");


        lists.add("PLC3.OP220-2.RecordData");


        lists.add("PLC3.OP230-1.RecordData");


        lists.add("PLC3.OP230-2.RecordData");


        lists.add("PLC3.OP240-1.RecordData");


        lists.add("PLC3.OP240-2.RecordData");


        lists.add("PLC3.OP250-1.RecordData");


        lists.add("PLC3.OP250-2.RecordData");


        lists.add("PLC3.OP260-1.RecordData");


        lists.add("PLC3.OP260-2.RecordData");


        lists.add("PLC3.OP270-1.RecordData");


        lists.add("PLC3.OP270-2.RecordData");


        lists.add("PLC3.OP275.RecordData");


        lists.add("PLC3.OP280.RecordData");


        lists.add("PLC3.OP290-1.RecordData");


        lists.add("PLC3.OP290-2.RecordData");


        lists.add("PLC3.OP295.RecordData");


        lists.add("PLC3.OP300.RecordData");


        lists.add("PLC3.OP310.RecordData");


        //PLC4


        lists.add("PLC4.C040.RecordData");


        lists.add("PLC4.OP030.RecordData");


        lists.add("PLC4.OP050.RecordData");


        lists.add("PLC4.OP070.RecordData");


        lists.add("PLC3.OP110.RecordData");


        lists.add("PLC3.OP140.RecordData");


//        //PLC1


//        lists.add("PLC1.C005.RecordData");


//        lists.add("PLC1.C005.WorkOrderRequest");//请求工单


//        lists.add("PLC1.C010.RecordData");


//        lists.add("PLC1.C020.RecordData");


//        lists.add("PLC1.C030.RecordData");


//        lists.add("PLC1.C050.RecordData");


//        lists.add("PLC1.C060.RecordData");


//        //PLC2


//        lists.add("PLC2.OP005.RecordData");


//        lists.add("PLC2.OP010.WorkOrderRequest");//请求工单


//        lists.add("PLC2.OP020.RecordData");


//        lists.add("PLC2.OP040.RecordData");


//        lists.add("PLC2.OP045.RecordData");


//        lists.add("PLC2.OP060.RecordData");


//        lists.add("PLC2.OP070.RecordData");


//        lists.add("PLC2.OP075.RecordData");


//        lists.add("PLC2.OP080.RecordData");


//        lists.add("PLC2.OP090.RecordData");


//        lists.add("PLC2.OP095-1.RecordData");


//        lists.add("PLC2.OP095-2.RecordData");


//        lists.add("PLC2.OP100-1.RecordData");


//        lists.add("PLC2.OP100-2.RecordData");


//        lists.add("PLC2.OP120.RecordData");


//        lists.add("PLC2.P010.RecordData");


//        lists.add("PLC2.P010.WorkOrderRequest");//请求工单


//        //PLC3


//        lists.add("PLC3.OP130.RecordData");


//        lists.add("PLC3.OP145-1.RecordData");


//        lists.add("PLC3.OP145-2.RecordData");


//        lists.add("PLC3.OP150-1.RecordData");


//        lists.add("PLC3.OP150-2.RecordData");


//        lists.add("PLC3.OP160.RecordData");


//        lists.add("PLC3.OP165-1.RecordData");


//        lists.add("PLC3.OP165-2.RecordData");


//        lists.add("PLC3.OP170-1.RecordData");


//        lists.add("PLC3.OP170-2.RecordData");


//        lists.add("PLC3.OP180.RecordData");


//        lists.add("PLC3.OP190-1.RecordData");


//        lists.add("PLC3.OP190-2.RecordData");


//        lists.add("PLC3.OP200-1.RecordData");


//        lists.add("PLC3.OP200-2.RecordData");


//        lists.add("PLC3.OP210-1.RecordData");


//        lists.add("PLC3.OP210-2.RecordData");


//        lists.add("PLC3.OP220-1.RecordData");


//        lists.add("PLC3.OP220-2.RecordData");


//        lists.add("PLC3.OP230-1.RecordData");


//        lists.add("PLC3.OP230-2.RecordData");


//        lists.add("PLC3.OP240-1.RecordData");


//        lists.add("PLC3.OP240-2.RecordData");


//        lists.add("PLC3.OP250-1.RecordData");


//        lists.add("PLC3.OP250-2.RecordData");


//        lists.add("PLC3.OP260-1.RecordData");


//        lists.add("PLC3.OP260-2.RecordData");


//        lists.add("PLC3.OP270-1.RecordData");


//        lists.add("PLC3.OP270-2.RecordData");


//        lists.add("PLC3.OP275.RecordData");


//        lists.add("PLC3.OP280.RecordData");


//        lists.add("PLC3.OP290-1.RecordData");


//        lists.add("PLC3.OP290-2.RecordData");


//        lists.add("PLC3.OP295.RecordData");


//        lists.add("PLC3.OP300.RecordData");


//        lists.add("PLC3.OP310.RecordData");


//        //PLC4


//        lists.add("PLC4.C040.RecordData");


//        lists.add("PLC4.OP030.RecordData");


//        lists.add("PLC4.OP050.RecordData");


//        lists.add("PLC4.OP070.RecordData");


//        lists.add("PLC3.OP110.RecordData");


//        lists.add("PLC3.OP140.RecordData");




        //TEST


        lists.add("TEST.C005.RecordData");


        lists.add("TEST.C005.WorkOrderRequest");


        lists.add("TEST.C060.RecordData");


        lists.add("TEST.OP005.RecordData");


        lists.add("TEST.OP005.WorkOrderRequest");


        lists.add("TEST.OP010.RecordData");


        lists.add("TEST.OP310.RecordData");


        lists.add("TEST.P010.RecordData");


        lists.add("TEST.P010.WorkOrderRequest");