From 8d58c40af40493bd5f066cbfdb1ffd9f113c22fc Mon Sep 17 00:00:00 2001
From: 严智鑫 <test>
Date: 星期三, 03 九月 2025 16:37:21 +0800
Subject: [PATCH] 1.前端推数据使用了最新的webSokect客户现场总是掉线，修改为接口方式 2.设备交互整体增加异常处理以及PLC连接方式改为短连接

---
 JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
index fb1ab1d..5bced79 100644
--- a/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
+++ b/JiuMuMesParent/moduleService/DeviceInteractionModule/src/main/java/com/mes/job/MachineTask.java
@@ -62,8 +62,8 @@
     private List<Machine> machineListLamination;
 
     //鏈烘鎵�
-    @Scheduled(fixedDelay = 500)
-    public void MarkingTasks() {
+    //@Scheduled(fixedDelay = 500)
+    public void loadTasks() {
         try {
             machineListLoad = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "涓婄墖"));
             JSONObject jsonObject = new JSONObject();
@@ -92,7 +92,7 @@
     }
 
     //纾ㄨ竟鏈�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void edgingTasks() {
         try {
             machineListEdging = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "纾ㄨ竟"));
@@ -113,7 +113,7 @@
     }
 
     //缈荤墖鍙�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void flipSliceTasks() {
         try {
             machineListFlipSlice = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "缈荤墖"));
@@ -135,7 +135,7 @@
     }
 
     //鎵撴爣鏈�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void markingTasks() {
         try {
             machineListMarking = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鎵撴爣鏈�"));
@@ -157,7 +157,7 @@
     }
 
     //涓濆嵃鏈�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void silkScreenTasks() {
         try {
             machineListSilkScreen = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩涓濆嵃鏈�"));
@@ -178,7 +178,7 @@
     }
 
     //鐐硅兌鏈�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void glueDispenserTasks() {
         try {
             machineListGlueDispenser = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩鐐硅兌鏈�"));
@@ -199,7 +199,7 @@
     }
 
     //鏃嬭浆鍙�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void rotateTasks() {
         try {
             machineListRotate = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鏃嬭浆鍙�"));
@@ -220,7 +220,7 @@
     }
 
     //璐磋啘鏈�
-    @Scheduled(fixedDelay = 500)
+    //@Scheduled(fixedDelay = 500)
     public void laminationTasks() {
         try {
             machineListLamination = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "鑷姩璐磋啘鏈�"));
@@ -242,7 +242,7 @@
 
 
     //鎶ュ伐椤甸潰鏌ヨ
-    @Scheduled(fixedDelay = 1000)
+    //@Scheduled(fixedDelay = 1000)
     public void manualReporting() {
         try {
             machineListScanQrCode = machineMapper.selectList(new QueryWrapper<Machine>().lambda().eq(Machine::getName, "璇嗗埆鎶ュ伐"));
@@ -271,7 +271,7 @@
     }
 
     //绾夸笅鐜荤拑鏌ヨ
-    @Scheduled(fixedDelay = 1000)
+    //@Scheduled(fixedDelay = 1000)
     public void downLineTask() {
         try {
             JSONObject jsonObject = new JSONObject();
@@ -292,7 +292,6 @@
         } catch (Exception ex) {
             log.info("{}鍙戦�佹暟鎹け璐ワ細{}", "rawGlassStorage", ex.getMessage());
         }
-
     }
 //    public void webSocketServer(JSONObject jsonObject) {
 //        try {

--
Gitblit v1.8.0