From d2c0bccd2e6dde4cf2a614a67bbf0ed45e2bcbaf Mon Sep 17 00:00:00 2001
From: whycq <913841844@qq.com>
Date: 星期五, 29 十一月 2024 13:59:22 +0800
Subject: [PATCH] # 213
---
src/main/java/com/zy/asrs/task/handler/ScaleEscalationHandler.java | 19 +++++++++----------
1 files changed, 9 insertions(+), 10 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 2084791..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,14 +5,18 @@
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.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;
@@ -36,12 +40,6 @@
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;
@@ -57,7 +55,7 @@
if (Cools.isEmpty(basDevp) || basDevp.getReportSign()==1){
return FAIL;
}
- SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 1);
+ SiemensDevpThread devpThread = (SiemensDevpThread) SlaveConnection.get(SlaveType.Devp, 2);
StaProtocol staProtocol = devpThread.getStation().get(staNo);
if (staProtocol == null) {
return FAIL;
@@ -68,19 +66,20 @@
if (!Cools.isEmpty(basDevp) && basDevp.getAutoing().equals("Y") && basDevp.getWrkNo()==0){
if (staProtocol.isAutoing() && staProtocol.getWorkNo()==0 && staProtocol.isInEnable()){
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犳椂锛岀珯鐐圭姸鎬侊細"+JSON.toJSONString(staProtocol));
- ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt());
+ ScaleEscalationParam scaleEscalationParam = new ScaleEscalationParam(basDevp.getGrossWt(),basDevp.getDevNo());
ReturnT<String> result = postMesData(reportOutPath,scaleEscalationParam);
if (result.getCode()==200){
basDevp.setReportSign(1);
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);
+ log.error("寮傚父2锛侊紒锛�"+e);
return FAIL;
}
return FAIL;
@@ -98,7 +97,7 @@
.build()
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- if (jsonObject.getInteger("Code")==200) {
+ if (jsonObject.getInteger("code")==200) {
success = true;
} else {
log.error("1妤肩炕杞噸閲忎俊鎭笂浼犺姹傛帴鍙ｅけ璐ワ紒锛侊紒url锛歿}锛況equest锛歿}锛況esponse锛歿}"+erpUrl+erpPath, JSON.toJSONString(combParam), response);
--
Gitblit v1.9.1