From d07a7672eb185c4fb2bcb6589994d23e93d144f6 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期二, 14 一月 2025 14:57:07 +0800
Subject: [PATCH] 优化异常处理及订单同步逻辑
---
src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
index b0de3be..af24386 100644
--- a/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
+++ b/src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java
@@ -29,6 +29,9 @@
@Slf4j
public class AgvWrkMastServiceImp extends ServiceImpl<AgvWrkMastMapper, AgvWrkMast> implements AgvWrkMastService {
+ @Value("${agv.flag}")
+ private boolean flag;
+
@Value("${agv.url}")
private String url;
@@ -63,13 +66,13 @@
private AgvWrkMastService agvWrkMastService;
- public void updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
+ public Boolean updateWrkStsByWrkNo(int wrkNo, long wrkSts) {
AgvWrkMast agvWrkMast = this.selectById(wrkNo);
//鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗ｇ姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
checkWrkSts(agvWrkMast, wrkSts);
agvWrkMast.setWrkSts(wrkSts);
agvWrkMast.setModiTime(new Date());
- this.updateById(agvWrkMast);
+ return this.updateById(agvWrkMast);
}
public void updateWrkStsByWrkNo(int wrkNo, long wrkSts, String manuType, long userId) {
@@ -271,9 +274,12 @@
}
private int doHttpRequest(Object requestParam, String namespace, String url, String path, String appkey, String ip) {
+ if (!flag) {
+ return 1;
+ }
String response = "";
boolean success = false;
- int code =0;
+ int code = 0;
try {
response = new HttpHandler.Builder()
.setUri(url)
@@ -284,7 +290,7 @@
.doPost();
JSONObject jsonObject = JSON.parseObject(response);
- code = Integer.parseInt(jsonObject.get("code").toString());
+ code = Integer.parseInt(jsonObject.get("code").toString());
if (code != 0) {
if (code == 6) {
log.info("AGV浠诲姟鍗曞彿宸蹭笂鎶�:{}", response);
@@ -301,11 +307,10 @@
return code;
} catch (Exception e) {
log.error(e.getMessage());
- //TODO 寮犺秴
throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
//return 1;
} finally {
- if(code !=6){
+ if (code != 6) {
apiLogService.save(
namespace,
url + path,
--
Gitblit v1.9.1