From dfaf0332889a83f9c8437befdfff32866cf29d5e Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期五, 13 六月 2025 15:16:12 +0800
Subject: [PATCH] #

---
 src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java |   37 ++++++++++++++++++++++++++++++++++---
 1 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
index d2000cb..96572a9 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -5,13 +5,17 @@
 import com.baomidou.mybatisplus.mapper.EntityWrapper;
 import com.core.common.Cools;
 import com.core.exception.CoolException;
+import com.zy.asrs.domain.enums.LedErrorAreaType;
 import com.zy.asrs.entity.BasDevp;
+import com.zy.asrs.entity.RgvOneSign;
 import com.zy.asrs.entity.WrkDetl;
 import com.zy.asrs.entity.WrkMast;
+import com.zy.asrs.mapper.RgvOneSignMapper;
 import com.zy.asrs.service.*;
 import com.zy.asrs.task.AbstractHandler;
 import com.zy.asrs.task.core.ReturnT;
 import com.zy.asrs.task.escalationParam.StaEscalationParam;
+import com.zy.asrs.utils.LedErrorThreadUtil;
 import com.zy.common.utils.HttpHandler;
 import com.zy.core.cache.SlaveConnection;
 import com.zy.core.enums.SlaveType;
@@ -40,7 +44,7 @@
     @Autowired
     private WrkDetlService wrkDetlService;
     @Autowired
-    private StaDescService staDescService;
+    private RgvOneSignMapper rgvOneSignMapper;
     @Autowired
     private ApiLogService apiLogService;
     @Autowired
@@ -103,18 +107,45 @@
                         basDevp.setReportSign(1);
                         basDevpService.updateById(basDevp);
                         return SUCCESS;
-                    }else {
-                        log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶澶辫触");
+                    } else {
+                        LedErrorThreadUtil.ledErrorThread("缈昏浆涓婃姤erp澶辫触!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+                        log.error("2妤肩炕杞�掓枡淇℃伅涓婁紶澶辫触锛佺珯鐐瑰彿锛�"+staNo);
                     }
                 }
             }
         }catch (Exception e){
+            LedErrorThreadUtil.ledErrorThread("缈昏浆涓婁紶寮傚父!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
             log.error("寮傚父4锛侊紒锛�"+e);
             return FAIL;
         }
         return FAIL;
     }
 
+    public ReturnT<String> start2(int staNo) {
+        try{
+            RgvOneSign rgvOneSign = rgvOneSignMapper.selectOneSign("sign"+staNo);
+            if (Cools.isEmpty(rgvOneSign) || rgvOneSign.getRgvOneSign()!=1){
+                return FAIL;
+            }
+
+            SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+            StaProtocol staProtocol = devpThread.getStation().get(staNo);
+            if (staProtocol == null) {
+                return FAIL;
+            } else {
+                staProtocol = staProtocol.clone();
+            }
+            if (!staProtocol.isLoading() && staProtocol.getWorkNo()!=0){
+                rgvOneSign.setRgvOneSign(0);
+                rgvOneSignMapper.updateById(rgvOneSign);
+            }
+        }catch (Exception e){
+            log.error("寮傚父3锛侊紒锛�"+e);
+            return FAIL;
+        }
+        return FAIL;
+    }
+
     private ReturnT<String> postMesData(String erpPath,Object combParam){
         if(combParam != null){
             String response = "";

--
Gitblit v1.9.1