Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes

wuyouming666

2024-01-22 2883c25a71cb080258f5e17430ff5ee37c0061c2

 springboot-vue3/src/main/java/com/example/springboot/component/PlcManualonePosition2.java

@@ -72,7 +72,7 @@
            addresses2.add("DB100.118");

            addresses2.add("DB100.192");



            addresses2.add("DB103.22");

            addresses2.add("DB106.14");

            List<Short> arraylist2 = S7control.getinstance().readWords(addresses2);



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

@@ -124,6 +124,32 @@
            short[] combinedBinaryShortArray = PLCBooleanConverter.convertListsToBinaryShortArray(

                    A01readstart, A02readstart

            );

            // 故障地址

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

            waddresses3.add("DB103.242");

            waddresses3.add("DB103.248");



            // 复位地址

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

            waddresses4.add("DB101.3.6");

            waddresses4.add("DB101.4.1");



            // 回零地址

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

            waddresses5.add("DB101.3.7");

            waddresses5.add("DB101.4.2");







            List<Boolean> readreast = S7control.getinstance().readBits(waddresses4);

            short[] reast6 = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(readreast);







            List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses5);

            short[] huiling7 = PlcManualonePosition.PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);







            JSONObject jsonObject = new JSONObject();



@@ -132,6 +158,9 @@
            jsonObject.append("guzhang", params2);

            jsonObject.append("weihuiling", params3);

            jsonObject.append("qidong", combinedBinaryShortArray);

            jsonObject.append("fuwei", reast6);

            jsonObject.append("huiling", huiling7);



            // System.out.println(jsonObject);

//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition2");

//      if (sendwServer != null) {

@@ -155,20 +184,6 @@
                        waddresses2.add("DB100.192");





                        // 故障地址

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

                        waddresses3.add("DB103.242");

                        waddresses3.add("DB103.248");



                        // 复位地址

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

                        waddresses4.add("DB101.3.6");

                        waddresses4.add("DB101.4.1");



                        // 回零地址

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

                        waddresses5.add("DB101.3.7");

                        waddresses5.add("DB101.4.2");



                        if (!messages.isEmpty()) {

                            // 将最后一个消息转换为 short 类型的列表

@@ -179,18 +194,14 @@
                            // A01下发

                            customS7Control.WriteWordToPLC(messageArray, waddresses1, 0);





                            // A02下发

                            customS7Control.WriteWordToPLC(messageArray, waddresses2, 1);





                            // 写入故障地址

                            customS7Control.WriteWordToPLC(messageArray, waddresses3, 2);





                            // 写入复位地址

                            customS7Control.writeBitToPLC(messageArray, waddresses4, 3);





                            // 写入回零地址

                            customS7Control.writeBitToPLC(messageArray, waddresses5, 4);