From 511bc79b5a7e819e9f45fb6df4e1e0cc68d529ad Mon Sep 17 00:00:00 2001
From: songxiaopeng <1393756821@qq.com>
Date: Mon, 6 May 2024 10:46:49 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9acs=E4=B8=8A=E6=8A=A5?=
 =?UTF-8?q?=E8=AE=BE=E5=A4=87=E9=94=99=E8=AF=AF=E6=8E=A5=E5=8F=A3=E8=BF=94?=
 =?UTF-8?q?=E5=9B=9E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
index 5c5ac8f..c2646c2 100644
--- a/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
+++ b/lms/nladmin-system/nlsso-server/src/main/java/org/nl/wms/ext/acs/service/impl/AcsToWmsServiceImpl.java
@@ -1054,16 +1054,16 @@ public class AcsToWmsServiceImpl implements AcsToWmsService {
     @Override
     public JSONObject errorDeviceRecord(JSONObject param) {
         String error = param.getString("error");
+        JSONObject result = new JSONObject();
+        result.put("status", org.springframework.http.HttpStatus.OK.value());
+        result.put("message", "故障上报完成！");
         if(StringUtils.isNotEmpty(error) && "0".equals(error)){
-            return null;
+            return result;
         }
         DasDeviceErrorRecord dasDeviceErrorRecord = new DasDeviceErrorRecord();
         dasDeviceErrorRecord.setDevice_code(param.getString("device_code"));
         dasDeviceErrorRecord.setError(param.getString("error"));
         dasDeviceErrorRecordService.create(dasDeviceErrorRecord);
-        JSONObject result = new JSONObject();
-        result.put("status", org.springframework.http.HttpStatus.OK.value());
-        result.put("message", "故障上报完成！");
         return result;
     }