From 2ffc28265a96d2305c2957ecae464d606bb51d48 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期五, 05 一月 2024 15:04:00 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/CanadaMes
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 301 ++++++++++++++++++++++++++------------------------
1 files changed, 157 insertions(+), 144 deletions(-)
diff --git a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
index bbff53e..87e0a12 100644
--- a/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
+++ b/springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java
@@ -18,7 +18,6 @@
import com.example.springboot.entity.alarmmg;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
-import com.example.springboot.service.StorageCageService;
public class Plchome extends Thread {
@@ -32,6 +31,8 @@
// 鍑虹墖闃熷垪鏄惁鍏佽鍑虹墖
public static Boolean isAllowQueue = true;
public static Boolean isAllowReordering = true;
+ //鍑虹墖闃熷垪璀﹀憡
+ public static Boolean isQueueWarning=false;
// 閾濇id
public static String FrameNo = "";
// 鏄惁闇�瑕佹墜鍔ㄧ‘璁ょ幓鐠�
@@ -39,10 +40,7 @@
private Configuration config;
-
-
- private StorageCageService storageCageService;
-
+ private StorageCageService storageCageService;
public Plchome() throws IOException {
config = new Configuration("config.properties");
@@ -108,100 +106,117 @@
jsonObject.append("listoutslice", listoutslice);
// 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
+ //鑾峰彇鍑虹墖闃熷垪璀﹀憡鐘舵��
+ jsonObject.append("isQueueWarning", Plchome.isQueueWarning);
// 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
-
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
- List<String> addressList = new ArrayList<String>();
- addressList.add("DB106.12");
- addressList.add("DB106.0");
- List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
- if (paramlist != null) {
- jsonObject.append("params", paramlist);
- }
- // 鑾峰彇杩涚墖杞︾姸鎬�
- List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
- 1);// 鑾峰彇杩涚墖杞︾姸鎬�
- boolean exist1 = datas1ListState.contains((short) 0);
- jsonObject.append("zhuangtai", exist1);
- // 鑾峰彇杩涚墖鐜荤拑淇℃伅
- List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
- if (inglassInfo != null) {
- if (inglassInfo.size() > 0)
- jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
- }
-
- // 鑾峰彇閾濇idDB106.DBW64
- String frameno = spianService.queGlassid("DB103.270", 14).toString();
- // String frameno="X12345611002GV";
- if (!frameno.equals(Plchome.FrameNo)) {
- Plchome.FrameNo = frameno;
- try {
- north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
- } catch (SQLException e) {
- // TODO Auto-generated catch block
- e.printStackTrace();
+ // String framenos="X21763329601FB";
+ // if (!framenos.equals(Plchome.FrameNo)) {
+ // Plchome.FrameNo = framenos;
+ // try {
+ // north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ // } catch (SQLException e) {
+ // // TODO Auto-generated catch block
+ // e.printStackTrace();
+ // }
+ // }
+ if (S7control.getinstance().CheckConnected() == true) {
+ // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ List<String> addressList = new ArrayList<String>();
+ addressList.add("DB106.12");
+ addressList.add("DB106.0");
+ List<Short> paramlist = S7control.getinstance().ReadWord(addressList);
+ if (paramlist != null) {
+ jsonObject.append("params", paramlist);
}
- }
+ // 鑾峰彇杩涚墖杞︾姸鎬�
+ List<Short> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ if (datas1ListState != null) {
+ boolean exist1 = datas1ListState.contains((short) 0);
+ jsonObject.append("zhuangtai", exist1);
+ }
- // 鑾峰彇杩涚墖璇锋眰鐘舵��
- List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
- boolean D01RequestState = D01Request.contains((short) 1);
- // boolean D01RequestState =true;
- jsonObject.append("D01RequestState", D01RequestState);
-
- // 澶嶄綅鍊掕鏃�
- // 鍦板潃104.9.6
- List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
- for (Boolean countdowns : countdown) {
- jsonObject.append("countdown", countdowns);
- }
- // jsonObject.append("countdown", true);
- // 澶嶄綅瀹屾垚淇″彿
- List<Boolean> resets = S7control.getinstance().ReadBits("DB103.284", 1);
- for (Boolean reset : resets) {
- jsonObject.append("reset", reset);
- }
-
- // 鏄惁鎬ュ仠
- List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
- 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;
- }
-
- System.out.println(resets);
- for (short number : resets2) {
-
- if (number == 1) {
- System.out.println(resets);
- jsonObject.append("Abort", anniuparams);
+ // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+ List<Short> inglassInfo = S7control.getinstance().ReadWord("DB106.24", 1);
+ if (inglassInfo != null) {
+ if (inglassInfo.size() > 0) {
+ jsonObject.append("loadglassheight", inglassInfo.get(0) * 70);
+ }
}
- }
+ // 鑾峰彇閾濇idDB106.DBW64锛屾坊鍔犲埌鍑虹墖闃熷垪
+ String frameno = spianService.queGlassid("DB103.270", 14).toString();
+ // String frameno="X12345611002GV";
+ // frameno="X21763329601FB";
+ if (!frameno.equals(Plchome.FrameNo)) {
+ Plchome.FrameNo = frameno;
+ try {
+ north_Glass_Buffer1Service.AddOutSliceS(Plchome.FrameNo);
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ e.printStackTrace();
+ }
+ }
+ // 鑾峰彇杩涚墖璇锋眰鐘舵��
+ List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+ boolean D01RequestState = D01Request.contains((short) 1);
+ // boolean D01RequestState =true;
+ jsonObject.append("D01RequestState", D01RequestState);
+
+ // 澶嶄綅鍊掕鏃�
+ // 鍦板潃104.9.6
+ List<Boolean> countdown = S7control.getinstance().ReadBits("DB104.9.6", 1);
+ for (Boolean countdowns : countdown) {
+ jsonObject.append("countdown", countdowns);
+ }
+ // jsonObject.append("countdown", true);
+ // 澶嶄綅瀹屾垚淇″彿ss
+ List<Boolean> resetss = S7control.getinstance().ReadBits("DB103.284", 1);
+ for (Boolean reset : resetss) {
+ jsonObject.append("reset", reset);
+ }
+
+ // 鏄惁鎬ュ仠
+ List<Boolean> emergencystops = S7control.getinstance().ReadBits("DB104.5.1", 1);
+ 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);
+
+ // }
+
+ // }
+ }
// 閾濇绾夸氦浜�
@@ -245,71 +260,69 @@
if (webserver != null) {
-
List<String> messages = webserver.getMessages();
if (!messages.isEmpty()) {
- // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
- String lastMessage = messages.get(messages.size() - 1);
-// System.out.println("lastMessage锛�" + lastMessage);
- JSONArray messageArray = new JSONArray(lastMessage);
+ // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ // String lastMessage = messages.get(messages.size() - 1);
+ // System.out.println("lastMessage锛�" + lastMessage);
+ // JSONArray messageArray = new JSONArray(lastMessage);
+
+ // try {
+ // // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
+ // if (messageArray.getJSONArray(0).size() > 0) {
+ // // 鑾峰彇娑堟伅鏁扮粍
+ // JSONArray jsonArray = messageArray.getJSONArray(0);
+ // // 鍒涘缓涓�涓竷灏斿�煎垪琛�
+ // List<Boolean> sValue = new ArrayList<>();
+ // // 閬嶅巻娑堟伅鏁扮粍
+ // for (int i = 0; i < jsonArray.size(); i++) {
+ // // 鑾峰彇娑堟伅鏁扮粍涓殑鍊�
+ // Object value = jsonArray.get(i);
+ // // 妫�鏌ュ�兼槸鍚︽湁鏁�
+ // if (value != null && !value.toString().equals("null")) {
+ // try {
+ // // 绉婚櫎闈炴暟瀛楀拰鏁板瓧瀛楃
+ // String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
+ // // 瑙ｆ瀽涓哄竷灏斿��
+ // boolean val = "1".equals(cleanedValue.trim());
+ // // 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
+ // sValue.add(val);
+ // System.out.println(
+ // "messageValue: " + Arrays.asList(val) + " added to the list");
+ // } catch (NumberFormatException e) {
+ // // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
+ // System.err.println("Could not parse value: " + value);
+ // }
+ // }
+ // }
+ // // 缁堟杩涚墖浠诲姟
+ // boolean Value1 = sValue.get(0);
+ // boolean Value2 = sValue.get(1);
- try {
- // 妫�鏌ョ储寮曟槸鍚︽湁鏁�
- if (messageArray.getJSONArray(0).size() > 0) {
- // 鑾峰彇娑堟伅鏁扮粍
- JSONArray jsonArray = messageArray.getJSONArray(0);
- // 鍒涘缓涓�涓竷灏斿�煎垪琛�
- List<Boolean> sValue = new ArrayList<>();
- // 閬嶅巻娑堟伅鏁扮粍
- for (int i = 0; i < jsonArray.size(); i++) {
- // 鑾峰彇娑堟伅鏁扮粍涓殑鍊�
- Object value = jsonArray.get(i);
- // 妫�鏌ュ�兼槸鍚︽湁鏁�
- if (value != null && !value.toString().equals("null")) {
- try {
- // 绉婚櫎闈炴暟瀛楀拰鏁板瓧瀛楃
- String cleanedValue = value.toString().replaceAll("[^0-9-]", "");
- // 瑙ｆ瀽涓哄竷灏斿��
- boolean val = "1".equals(cleanedValue.trim());
- // 灏嗗竷灏斿�兼坊鍔犲埌甯冨皵鍊煎垪琛ㄤ腑
- sValue.add(val);
- System.out.println("messageValue: " + Arrays.asList(val) + " added to the list");
+ // if (Value1) {
+ // storageCageService.EndTask(0);
+ // }
+ // if (Value2) {
+ // storageCageService.EndTask(1);
- } catch (NumberFormatException e) {
- // 濡傛灉鏃犳硶瑙ｆ瀽涓� boolean 绫诲瀷锛屽垯蹇界暐璇ラ儴鍒�
- System.err.println("Could not parse value: " + value);
- }
- }
- }
-// 缁堟杩涚墖浠诲姟
- boolean Value1 = sValue.get(0);
- boolean Value2 = sValue.get(1);
+ // }
+ // // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
+ // if (!sValue.isEmpty()) {
- if (Value1) {
- storageCageService.EndTask(0);
-
- }
- if (Value2) {
- storageCageService.EndTask(1);
-
- }
- // 妫�鏌ュ竷灏斿�煎垪琛ㄦ槸鍚︿负绌�
- if (!sValue.isEmpty()) {
-
- // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
- S7control.getinstance().WriteBit(niuanaddressList3, sValue);
- System.out.println("Values " + sValue + " written to PLC at address " + niuanaddressList3);
- }
- }
- } catch (Exception e) {
- System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
- }
+ // // 璋冪敤 S7control.getinstance().WriteBit 鏂规硶灏嗗竷灏斿�煎垪琛ㄥ啓鍏ュ湴鍧�鍒楄〃
+ // S7control.getinstance().WriteBit(niuanaddressList3, sValue);
+ // System.out.println(
+ // "Values " + sValue + " written to PLC at address " + niuanaddressList3);
+ // }
+ // }
+ // } catch (Exception e) {
+ // System.err.println("An error occurred while writing bit to PLC: " + e.getMessage());
+ // }
webserver.clearMessages();
}
-
}
--
Gitblit v1.8.0