From eb275c6d06d3c27fd30bbf4975d27c93d7f56eb2 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十二月 2024 18:29:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/CarsCloudController.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 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 d0b260c..f9cfc17 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
@@ -10,13 +10,15 @@
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.Cars;
import com.doumee.service.business.CarsService;
+import com.doumee.service.business.ParkBookService;
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;
/**
@@ -30,6 +32,8 @@
@Autowired
private CarsService carsService;
+ @Autowired
+ private ParkBookService parkBookService;
@Autowired
private HkSyncVehicleFromHKServiceImpl hkSyncVehicleFromHKService;
@@ -110,4 +114,17 @@
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) {
+ List<Cars> carsList = carsService.importBatch(file,this.getLoginUser(token));
+ //寮傛鏇存柊杞﹁締鎺堟潈鏁版嵁
+ carsService.dealCarsAuthBiz(carsList);
+ return ApiResponse.success("瀵煎叆鎴愬姛");
+ }
}
--
Gitblit v1.9.3