From 3b604eb218a3b167144cc6e5d9c86cd95e16157c Mon Sep 17 00:00:00 2001
From: yxFwq <1>
Date: 星期六, 10 五月 2025 08:08:24 +0800
Subject: [PATCH] #
---
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 37 ++++---------------------------------
1 files changed, 4 insertions(+), 33 deletions(-)
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 bdd3464..b8f6f48 100644
--- a/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
+++ b/src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java
@@ -5,6 +5,7 @@
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;
@@ -15,6 +16,7 @@
import com.zy.asrs.task.core.ReturnT;
import com.zy.asrs.task.escalationParam.ScaleEscalationParam;
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;
@@ -38,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";
@@ -79,36 +73,13 @@
basDevpService.updateById(basDevp);
return SUCCESS;
}else {
+ LedErrorThreadUtil.ledErrorThread("1妤肩炕杞�掓枡閲嶉噺涓婃姤erp澶辫触!绔欑偣鍙凤細"+staNo,4, LedErrorAreaType.ONE_OTHER.getDesc());
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犲け璐�");
}
}
}
}catch (Exception e){
- log.error("寮傚父锛侊紒锛�"+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("寮傚父锛侊紒锛�"+e);
+ log.error("寮傚父2锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
--
Gitblit v1.9.1