合并读取文件

wu

2024-01-26 32cc6ae03421010d746902d9dc56a9cdf0290785

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

@@ -108,6 +108,20 @@

            List<String> B02start = Arrays.asList(config.getProperty("mlp.B02start"));

            // 故障地址
            List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));


            // 复位地址
            List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));
            List<Boolean> readreast = S7control.getinstance().readBits(waddresses6);
            short[] reast6 = PLCBooleanConverter.convertListsToBinaryShortArray(readreast);

            // 回零地址
            List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));
            List<Boolean> readhuiling = S7control.getinstance().readBits(waddresses7);
            short[] huiling7 = PLCBooleanConverter.convertListsToBinaryShortArray(readhuiling);

            List<Boolean> A01readstart = S7control.getinstance().readBits(A01start);
            List<Boolean> A02readstart = S7control.getinstance().readBits(A02start);
            List<Boolean> B01readstart = S7control.getinstance().readBits(B01start);
@@ -163,6 +177,8 @@
            jsonObject.append("guzhang", params2);
            jsonObject.append("weihuiling", params3);
            jsonObject.append("qidong", combinedBinaryShortArray);
            jsonObject.append("fuwei", reast6);
            jsonObject.append("huiling", huiling7);

//      WebSocketServer sendwServer = WebSocketServer.sessionMap.get("ManualonePosition");
//      if (sendwServer != null) {
@@ -179,16 +195,6 @@
                        List<String> messages = webserver.getMessages();


                        // 故障地址
                        List<String> waddresses5 = Arrays.asList(config.getProperty("PlcManualonePosition.fault2").split(","));


                        // 复位地址
                        List<String> waddresses6 = Arrays.asList(config.getProperty("PlcManualonePosition.Reset").split(","));


                        // 回零地址
                        List<String> waddresses7 = Arrays.asList(config.getProperty("PlcManualonePosition.Zero").split(","));



@@ -205,7 +211,6 @@

                            // 写入A02
                            customS7Control.WriteWordToPLC(messageArray, addresses2, 1);


                            // 写入B01
                            customS7Control.WriteWordToPLC(messageArray, addresses3, 2);