From 7c45d0dd5988ef391bdd13ebf2d4e69afce93f95 Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期六, 14 九月 2024 11:21:48 +0800
Subject: [PATCH] 展示数据方式BUG修改
---
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCRinse.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRWorks.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java | 4
UI-Project/src/utils/constants.js | 2
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java | 4
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java | 2
JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java | 4
UI-Project/src/views/Marking/marking.vue | 97 +++++++++++++++++++------------
11 files changed, 77 insertions(+), 56 deletions(-)
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
index d6ec90e..fd11c13 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/DeviceInteractionModuleApplication.java
@@ -18,7 +18,7 @@
@MapperScan("com.mes.*.mapper")
@EnableDiscoveryClient
@EnableSwagger2
-//@EnableScheduling
+@EnableScheduling
public class DeviceInteractionModuleApplication {
public static void main(String[] args) {
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
index 2ba0640..d17fa08 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MarkingTask.java
@@ -94,13 +94,13 @@
log.info("褰撳墠鏃犲叡宸ヤ綔鐨勪换鍔★紝鏃犳晥姹囨姤瀹屾垚锛�");
}
}
- //@Scheduled(fixedDelay = 1000)
+ @Scheduled(fixedDelay = 1000)
public void markingTasks() {
JSONObject jsonObject = new JSONObject();
Machine machine=machineMapper.selectById(11L);
List<Tasking> taskingList=taskingService.findMachineTask(machine);
jsonObject.append("taskingList", taskingList);
-
+ jsonObject.append("machine", machine);
ArrayList<WebSocketServer> sendwServer = WebSocketServer.sessionMap.get("marking");
if (sendwServer != null) {
for (WebSocketServer webserver : sendwServer) {
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
index 8ae22bb..a7cb3c9 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCEdging.java
@@ -25,7 +25,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void PLCEdging() {
//纾ㄨ竟杩涚墖璇锋眰淇″彿
String edgingSign = plcParameterObject.getPlcParameter("edgingSign").getValue();
@@ -49,7 +49,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void edgingWeb() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
index cfa5114..0d1f8c0 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCMechanicalArm.java
@@ -25,7 +25,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcEdging() {
//鏈烘鑷傝姹備俊鍙�
String request = plcParameterObject.getPlcParameter("request").getValue();
@@ -41,7 +41,7 @@
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void mechanicalAmWeb() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCRinse.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCRinse.java
index 4b03923..e9b21d8 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCRinse.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCRinse.java
@@ -25,7 +25,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcRinse() {
//纾ㄨ竟绾块�熷害
String edgingSpeed = plcParameterObject.getPlcParameter("edgingSpeed").getValue();
@@ -35,7 +35,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void edgingWeb() {
//鑾峰彇鎶ヨ鐘舵��
String warning = plcParameterObject.getPlcParameter("rinseWarning").getValue();
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java
index f59d007..431f056 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQR.java
@@ -24,7 +24,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void pLCScanQR() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鎵爜绾跨▼
@@ -42,7 +42,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
index 287af2e..873e859 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRVerify.java
@@ -25,7 +25,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcScanQrVerify() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鎵爜纭绾跨▼
@@ -46,7 +46,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRWorks.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRWorks.java
index f84acb2..517a13d 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRWorks.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCScanQRWorks.java
@@ -28,7 +28,7 @@
TaskingService taskingService;
@Autowired
PrimitiveTaskService primitiveTaskService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcScanQrVerify() {
//鏍规嵁鎵弿鍒扮殑瀹氬埗浜岀淮鐮佸皢鐘舵�佹洿鏂板埌鏁版嵁搴撲腑
//鎵爜鎶ュ伐绾跨▼
@@ -48,7 +48,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void scanQrCode() {
//鑾峰彇褰撳墠浠诲姟琛ㄦ渶鏂扮殑涓�鍧椾换鍔＄姸鎬�
//鑾峰彇鎶ヨ鐘舵��
diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java
index 79e2810..d633948 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/PLCTurn.java
@@ -25,7 +25,7 @@
PlcParameterObject plcParameterObject = S7object.getinstance().PlcMesObject;
@Autowired
TaskingService taskingService;
- @Scheduled(fixedDelay = 500)
+ //@Scheduled(fixedDelay = 500)
public void plcTurn() {
//娓呮礂鏈洪�熷害
String rinseSpeed = plcParameterObject.getPlcParameter("rinseSpeed").getValue();
@@ -35,7 +35,7 @@
}
}
- @Scheduled(fixedDelay = 1000)
+ //@Scheduled(fixedDelay = 1000)
public void turnWeb() {
//鑾峰彇鎶ヨ鐘舵��
String warning = plcParameterObject.getPlcParameter("turnWarning").getValue();
diff --git a/UI-Project/src/utils/constants.js b/UI-Project/src/utils/constants.js
index 8a09532..002deac 100644
--- a/UI-Project/src/utils/constants.js
+++ b/UI-Project/src/utils/constants.js
@@ -1,4 +1,4 @@
// export const WebSocketHost = "192.168.1.199";
export const WebSocketHost = "10.153.19.29";
// export const WebSocketHost = "127.0.0.1";
-export const host = "8081";
\ No newline at end of file
+export const host = "88";
\ No newline at end of file
diff --git a/UI-Project/src/views/Marking/marking.vue b/UI-Project/src/views/Marking/marking.vue
index dfe1156..264514c 100644
--- a/UI-Project/src/views/Marking/marking.vue
+++ b/UI-Project/src/views/Marking/marking.vue
@@ -2,8 +2,10 @@
<script setup>
import request from "@/utils/request";
import { ElMessage, ElMessageBox } from "element-plus";
-import { reactive, ref, onMounted } from 'vue'
+import { reactive, ref, onMounted, onBeforeUnmount,onUnmounted } from 'vue'
import { useI18n } from 'vue-i18n'
+import { WebSocketHost ,host} from '@/utils/constants'
+import { initializeWebSocket, closeWebSocket } from '@/utils/WebSocketService';
let language = ref(localStorage.getItem('lang') || 'zh')
const { t } = useI18n()
const requestData = reactive({
@@ -12,41 +14,64 @@
});
const loadData = ref([]);
const findMachine = ref([]);
+//浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
+let socket = null;
+const socketUrl = `ws://${WebSocketHost}:${host}/api/deviceInteraction/api/talk/marking`;
+// 瀹氫箟娑堟伅澶勭悊鍑芥暟锛屾洿鏂� receivedData 鍙橀噺
+const handleMessage = (data) => {
+ // 鏇存柊 tableData 鐨勬暟鎹�
+ loadData.value = data.taskingList[0];
+ findMachine.value = data.machine[0];
+};
+onUnmounted(() => {
+ if (socket) {
+ closeWebSocket(socket);
+ }
+});
+onBeforeUnmount(() => {
+ console.log("鍏抽棴浜�")
+ closeWebSocket();
+});
onMounted(async () => {
- load();
+ //浣跨敤WebSocket鏂瑰紡灞曠ず鏁版嵁
+ socket = initializeWebSocket(socketUrl, handleMessage);// 鍒濆鍖� WebSocket锛屽苟浼犻�掓秷鎭鐞嗗嚱鏁�
+
+ //浣跨敤鎺ュ彛鏂瑰紡灞曠ず鏁版嵁
+ //load();
});
-//鑾峰彇鏁版嵁
-const load = async() => {
- //鑾峰彇璁惧浠诲姟鏁版嵁
- try {
- const response = await request.post('/deviceInteraction/tasking/findMachineTask',
- {
- "id": 11
- }); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- loadData.value.findTaskingData= response.data;
- } else {
- ElMessage.warning(res.msg)
- }
- } catch (error) {
- // console.error('Error fetching rects :', error);
- }
- //鑾峰彇璁惧鐘舵��
- try {
- const response = await request.post('/deviceInteraction/machine/findMachine',
- {
- "id": 11
- }); // 鏇挎崲涓轰綘鐨凙PI绔偣
- if (response.code === 200) {
- findMachine.value= response.data;
- } else {
- ElMessage.warning(res.msg)
- }
- } catch (error) {
- // console.error('Error fetching rects :', error);
- }
-}
+
+// //鑾峰彇鏁版嵁
+// const load = async() => {
+// //鑾峰彇璁惧浠诲姟鏁版嵁
+// try {
+// const response = await request.post('/deviceInteraction/tasking/findMachineTask',
+// {
+// "id": 11
+// }); // 鏇挎崲涓轰綘鐨凙PI绔偣
+// if (response.code === 200) {
+// loadData.value.findTaskingData= response.data;
+// } else {
+// ElMessage.warning(res.msg)
+// }
+// } catch (error) {
+// // console.error('Error fetching rects :', error);
+// }
+// //鑾峰彇璁惧鐘舵��
+// try {
+// const response = await request.post('/deviceInteraction/machine/findMachine',
+// {
+// "id": 11
+// }); // 鏇挎崲涓轰綘鐨凙PI绔偣
+// if (response.code === 200) {
+// findMachine.value= response.data;
+// } else {
+// ElMessage.warning(res.msg)
+// }
+// } catch (error) {
+// // console.error('Error fetching rects :', error);
+// }
+// }
//淇敼宸ヤ綔鐘舵�� 銆愬け璐�/姝ｅ湪宸ヤ綔/瀹屽伐銆�
const workStatus = async(row,state) => {
let url;
@@ -76,7 +101,6 @@
}).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
if (res.code === 200) {
ElMessage.success(res.message);
- load();
} else {
ElMessage.warning(res.message)
}
@@ -111,7 +135,6 @@
}).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
if (res.code === 200) {
ElMessage.success(res.message);
- this.load();
} else {
ElMessage.warning(res.message)
}
@@ -143,7 +166,6 @@
}).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
if (res.code === 200) {
ElMessage.success(res.message);
- this.load();
} else {
ElMessage.warning(res.message)
}
@@ -175,7 +197,6 @@
}).then((res) => { // 鏇挎崲涓轰綘鐨凙PI绔偣
if (res.code === 200) {
ElMessage.success(res.message);
- this.load();
} else {
ElMessage.warning(res.message)
}
@@ -211,7 +232,7 @@
</div>
<div id="main-body" style="min-height:240px;">
<!-- 琛ㄦ牸鍐呭 -->
- <el-table :data="loadData.findTaskingData" stripe
+ <el-table :data="loadData" stripe
:header-cell-style="{ background: '#F2F3F5 ', color: '#1D2129', textAlign: 'center' }"
:cell-style="{ textAlign: 'center' }">
<!-- <el-table-column type="selection" min-width="30" /> -->
--
Gitblit v1.8.0