From 28ded8102d83cf74bc232d1cdfc89b7f22c41952 Mon Sep 17 00:00:00 2001
From: wu <731351411@qq.com>
Date: 星期二, 03 十二月 2024 09:09:31 +0800
Subject: [PATCH] 增加点击防抖事件 增加笼子使用详情的计算优化。 增加数据推送时的报错处理 测量台交互逻辑增加 参数界面增加翻转加减速度
---
springboot-vue3/src/main/java/com/example/springboot/component/Plchome.java | 149 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 126 insertions(+), 23 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 3ac31c8..d8d8436 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
@@ -2,16 +2,20 @@
import cn.hutool.json.JSONObject;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
+import java.util.Map;
+
import com.example.springboot.service.*;
import org.apache.poi.ss.usermodel.Workbook;
import org.springframework.beans.factory.annotation.Autowired;
-import com.example.springboot.entity.FlowCard;
-import com.example.springboot.entity.FlowCard;
+import com.example.springboot.entity.Flowcard;
+import com.example.springboot.entity.Glass;
import com.example.springboot.entity.GlassInfo;
import com.example.springboot.entity.MeasureSetting;
+import com.example.springboot.entity.OutTask;
import com.example.springboot.entity.Out_slice;
import com.example.springboot.entity.Queue;
import com.example.springboot.entity.StorageCage;
@@ -31,6 +35,8 @@
private HomeMapper homeMapper;
@Autowired
private HomeService HomeService;
+ @Autowired
+ private GlassInfoMapper glassInfoMapper;
private QueueMapper QueueMapper;
private OutSliceServive outSliceServive;
@@ -63,19 +69,20 @@
@Override
public void run() {
+
while (this != null) {
JSONObject jsonObject = new JSONObject();
try {
- Thread.sleep(1000);
+ Thread.sleep(500);
// 娉ㄥ叆mapper
HomeService = WebSocketServer.applicationContext.getBean(HomeService.class);
QueueMapper = WebSocketServer.applicationContext.getBean(QueueMapper.class);
homeMapper = WebSocketServer.applicationContext.getBean(HomeMapper.class);
outSliceServive = WebSocketServer.applicationContext.getBean(OutSliceServive.class);
storageCageService = WebSocketServer.applicationContext.getBean(StorageCageService.class);
-
+ glassInfoMapper = WebSocketServer.applicationContext.getBean(GlassInfoMapper.class);
// 鑾峰彇鍏惰溅鐨勪綅缃�
- if (S7control.getinstance().CheckConnected() == true) {
+ if (S7control.getinstance().CheckConnected() == true && false) {
double carposition = 0;
float car = S7control.getinstance().readFloat32("DB10.1992");
carposition = (-40 + (car / (carend - carstart) * 595));
@@ -115,8 +122,8 @@
// 鏄惁闇�瑕佷汉宸ョ‘璁や笂鐗囩幓鐠�
jsonObject.append("isConfirm", isConfirm);
// 鏌ヨ褰撳墠閾濇淇℃伅
- Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
- jsonObject.append("CurrentFrame", CurrentFrame);
+ // Out_slice CurrentFrame = outSliceServive.SelectCurrentFrame();
+ // jsonObject.append("CurrentFrame", CurrentFrame);
// 璇诲彇DB105鍖烘枃浠�
PlcParameterObject plcmes = PLCAutoMes.PlcMesObject;
@@ -128,20 +135,68 @@
boolean istest = true;
// String PlcRequest = "1";
// String MesSend = "0";
- // double width = 0;
- // double height = 0;
+ // double width = 727;
+ // double height = 414;
// 鍖归厤
// System.err.println(PlcRequest+","+MesSend+","+width+","+height);
if (plcmes.getPlcParameter("GaToMES").getValue() != null) {
- String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// 璇锋眰
- String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// 鍙戦��
- double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());// 瀹�
+ String PlcRequest = plcmes.getPlcParameter("GaToMES").getValue();// plc璇锋眰瀛�
+ String MesSend = plcmes.getPlcParameter("MESToGaStatus").getValue();// mes鍙戦�佸瓧
+ String A01ToMES = plcmes.getPlcParameter("A01ToMES").getValue();// 鎵爜璇锋眰
+ String MESToA01 = plcmes.getPlcParameter("MESToA01").getValue();// 纭鎵爜
+ String Layer = plcmes.getPlcParameter("Layer").getValue();// 灞傚彿
+ String Mateid = plcmes.getPlcParameter("A01MateID").getValue();// 閰嶅鍙�
+ String Order = plcmes.getPlcParameter("A01OrderID").getValue();// 璁㈠崟鍙�
+ double width = Double.valueOf(plcmes.getPlcParameter("width").getValue());//
+ // 瀹�
double height = Double.valueOf(plcmes.getPlcParameter("Height").getValue());// 楂�
- if ("0".equals(PlcRequest) && istest) {
+
+ String celanedOrders = Order.replaceAll("[^a-zA-Z0-9.]", "").trim().split("\\.")[0];
+ String cleanedMateids = Mateid.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; // 绉婚櫎鎵�鏈夐潪鏁板瓧瀛楃
+ String cleanedLayers = Layer.replaceAll("[^0-9.]", "").trim().split("\\.")[0]; //
+
+ String celanedOrder = celanedOrders.isEmpty() ? "" : celanedOrders;
+ String cleanedMateid = cleanedMateids.isEmpty() ? "" : cleanedMateids;
+ String cleanedLayer = cleanedLayers.isEmpty() ? "" : cleanedLayers;
+
+ if ("4".equals(PlcRequest)) {
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 0);
+ System.out.println("鏀跺洓褰掗浂");
}
+ // 鎵爜璇锋眰鏃�
+ if ("1".equals(A01ToMES) && "0".equals(MESToA01) && "0".equals(MesSend) && "0".equals(PlcRequest)) {
+ if (cleanedMateid == "" || cleanedLayer == "") {
+ cleanedMateid = "0";
+ cleanedLayer = "0";
+ }
+ int cont = storageCageService.ScanMatch(celanedOrder, Integer.parseInt(cleanedMateid),
+ Integer.parseInt(cleanedLayer));
+ if (cont > 0) {
+ System.out.println("鎵爜鎴愬姛");
+ System.out.println(
+ "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
+
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(),
+ (short) 1);
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
+ (short) 1);
+ } else {
+ // QueueMapper.insertMatchFailure(1000, 1000, -1);
+ System.out.println(
+ "Order:" + celanedOrder + " Mateid:" + cleanedMateid + " Layer:" + cleanedLayer);
+ System.out.println("鎵爜娣诲姞澶辫触");
+ }
+
+ }
+ // 璇锋眰褰掗浂鏃�
+ if ("4".equals(A01ToMES)) {
+ System.out.println("鎵爜褰掗浂鎴愬姛");
+ S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToA01").getAddress(), (short) 0);
+ }
+
+ // 娴嬮噺璇锋眰鏃�
if ("1".equals(PlcRequest) && "0".equals(MesSend)) {
boolean is = HomeService.Normal(width, height, "1");
if (is && istest) {
@@ -150,7 +205,7 @@
(short) 1);
} else if (istest) {
- // 閲嶆柊娴嬮噺
+ // 鍖归厤澶辫触
S7control.getinstance().WriteWord(plcmes.getPlcParameter("MESToGaStatus").getAddress(),
(short) 4);
}
@@ -158,19 +213,25 @@
}
// S7control.getinstance().WriteWord("DB14.170", (short)0);
- Queue LastQueue = QueueMapper.selectLastQueue();
+
+ // 姝ｅ湪涓婄墖璁㈠崟涓殑鎵�鏈夊皬鐗囦俊鎭�
+ List<GlassInfo> glassInfoFlowCard = glassInfoMapper.selectOrderState(1);
+ jsonObject.append("glassInfoFlowCard", glassInfoFlowCard);
+
+ Queue LastQueue = QueueMapper.selectLastQueue2();
if (LastQueue == null) {
Queue nullQueue = new Queue();
nullQueue.setglassId("");
nullQueue.setglassheight(0);
nullQueue.setglasswidth(0);
nullQueue.setglassheightmm(0);
+ nullQueue.setglasstype(0);
nullQueue.setglasswidthmm(0);
jsonObject.append("LastQueue", nullQueue);
} else {
if (LastQueue.getstate() < 1) {
- LastQueue.setglasswidth(0);
- LastQueue.setglassheight(0);
+ LastQueue.setglasswidth(LastQueue.getglasswidthmm());
+ LastQueue.setglassheight(LastQueue.getglassheightmm());
}
jsonObject.append("LastQueue", LastQueue);
}
@@ -189,31 +250,73 @@
List<StorageTask> StoragTaskeTaskOut = storageCageService.SelectStorageTask(1);
jsonObject.append("StoragTaskeTaskOut", StoragTaskeTaskOut);
+ // 鏌ヨ褰撳墠鍑虹墖闃熷垪
+ List<Map> OutTask = storageCageService.SelectOutTask();
+ jsonObject.append("OutTask", OutTask);
+
+ // 鏌ヨ鏈�鍚�6娆″嚭鐗囪褰�
+ List<Map> OutLog = storageCageService.SelectOutLog();
+ jsonObject.append("OutLog", OutLog);
+
+ // 鏌ヨ鎵�鏈夌幓鐠冨帤搴﹀拰鑶滅郴
+ List<GlassInfo> SelectMeasure = storageCageService.SelectMeasure();
+ jsonObject.append("SelectMeasure", SelectMeasure);
+ // 鏌ヨ褰撳墠鑶滅郴鍘氬害
+ MeasureSetting SelectSetting = storageCageService.SelectSetting();
+ jsonObject.append("SelectSetting", SelectSetting);
+ // 鏌ヨ鐜板湪鐨勭幓鐠冨帤搴﹀拰鑶滅郴
+ Map StorageCageForm = storageCageService.StorageCageForm();
+ jsonObject.append("StorageCageForm", StorageCageForm);
+
// //鏌ヨ褰撳墠璁㈠崟浠诲姟
- List<FlowCard> OrderTask = storageCageService.SelectOrderTask();
+ List<Flowcard> OrderTask = storageCageService.SelectOrderTask();
jsonObject.append("OrderTask", OrderTask);
// jsonObject.append("params", new short[] { 30, 40, });
// System.out.println("jsonObject:" + jsonObject);
+
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("Home");
+
if (sendwServer != null) {
- for (WebSocketServer webserver : sendwServer) {
- webserver.sendMessage(jsonObject.toString());
+ try {
+ Iterator<WebSocketServer> iterator = sendwServer.iterator();
+ while (iterator.hasNext()) {
- if (webserver != null) {
-
+ WebSocketServer webserver = iterator.next();
+ webserver.sendMessage(jsonObject.toString());
List<String> messages = webserver.getMessages();
-
if (!messages.isEmpty()) {
// // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
webserver.clearMessages();
}
}
+ } catch (Exception e) {
+ e.printStackTrace(); // 鎵撳嵃鍫嗘爤淇℃伅锛屾柟渚垮畾浣嶉棶棰�
+ System.out.println("webserver鍑虹幇寮傚父: " + e.getMessage());
+ // TODO: handle exception
}
}
+ // ArrayList<WebSocketServer> sendwServer =
+ // WebSocketServer.sessionMap.get("Home");
+ // if (sendwServer != null) {
+ // for (WebSocketServer webserver : sendwServer) {
+ // webserver.sendMessage(jsonObject.toString());
+ // if (webserver != null) {
+ // List<String> messages = webserver.getMessages();
+
+ // if (!messages.isEmpty()) {
+ // // // 灏嗘渶鍚庝竴涓秷鎭浆鎹负鏁存暟绫诲瀷鐨勫垪琛�
+ // webserver.clearMessages();
+ // }
+ // }
+
+ // }
+ // }
+
} catch (InterruptedException e) {
+ System.out.println("绾跨▼鍑虹幇寮傚父");
e.printStackTrace();
}
}
--
Gitblit v1.8.0