wuyouming666
2024-01-22 2883c25a71cb080258f5e17430ff5ee37c0061c2
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -153,7 +153,7 @@
            // // TODO: handle exception
            // }
            // if (S7control.getinstance().CheckConnected() == true) {
            if (S7control.getinstance().CheckConnected() == true) {
            // 获取当前扫码方式
            List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
@@ -163,7 +163,6 @@
                }
            }
            
            String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
            jsonObject.append("CurrrentGlassId", CurrrentGlassId);
@@ -172,7 +171,7 @@
            jsonObject.append("DeviceList", DeviceList);
            // 获取D01-D06,A01,A02,B01,B02玻璃id
            List<String> GlassIdList = new ArrayList<String>();
            GlassIdList.add(spianService.queGlassid("DB103.40", 14).toString());
                GlassIdList.add(spianService.queGlassid("DB103.44", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.58", 14).toString());
            GlassIdList.add(spianService.queGlassid("DB103.184", 14).toString());
@@ -265,37 +264,7 @@
            for (Boolean emergencystop : emergencystops) {
                jsonObject.append("emergencystop", emergencystop);
            }
            // // 终止继续按钮
            // List<String> niuanaddressList3 =
            // Arrays.asList(config.getProperty("Parameter2.stop").split(","));
            // List<Boolean> anniuread =
            // S7control.getinstance().readBits(niuanaddressList3);
            // // Boolean[] value4 = { false, false};
            // // List<Boolean> anniuread = new ArrayList<>(Arrays.asList(value4));
            // Boolean[] value5 = { true };
            // List<Boolean> resets = new ArrayList<>(Arrays.asList(value5));
            // short[] anniuparams = new short[anniuread.size()];
            // for (int i = 0; i < anniuread.size(); i++) {
            // boolean value = anniuread.get(i);
            // anniuparams[i] = value ? (short) 1 : (short) 0;
            // }
            // short[] resets2 = new short[resets.size()];
            // for (int i = 0; i < resets.size(); i++) {
            // boolean value = resets.get(i);
            // resets2[i] = value ? (short) 1 : (short) 0;
            // }
            // for (short number : resets2) {
            // if (number == 1) {
            // jsonObject.append("Abort", anniuparams);
            // }
            // }
            // }
            }
            storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
            dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);