From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java
index c8a6782..f3a191f 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/YwPatrolLineCloudController.java
@@ -36,6 +36,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:ywpatrolline:create")
     public ApiResponse create(@RequestBody YwPatrolLine ywPatrolLine,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywPatrolLine.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywPatrolLineService.create(ywPatrolLine));
     }
 
@@ -43,7 +44,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:ywpatrolline:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        ywPatrolLineService.deleteById(id);
+        ywPatrolLineService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -56,7 +57,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        ywPatrolLineService.deleteByIdInBatch(idList);
+        ywPatrolLineService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -64,7 +65,17 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:ywpatrolline:update")
     public ApiResponse updateById(@RequestBody YwPatrolLine ywPatrolLine,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywPatrolLine.setLoginUserInfo(this.getLoginUser(token));
         ywPatrolLineService.updateById(ywPatrolLine);
+        return ApiResponse.success(null);
+    }
+
+    @ApiOperation("鏇存柊鐘舵��")
+    @PostMapping("/updateStatusById")
+    @CloudRequiredPermission("business:ywpatrolline:update")
+    public ApiResponse updateStatusById(@RequestBody YwPatrolLine ywPatrolLine,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        ywPatrolLine.setLoginUserInfo(this.getLoginUser(token));
+        ywPatrolLineService.updateStatusById(ywPatrolLine);
         return ApiResponse.success(null);
     }
 
@@ -72,6 +83,7 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:ywpatrolline:query")
     public ApiResponse<PageData<YwPatrolLine>> findPage (@RequestBody PageWrap<YwPatrolLine> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(ywPatrolLineService.findPage(pageWrap));
     }
 
@@ -79,6 +91,7 @@
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:ywpatrolline:exportExcel")
     public void exportExcel (@RequestBody PageWrap<YwPatrolLine> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(YwPatrolLine.class).export(ywPatrolLineService.findPage(pageWrap).getRecords(), "杩愮淮宸℃璺嚎淇℃伅琛�", response);
     }
 
@@ -86,6 +99,6 @@
     @GetMapping("/{id}")
     @CloudRequiredPermission("business:ywpatrolline:query")
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
-        return ApiResponse.success(ywPatrolLineService.findById(id));
+        return ApiResponse.success(ywPatrolLineService.getDetail(id));
     }
 }

--
Gitblit v1.9.3