From 263de79f85d11630bf24364de499218f1ff8ff21 Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期四, 28 十一月 2024 21:08:34 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java | 29 ++++++++++++++
src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java | 15 -------
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 32 ----------------
src/main/java/com/zy/asrs/task/StaEscalationScheduler.java | 16 ++++++++
4 files changed, 44 insertions(+), 48 deletions(-)
diff --git a/src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java b/src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java
index 020bd7a..edf8602 100644
--- a/src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/ScaleEscalationScheduler.java
@@ -41,19 +41,4 @@
}
}
- @Scheduled(cron = "0/3 * * * * ? ")
- private void executeOverturn(){//2妤肩炕杞�掓枡鍚庡洖搴撴爣璁版竻闄�
- int[] staNos =new int[]{126,131,310,312};
- for (int staNo : staNos){
- try{
- ReturnT<String> result = scaleEscalationHandler.start2(staNo);
- if (result.getCode()==200){
- break;
- }
- }catch (Exception e){
- log.error("绔欑偣"+staNo+"2妤肩炕杞�掓枡淇℃伅涓婁紶澶勭悊澶辫触锛屽紓甯镐俊鎭細"+e);
- }
- }
- }
-
}
diff --git a/src/main/java/com/zy/asrs/task/StaEscalationScheduler.java b/src/main/java/com/zy/asrs/task/StaEscalationScheduler.java
index b305170..1d3dff4 100644
--- a/src/main/java/com/zy/asrs/task/StaEscalationScheduler.java
+++ b/src/main/java/com/zy/asrs/task/StaEscalationScheduler.java
@@ -36,4 +36,20 @@
}
}
+ @Scheduled(cron = "0/3 * * * * ? ")
+ private void executeOverturn(){//2妤肩炕杞�掓枡鍚庡洖搴撴爣璁版竻闄�
+ int[] staNos =new int[]{126,131,310,312};
+ for (int staNo : staNos){
+ try{
+ ReturnT<String> result = staEscalationHandler.start2(staNo);
+ if (result.getCode()==200){
+ break;
+ }
+ }catch (Exception e){
+ LedErrorThreadUtil.ledErrorThread("2妤肩炕杞�掓枡鍚庡洖搴撴爣璁版竻闄ゅけ璐�!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
+ log.error("绔欑偣"+staNo+"2妤肩炕杞�掓枡鍚庡洖搴撴爣璁版竻闄ゅけ璐ワ紝寮傚父淇℃伅锛�"+e);
+ }
+ }
+ }
+
}
diff --git a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
index b27929a..b8f6f48 100644
--- a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -40,17 +40,9 @@
public class ScaleEscalationHandler extends AbstractHandler<String> {
@Autowired
- private WrkMastService wrkMastService;
- @Autowired
- private WrkDetlService wrkDetlService;
- @Autowired
- private StaDescService staDescService;
- @Autowired
private ApiLogService apiLogService;
@Autowired
private BasDevpService basDevpService;
- @Autowired
- private RgvOneSignMapper rgvOneSignMapper;
// @Value("${srHangJia.url}")
private String erpUrl = "10.10.11.100:8580";
@@ -88,30 +80,6 @@
}
}catch (Exception e){
log.error("寮傚父2锛侊紒锛�"+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()){
- rgvOneSign.setRgvOneSign(0);
- rgvOneSignMapper.updateById(rgvOneSign);
- }
- }catch (Exception e){
- log.error("寮傚父3锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
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 3c977f9..81e887a 100644
--- a/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/StaEscalationHandler.java
@@ -7,8 +7,10 @@
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;
@@ -42,7 +44,7 @@
@Autowired
private WrkDetlService wrkDetlService;
@Autowired
- private StaDescService staDescService;
+ private RgvOneSignMapper rgvOneSignMapper;
@Autowired
private ApiLogService apiLogService;
@Autowired
@@ -119,6 +121,31 @@
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()){
+ 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