From 3614b4f694d9d40708df6477d56a40b9311ad48a Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期三, 31 一月 2024 14:50:17 +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 | 289 ++++++++++++++++++++++++++++-----------------------------
1 files changed, 143 insertions(+), 146 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 5601296..a1e7574 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
@@ -7,16 +7,20 @@
import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.HashMap;
import java.util.List;
+import java.util.Map;
import com.example.springboot.service.*;
import org.springframework.beans.factory.annotation.Autowired;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
import com.example.springboot.entity.alarmmg;
import com.example.springboot.entity.north_glass_buffer1;
+import com.example.springboot.entity.device.PlcParameterObject;
import com.example.springboot.mapper.HomeMapper;
import com.example.springboot.mapper.SpianMapper;
@@ -45,6 +49,8 @@
private StorageCageService storageCageService;
+ public static Boolean FeedState = false;
+
// public Plchome() throws IOException {
// config = new Configuration("config.properties");
// }
@@ -54,115 +60,115 @@
@Override
public void run() {
while (this != null) {
+ JSONObject jsonObject = new JSONObject();
try {
Thread.sleep(1000);
+ // 娉ㄥ叆mapper
+ homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
+ spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
+ spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
+ outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
+ north_Glass_Buffer1Service = WebSocketServer.applicationContext
+ .getBean(North_Glass_Buffer1Service.class);
+ storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
+ dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- JSONObject jsonObject = new JSONObject();
+ // 绗煎瓙浣跨敤鎯呭喌
+ List<StorageCage> tableData = homeMapper.selectAll();
+ jsonObject.append("tableData", tableData);
+ // 鏍肩悊鐗囩鏍煎瓙鐘舵��
+ List<StorageCage> cagelist1 = homeMapper.selectRack1();
+ List<StorageCage> cagelist2 = homeMapper.selectRack2();
+ List<StorageCage> cagelist3 = homeMapper.selectRack3();
+ List<StorageCage> cagelist4 = homeMapper.selectRack4();
+ jsonObject.append("cagelist1", cagelist1);
+ jsonObject.append("cagelist2", cagelist2);
+ jsonObject.append("cagelist3", cagelist3);
+ jsonObject.append("cagelist4", cagelist4);
+ // 杩涘嚭鐗囦换鍔�
+ List<StorageCage> tasklist1 = homeMapper.selectinout(3);
+ List<StorageCage> tasklist2 = homeMapper.selectinout(2);
+ jsonObject.append("tasklist1", tasklist1);
+ jsonObject.append("tasklist2", tasklist2);
+ // 鏌ヨ鎶ヨ淇℃伅
+ List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
+ jsonObject.append("alarmmg", alarmmg);
- // 娉ㄥ叆mapper
+ // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
+ String queid = spianMapper.Selectqueueid();
+ int state = spianMapper.Selectqueuestate();
+ jsonObject.append("queid", queid);
+ jsonObject.append("state", state);
+ // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
+ Queue form2 = homeMapper.GetQueueInfo(2);
+ Queue form3 = homeMapper.GetQueueInfo(1);
+ if (form2.getglassId() != null && form2.getglassId() != "") {
+ jsonObject.append("form2", form2);
+ }
+ if (form3.getglassId() != null && form3.getglassId() != "") {
+ jsonObject.append("form3", form3);
+ }
+ // 鑾峰彇鍑虹墖闃熷垪淇℃伅
+ List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
+ jsonObject.append("listoutslice", listoutslice);
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
+ jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
+ // 鑾峰彇鍑虹墖闃熷垪璀﹀憡鐘舵��
+ jsonObject.append("isQueueWarning", Plchome.isQueueWarning);
+ // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
+ jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
+ // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
+ jsonObject.append("isConfirm", isConfirm);
+ // 鏌ヨ褰撳墠閾濇淇℃伅
+ Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+ jsonObject.append("CurrentFrame", CurrentFrame);
- homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
- spianMapper = WebSocketServer.applicationContext.getBean(SpianMapper.class);
- spianService = WebSocketServer.applicationContext.getBean(SpianService.class);
- outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
- north_Glass_Buffer1Service = WebSocketServer.applicationContext.getBean(North_Glass_Buffer1Service.class);
- // 绗煎瓙浣跨敤鎯呭喌
- List<StorageCage> tableData = homeMapper.selectAll();
- jsonObject.append("tableData", tableData);
- // 鏍肩悊鐗囩鏍煎瓙鐘舵��
- List<StorageCage> cagelist1 = homeMapper.selectRack1();
- List<StorageCage> cagelist2 = homeMapper.selectRack2();
- List<StorageCage> cagelist3 = homeMapper.selectRack3();
- List<StorageCage> cagelist4 = homeMapper.selectRack4();
- jsonObject.append("cagelist1", cagelist1);
- jsonObject.append("cagelist2", cagelist2);
- jsonObject.append("cagelist3", cagelist3);
- jsonObject.append("cagelist4", cagelist4);
- // 杩涘嚭鐗囦换鍔�
- List<StorageCage> tasklist1 = homeMapper.selectinout(3);
- List<StorageCage> tasklist2 = homeMapper.selectinout(2);
- jsonObject.append("tasklist1", tasklist1);
- jsonObject.append("tasklist2", tasklist2);
- // 鏌ヨ鎶ヨ淇℃伅
- List<alarmmg> alarmmg = homeMapper.SelectAlarmmgInfo();
- jsonObject.append("alarmmg", alarmmg);
+ // String E01id = new String( S7controlLK.getinstance().ReadByte("DB17.0",16));
+ // String J01id = new String( S7controlLK.getinstance().ReadByte("DB17.22",14));
- // 浼� 鑾峰彇杩涙槸鍚︽湁寰呯‘璁ょ殑鐜荤拑id
- String queid = spianMapper.Selectqueueid();
- int state = spianMapper.Selectqueuestate();
- jsonObject.append("queid", queid);
- jsonObject.append("state", state);
- // 鑾峰彇鎵爜浣嶄笌涓婄墖浣嶇幓鐠冧俊鎭�
- Queue form2 = homeMapper.GetQueueInfo(2);
- Queue form3 = homeMapper.GetQueueInfo(1);
- if (form2.getglassId() != null && form2.getglassId() != "") {
- jsonObject.append("form2", form2);
- }
- if (form3.getglassId() != null && form3.getglassId() != "") {
- jsonObject.append("form3", form3);
- }
- // 鑾峰彇鍑虹墖闃熷垪淇℃伅
- List<Out_slice> listoutslice = outSliceServive.SelectProductionqueue();
- jsonObject.append("listoutslice", listoutslice);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪鍑虹墖鐘舵��
- jsonObject.append("isAllowQueue", Plchome.isAllowQueue);
- // 鑾峰彇鍑虹墖闃熷垪璀﹀憡鐘舵��
- jsonObject.append("isQueueWarning", Plchome.isQueueWarning);
- // 鑾峰彇褰撳墠鍑虹墖闃熷垪璋冨簭鐘舵��
- jsonObject.append("isAllowReordering", Plchome.isAllowReordering);
- // 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
- jsonObject.append("isConfirm", isConfirm);
- // 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
+ // if (S7control.getinstance().CheckConnected() == true) {
- // List<Short> listd17 = S7control.getinstance().ReadWord("DB17.0",10);
- // String id=spianService.queGlassid("DB17.10", 14).toString();
- //
- // // 閾濇绾夸氦浜�
- // try {
- // if (CurrentFrame != null) {
- // spianService.outmesid(CurrentFrame.getBarCode(), "DB17.0");
- // }
- // List<Short> framerequests = S7control.getinstance().ReadWord("閾濇id璇锋眰瀛楀湴鍧�", 1);
- // for (Short framerequest : framerequests) {
- // if (framerequest == 1) {
- // // 閾濇id
- // String franmeno = spianService.queGlassid("DB17.10", 14).toString();
- // String position;
- // try {
- // position = dbserve.SelectPositionByFrameBarcode(franmeno);
- // } catch (SQLException e) {
- // // TODO Auto-generated catch block
- // position = "0";
- // e.printStackTrace();
- // }
- // Short send;
- // if (position == "0") {
- // send = 0;
- // } else {
- // send = 1;
- // }
- // S7control.getinstance().WriteWord("閾濇缈昏浆鍙戦�佸湴鍧�", (short) send);
- // }
- // }
- // } catch (Exception e) {
- // // TODO: handle exception
- // }
+
- if (S7control.getinstance().CheckConnected() == true) {
+ // 閾濇绾夸氦浜�
+ if (S7controlLK.getinstance().CheckConnected() == true) {
+ if (CurrentFrame != null) {
+ S7controlLK.getinstance().writeStrings(CurrentFrame.getBarCode(), "DB17.0");
+ }
+ String E01id = S7controlLK.getinstance().readStrings("DB17.0");
+ String J01id = S7controlLK.getinstance().readStrings("DB17.22");
+
+ List<Short> liststates = S7controlLK.getinstance().ReadWord("DB17.38", 1);
+ List<Short> liststate = S7controlLK.getinstance().ReadWord("DB17.20", 1);
+ Short framerequest = liststate.get(0);
+ if (framerequest == 1) {
+ // 閾濇id
+ String position;
+ try {
+ position = dbserve.SelectPositionByFrameBarcode(J01id);
+ } catch (SQLException e) {
+ // TODO Auto-generated catch block
+ position = "0";
+ e.printStackTrace();
+ }
+ Short send;
+ if (position.equals("0")) {
+ send = 0;
+ } else {
+ send = 1;
+ }
+ S7controlLK.getinstance().WriteWord("DB17.38", (short) send);
+ }
+ }
+
// 鑾峰彇褰撳墠鎵爜鏂瑰紡
-
List<Boolean> Scanningmethods = S7control.getinstance().ReadBits("DB101.11.4", 1);
if (Scanningmethods != null) {
for (Boolean Scanningmethod : Scanningmethods) {
jsonObject.append("Scanningmethod", Scanningmethod);
}
}
-
+ // 鑾峰彇褰撳墠鎵爜鏋幓鐠僫d
String CurrrentGlassId = spianService.queGlassid("DB103.256", 14).toString();
jsonObject.append("CurrrentGlassId", CurrrentGlassId);
@@ -171,7 +177,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());
@@ -187,7 +193,7 @@
GlassIdList.add(spianService.queGlassid("DB103.114", 14).toString());
jsonObject.append("GlassIdList", GlassIdList);
- // 璇诲幓Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃甒
+ // 鑾峰彇Plc杩涚墖杞︿笌鍑虹墖杞︿綅缃�
List<String> addressList = new ArrayList<String>();
addressList.add("DB106.12");
addressList.add("DB106.0");
@@ -195,22 +201,21 @@
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> datas1ListState = S7control.getinstance().ReadWord("DB106.8",
+ // 1);// 鑾峰彇杩涚墖杞︾姸鎬�
+ // if (datas1ListState != null) {
+ // 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);
- }
-
- }
+ // // 鑾峰彇杩涚墖鐜荤拑淇℃伅
+ // 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="X21763329601FB";
String frameno = spianService.queGlassid("DB103.270", 14).toString();
@@ -240,12 +245,6 @@
jsonObject.append("AluminumFrame", AluminumFrame);
}
- // 鑾峰彇杩涚墖璇锋眰鐘舵��
- 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);
@@ -253,7 +252,7 @@
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);
@@ -264,40 +263,38 @@
for (Boolean emergencystop : emergencystops) {
jsonObject.append("emergencystop", emergencystop);
}
+ // 鑾峰彇杩涚墖璇锋眰鐘舵��
+ List<Short> D01Request = S7control.getinstance().ReadWord("DB106.24", 1);
+ boolean D01RequestState = D01Request.contains((short) 1);
+ jsonObject.append("D01RequestState", D01RequestState);
- // // 缁堟缁х画鎸夐挳
- // 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);
+ // 鑾峰彇杩涚墖鍙戦�佺姸鎬�
+ List<Short> D01respnse = S7control.getinstance().ReadWord("DB106.16", 1);
+ boolean D01ResponseState = D01respnse.contains((short) 1);
+ // jsonObject.append("D01RequestState", D01RequestState);
+ // 鑷姩杩涚墖
+ isConfirm=true;
+ if (isConfirm == true && form3.getglassId() != null && form3.getglassId() != "") {
+ if ((form3.getglassheight() < 380 || form3.getglasswidth() < 390 || form3.getglassheight() > 1810
+ || form3.getglasswidth() > 2760)
+ || (form3.getglassheight() < 390 || form3.getglasswidth() < 380
+ || form3.getglassheight() > 2760 || form3.getglasswidth() > 1810)) {
+ FeedState = true;
+ jsonObject.append("FeedState", FeedState);
+ FeedState = false;
+ } else {
+ if (D01RequestState == true && D01ResponseState != true) {
+ storageCageService.InsertQueueGlassId((short) 1, form3);
+ }
+ }
+ }
// }
- // }
+ } catch (InterruptedException e) {
+ e.printStackTrace();
}
- storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
- dbserve = WebSocketServer.applicationContext.getBean(JdbcConnections.class);
boolean dbconnected = false;
try {
dbserve.getConn();
--
Gitblit v1.8.0