From 617a8c4fc0b81ec4b96db8a013a91f4e666b0b96 Mon Sep 17 00:00:00 2001
From: zhangc <zc@123>
Date: 星期三, 08 一月 2025 14:33:45 +0800
Subject: [PATCH] 出现空指针异常

---
 src/main/java/com/zy/asrs/service/impl/AgvWrkMastServiceImp.java |   14 ++++++++++----
 1 files changed, 10 insertions(+), 4 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 f9f4675..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);
         //鍒ゆ柇瑕佷慨鏀圭殑宸ヤ綔妗g姸鎬佹槸鍚﹀悎鐞嗭紝濡傛灉涓嶅悎鐞嗗垯鎶涘嚭寮傚父
         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,6 +274,9 @@
     }
 
     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;
@@ -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);
@@ -304,7 +310,7 @@
             throw new CoolException("璋冪敤AGV鍝嶅簲閿欒");
             //return 1;
         } finally {
-            if(code !=6){
+            if (code != 6) {
                 apiLogService.save(
                         namespace,
                         url + path,

--
Gitblit v1.9.1