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) { 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) { 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() { //获取当前任务表最新的一块任务状态 //获取报警状态 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() { //获取当前任务表最新的一块任务状态 //获取报警状态 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(); 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() { //获取当前任务表最新的一块任务状态 //获取报警状态 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() { //获取当前任务表最新的一块任务状态 //获取报警状态 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() { //获取当前任务表最新的一块任务状态 //获取报警状态 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(); UI-Project/src/utils/constants.js
@@ -2,4 +2,4 @@ export const WebSocketHost = "10.153.19.44"; // export const WebSocketHost = "10.153.19.29"; // export const WebSocketHost = "127.0.0.1"; export const host = "8081"; export const host = "88"; 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 }); // 替换为你的API端点 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 }); // 替换为你的API端点 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 // }); // 替换为你的API端点 // 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 // }); // 替换为你的API端点 // 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) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); load(); } else { ElMessage.warning(res.message) } @@ -111,7 +135,6 @@ }).then((res) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); this.load(); } else { ElMessage.warning(res.message) } @@ -143,7 +166,6 @@ }).then((res) => { // 替换为你的API端点 if (res.code === 200) { ElMessage.success(res.message); this.load(); } else { ElMessage.warning(res.message) } @@ -175,7 +197,6 @@ }).then((res) => { // 替换为你的API端点 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" /> -->
