加拿大MES项目
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
wuyouming666
2024-01-26 3fdf3c82bc1ac5f5fdce0f841db7bdeacf75704c 
 springboot-vue3/src/main/java/com/example/springboot/component/PLCAutomaticParameterSettingReview.java


@@ -26,9 +26,9 @@


        this.storageCageService = storageCageService;


        this.plcParameterObject = new PlcParameterObject();


        this.plcBitObject = new PlcBitObject();


        // String jsonFilePath = "JsonFile/PlcParameter.json";


        // String jsonFilePath = "/JsonFile/PlcParameter.json";


        // InitUtil.initword(jsonFilePath); // 初始化 PlcParameterObject


        // String jsonFilePath2 = "JsonFile/PlcSign.json";


        // String jsonFilePath2 = "/JsonFile/PlcSign.json";


        // InitUtil.initbit(jsonFilePath2); // 初始化 PlcSign






@@ -49,18 +49,22 @@


                e.printStackTrace();


            }




            byte[] getplcvlues = S7control.getinstance().ReadByte(plcParameterObject.getPlcAddressBegin(), plcParameterObject.getPlcAddressLength());




            //byte[] getplcvlues = {0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02, 0x03, 0x04,0x01, 0x02};




            plcParameterObject.setPlcParameterList(getplcvlues);








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


            addresses.add("A01turnAngle1");


            addresses.add("A01turnAngle2");


            addresses.add("A01turnAngle3");


            addresses.add("A01turnAngle4");


            addresses.add("A02turnAngle2");


            addresses.add("A02turnAngle3");


            addresses.add("A02turnAngle4");


            addresses.add("Minimumglasslength");


//            List<String> addresses = new ArrayList<>();


//            addresses.add("A01turnAngle1");


//            addresses.add("A01turnAngle2");


//            addresses.add("A01turnAngle3");


//            addresses.add("A01turnAngle4");


//            addresses.add("A02turnAngle2");


//            addresses.add("A02turnAngle3");


//            addresses.add("A02turnAngle4");


//            addresses.add("Minimumglasslength");






            //Auto.addresses=DB100.0,DB100.2,DB100.4,DB100.6,DB100.26,DB100.28,DB100.30,DB100.32,DB100.34,DB100.36,DB100.38,DB100.40


@@ -73,7 +77,6 @@


            Autoaddresses.add("A01A02conveyorVelocity(AutoFAST)");


            Autoaddresses.add("A01A02conveyorVelocity(AutoSLOW)");


            Autoaddresses.add("B01B02conveyorVelocity(Manual)");




            Autoaddresses.add("B01B02conveyorVelocity(Max)");


            Autoaddresses.add("B01B02conveyorVelocity(AutoFAST)");


            Autoaddresses.add("B01B02conveyorVelocity(AutoSLOW)");


@@ -109,13 +112,13 @@


            // new short[]{1,1, 1, 1, 1, 1, 2, 33, 2,3, 4, 5}


            // new short[]{0,0, 0, 0, 0, 0, 0, 0, 0, 0}


//System.out.println(plcParameterObject.getPlcParameterValues(addresses));


            jsonObject.append("params",  plcParameterObject.getPlcParameterValues(addresses));


            jsonObject.append("dache1", plcParameterObject.getPlcParameter("A01A02TRAVELPOSVelocityAUTO").getValue());


            jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("B01B02TRAVELPOSVelocityAUTO").getValue());


            jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("A01A02TURNPOSVelocityAUTO").getValue());


            jsonObject.append("params2", plcParameterObject.getPlcParameterValues(Autoaddresses));


            jsonObject.append("fanzhuan2", plcParameterObject.getPlcParameter("A01A02TURNJOGVelocity").getValue());


            jsonObject.append("xiaoche2",  plcParameterObject.getPlcParameter("B01B02TRAVELJOGVelocity").getValue());


          //  jsonObject.append("params",  plcParameterObject.getPlcParameterValues(addresses));


//            jsonObject.append("dache1", plcParameterObject.getPlcParameter("A01A02TRAVELPOSVelocityAUTO").getValue());


//            jsonObject.append("xiaoche", plcParameterObject.getPlcParameter("B01B02TRAVELPOSVelocityAUTO").getValue());


//            jsonObject.append("fanzhuan", plcParameterObject.getPlcParameter("A01A02TURNPOSVelocityAUTO").getValue());


//            jsonObject.append("params2", plcParameterObject.getPlcParameterValues(Autoaddresses));


//            jsonObject.append("fanzhuan2", plcParameterObject.getPlcParameter("A01A02TURNJOGVelocity").getValue());


//            jsonObject.append("xiaoche2",  plcParameterObject.getPlcParameter("B01B02TRAVELJOGVelocity").getValue());




            ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("AutomaticParameterSetting");


//            if (sendwServer != null) {