From b55b69eb033208e0eca03df10584b291855a16dd Mon Sep 17 00:00:00 2001
From: zhangzhiqiang <zhangzhiqiang@yoycol.com>
Date: Tue, 22 Nov 2022 16:30:04 +0800
Subject: [PATCH] =?UTF-8?q?mdf:=E5=A4=A7=E5=B1=8F=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E4=BB=8A=E6=97=A5=E4=BB=BB=E5=8A=A1=E6=8A=A5=E8=AD=A6=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wms/sb/bigscreen/rest/DeviceBigScreenController.java  | 5 +++--
 .../wms/sb/bigscreen/service/DeviceBigScreenService.java  | 2 +-
 .../service/impl/DeviceBigScreenServiceImpl.java          | 8 +++++++-
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java
index 3110daab..293f00d8 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/rest/DeviceBigScreenController.java
@@ -82,7 +82,8 @@ public class DeviceBigScreenController {
     @PostMapping("/updateWarnTime")
     @Log("当日任务列表")
     @ApiOperation("当日任务列表")
-    public void getTodayTask(@RequestBody JSONObject json){
-        deviceBigScreenService.updateWarnTime(json);
+    public ResponseEntity<Object> getTodayTask(@RequestBody JSONObject json){
+        JSONObject jsonObject = deviceBigScreenService.updateWarnTime(json);
+        return new ResponseEntity<>(jsonObject,HttpStatus.OK);
     }
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java
index 95c7643d..6d9352c9 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/DeviceBigScreenService.java
@@ -55,5 +55,5 @@ public interface DeviceBigScreenService {
     /**
      * 更新播报时间
      */
-    void updateWarnTime(JSONObject json);
+    JSONObject updateWarnTime(JSONObject json);
 }
diff --git a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
index 37948b66..7d995ee3 100644
--- a/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
+++ b/mes/hd/nladmin-system/src/main/java/org/nl/wms/sb/bigscreen/service/impl/DeviceBigScreenServiceImpl.java
@@ -546,7 +546,8 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
     }
 
     @Override
-    public void updateWarnTime(JSONObject json) {
+    public JSONObject updateWarnTime(JSONObject json) {
+        JSONObject result = new JSONObject();
         if (ObjectUtil.isNotEmpty(json)){
             try {
                 JSONArray ids = json.getJSONArray("ids");
@@ -555,9 +556,14 @@ public class DeviceBigScreenServiceImpl implements DeviceBigScreenService {
                 param.put("WARN_TIME", DateUtil.now());
                 WQLObject deviceRepairRequest = WQLObject.getWQLObject("EM_BI_DeviceRepairRequest");
                 deviceRepairRequest.update(param,"request_id in  (\'"+requestId+"\')");
+                result.put("code", "1");
+                result.put("desc", "更新成功");
             }catch (Exception ex){
+                result.put("code", "0");
+                result.put("desc", "更新失败");
                 log.error("updateWarnTime error:{}",ex.getMessage());
             }
         }
+        return result;
     }
 }