From 17b8d077f7efe3db20344987cdad9da9d9ab3de6 Mon Sep 17 00:00:00 2001 From: wu <731351411@qq.com> Date: 星期五, 03 十一月 2023 15:21:11 +0800 Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes --- springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java | 38 ++++++++++++++++++++++++++++---------- 1 files changed, 28 insertions(+), 10 deletions(-) diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java index c7f169c..f91920e 100644 --- a/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java +++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plcsign.java @@ -4,28 +4,46 @@ import java.util.ArrayList; import java.util.List; +import java.util.Arrays; public class Plcsign extends Thread { @Override public void run() { while (this != null) { try { - Thread.sleep(10000); + Thread.sleep(1000); } catch (InterruptedException e) { e.printStackTrace(); } - List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.DBX0.0", 58); - if (plclist == null) { + List<Boolean> plclist = S7control.getinstance().ReadBits("DB102.0.0", 44); + List<Boolean> plclist2 = S7control.getinstance().ReadBits("DB102.5.5", 13); - } else { + // Boolean[] values = { true, false, true, false, true, false, true, false, + // true, false, true, false, true, false, + // true, false, true, false, true, false, true, false, true, false, true, false, + // true, false, true, false, true, + // false, true, false, true, false, + // true, false, true, false, true, false, true, false, }; + // List<Boolean> plclist = new ArrayList<>(Arrays.asList(values)); + + // Boolean[] values2 = { true, false, + // true, false, true, false, true, false, + // true, false, true, false, true, }; + // List<Boolean> plclist2 = new ArrayList<>(Arrays.asList(values2)); + + // 灏唒lclist2鐨勫厓绱犳坊鍔犲埌plclist涓� + plclist.addAll(plclist2); + // System.out.println(plclist); + if (plclist != null) { + // 灏嗚幏鍙栫殑甯冨皵绫诲瀷杞崲涓烘暣鏁扮被鍨� + List<Integer> Intlist = new ArrayList<>(); + for (Boolean value : plclist) { + Intlist.add(value == true ? 0 : 1); + + } JSONObject jsonObject = new JSONObject(); - // jsonObject3.append("sig", - // new short[] { 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, - // 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, - // 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, 0, 0, 0, 0, 0, 1, 0, 1, 0, 1, 0, 1, 0, 1, - // }); - jsonObject.append("sig", plclist); + jsonObject.append("sig", Intlist); WebSocketServer sendwServer3 = WebSocketServer.sessionMap.get("Sign"); if (sendwServer3 != null) { sendwServer3.sendMessage(jsonObject.toString()); -- Gitblit v1.8.0