From 63574bf6cf94613385cb8d0e2c2beb1829f644b5 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 09 五月 2024 11:50:35 +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 | 60 ++++++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 42 insertions(+), 18 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 b11acd4..ffe97fa 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
@@ -49,6 +49,11 @@
public static StringBuilder feedglassid;
+ public static Boolean dbconnected = false;
+
+ public static Boolean plc1 = true;
+ public static Boolean plc2 = false;
+
// public Plchome() throws IOException {
// config = new Configuration("config.properties");
// }
@@ -57,10 +62,12 @@
// b.put()
@Override
public void run() {
+
while (this != null) {
Short zhi = 0;
JSONObject jsonObject = new JSONObject();
jsonObject.append("feedglassid", feedglassid);
+
try {
Thread.sleep(1000);
// 娉ㄥ叆mapper
@@ -73,15 +80,15 @@
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- boolean dbconnected = false;
+ // boolean dbconnected = false;
try {
dbserve.getConn();
dbconnected = true;
} catch (Exception e) {
e.printStackTrace();
dbconnected = false;
+ log.info("dbconnected:" + dbconnected);
}
- log.info("dbconnected:"+dbconnected);
jsonObject.append("dbconnected", dbconnected);
// // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
// String CurrrentGlassId = "X22595911002GV";
@@ -160,14 +167,27 @@
// String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
// String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
-
- // 閾濇绾夸氦浜�
- if (S7controlLK.getinstance().CheckConnected() == true) {
+ try {
+ // 閾濇绾夸氦浜�
+ // if (S7controlLK.getinstance().CheckConnected() == true) {
// E02鐜荤拑id
- String E02id = S7controlLK.getinstance().readStrings("DB17.40");
+ // log.info("frame1"+S7controlLK.getinstance().CheckConnected());
+ String E02id="";
+ try {
+ E02id= S7controlLK.getinstance().readStrings("DB17.40");
+ plc2=true;
+ } catch (Exception e) {
+ // TODO: handle exception
+ plc2=false;
+ e.printStackTrace();
+ }
+
+ jsonObject.append("Plc2", plc2);
+ // log.info("閾濇绾胯鍙�2"+S7controlLK.getinstance().CheckConnected());
+
// log.info("E02id"+E02id);
outSliceServive.FrameStateUpdate(E02id);
- if (CurrentFrame.getBarCode() != null) {
+ if (CurrentFrame != null) {
S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
}
String J01id = S7controlLK.getinstance().readStrings("DB17.22");
@@ -185,10 +205,10 @@
e.printStackTrace();
}
Short send;
- if (position.equals("0")) {
- send = 2;
- } else {
+ if (position.equals("1")) {
send = 1;
+ } else {
+ send = 2;
}
if (J01id != null) {
int barcodeState = spianMapper.SelectOverState(J01id);// 鑾峰彇璇ラ摑妗嗙殑鐘舵��
@@ -199,18 +219,20 @@
}
S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
}
-
+
String E01id = S7controlLK.getinstance().readStrings("DB17.0");
// log.info("frameno:" + E01id);
List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
// log.info("frameflip:" + liststates);
- }else{
- jsonObject.append("Plc2", false);
+ // }else{
+ // log.info("Plc2"+S7controlLK.getinstance().CheckConnected());
+ // jsonObject.append("Plc2", false);
+ // }
+ } catch (Exception e) {
+ e.printStackTrace();
}
if (S7control.getinstance().CheckConnected() == true) {
-
-
// 鑾峰彇褰撳墠鎵爜鏂瑰紡
List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
@@ -364,11 +386,13 @@
}
}
}
- }else{
- jsonObject.append("Plc1", false);
+ plc1=true;
+ } else {
+ plc1=false;
+ log.info("Plc1" + S7controlLK.getinstance().CheckConnected());
}
jsonObject.append("zhi", zhi);
-
+ jsonObject.append("Plc1", plc1);
// jsonObject.append("params", new short[] { 30, 40, });
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
if (sendwServer != null) {
--
Gitblit v1.8.0