From ec26e7d1387c2e16ed1b21fefaf9b444eaf08d6f Mon Sep 17 00:00:00 2001
From: zhangzq <zhangzhiqiang@yoycol.com>
Date: Wed, 17 Jul 2024 09:33:39 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E6=97=A5=E5=BF=97=E9=93=BE=E8=B7=AF?=
 =?UTF-8?q?=E5=8F=B7=E4=B8=8D=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../task/controller/SchBaseTaskController.java               | 5 +++++
 .../hd/nladmin-system/src/main/resources/logback-spring.xml  | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
index 3070c78e..ca6b006b 100644
--- a/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
+++ b/wms_pro/hd/nladmin-system/src/main/java/org/nl/wms/dispatch_manage/task/controller/SchBaseTaskController.java
@@ -3,6 +3,7 @@ package org.nl.wms.dispatch_manage.task.controller;
 
 import com.alibaba.fastjson.JSONObject;
 import org.nl.common.TableDataInfo;
+import org.nl.common.anno.Log;
 import org.nl.common.domain.entity.PageQuery;
 import org.nl.common.domain.exception.BadRequestException;
 import org.nl.wms.dispatch_manage.task.service.ISchBaseTaskService;
@@ -61,6 +62,7 @@ public class SchBaseTaskController {
     }
 
     @PutMapping
+    @Log("修改任务")
     public ResponseEntity<Object> update(@Validated @RequestBody SchBaseTask entity){
         iSchBaseTaskService.update(entity);
         return new ResponseEntity<>(HttpStatus.OK);
@@ -68,18 +70,21 @@ public class SchBaseTaskController {
 
 
     @DeleteMapping
+    @Log("删除任务")
     public ResponseEntity<Object> delete(@RequestBody Set<String> ids) {
         iSchBaseTaskService.deleteAll(ids);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @PutMapping("/operation")
+    @Log("手动更新任务状态")
     public ResponseEntity<Object> update(@RequestBody JSONObject map) {
         iSchBaseTaskService.operation(map);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @GetMapping("/taskSchedule")
+    @Log("任务调度")
     public ResponseEntity<Object> taskSchedule() {
         taskScheduleService.taskPublish();
         return new ResponseEntity<>(HttpStatus.OK);
diff --git a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml
index 76dd4c73..2d4dbffe 100644
--- a/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml
+++ b/wms_pro/hd/nladmin-system/src/main/resources/logback-spring.xml
@@ -79,8 +79,8 @@
     <!--开发环境:打印控制台-->
     <springProfile name="dev3">
         <root level="info">
-            <appender-ref ref="CONSOLE"/>
             <appender-ref ref="asyncLuceneAppender"/>
+            <appender-ref ref="CONSOLE"/>
         </root>
         <logger name="jdbc" level="ERROR" additivity="true">
             <appender-ref ref="asyncFileAppender"/>