From c9ef2687d3460da668d08d58dee6af468ed6693e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 05 十一月 2024 11:48:34 +0800
Subject: [PATCH] 最新版本541200007

---
 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java |   32 ++++++++++++++++++++++++++++----
 1 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
index 7bae270..bc382fb 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java
@@ -11,12 +11,13 @@
 import com.doumee.dao.business.model.Cars;
 import com.doumee.service.business.CarsService;
 import com.doumee.service.business.impl.hksync.fhk.HkSyncVehicleFromHKServiceImpl;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.*;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletResponse;
+import java.io.File;
 import java.util.ArrayList;
 import java.util.List;
 /**
@@ -38,6 +39,7 @@
     @PostMapping("/create")
     @CloudRequiredPermission("business:cars:create")
     public ApiResponse create(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.create(cars));
     }
 
@@ -45,7 +47,7 @@
     @GetMapping("/delete/{id}")
     @CloudRequiredPermission("business:cars:delete")
     public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
-        carsService.deleteById(id);
+        carsService.deleteById(id,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -58,7 +60,7 @@
         for (String id : idArray) {
             idList.add(Integer.valueOf(id));
         }
-        carsService.deleteByIdInBatch(idList);
+        carsService.deleteByIdInBatch(idList,this.getLoginUser(token));
         return ApiResponse.success(null);
     }
 
@@ -66,6 +68,7 @@
     @PostMapping("/updateById")
     @CloudRequiredPermission("business:cars:update")
     public ApiResponse updateById(@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        cars.setLoginUserInfo(this.getLoginUser(token));
         carsService.updateById(cars);
         return ApiResponse.success(null);
     }
@@ -81,13 +84,24 @@
     @PostMapping("/page")
     @CloudRequiredPermission("business:cars:query")
     public ApiResponse<PageData<Cars>> findPage (@RequestBody PageWrap<Cars> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         return ApiResponse.success(carsService.findPage(pageWrap));
+    }
+
+
+    @ApiOperation("鍒楄〃鏌ヨ")
+    @PostMapping("/list")
+    @CloudRequiredPermission("business:cars:query")
+    public ApiResponse<List<Cars>> findList (@RequestBody Cars cars,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+       cars.setLoginUserInfo(this.getLoginUser(token));
+        return ApiResponse.success(carsService.findList(cars));
     }
 
     @ApiOperation("瀵煎嚭Excel")
     @PostMapping("/exportExcel")
     @CloudRequiredPermission("business:cars:exportExcel")
     public void exportExcel (@RequestBody PageWrap<Cars> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+        pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
         ExcelExporter.build(Cars.class).export(carsService.findPage(pageWrap).getRecords(), "杞﹁締淇℃伅琛�", response);
     }
 
@@ -97,4 +111,14 @@
     public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
         return ApiResponse.success(carsService.findById(id));
     }
+
+    @ApiOperation(value = "杞﹁締淇℃伅瀵煎叆" ,notes = "杞﹁締淇℃伅瀵煎叆")
+    @PostMapping("/importExcel")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+    })
+    @CloudRequiredPermission("business:cars:create")
+    public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+        return ApiResponse.success(carsService.importBatch(file,this.getLoginUser(token)));
+    }
 }

--
Gitblit v1.9.3