From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java | 36 ++++++++++++++++++++++++++----------
1 files changed, 26 insertions(+), 10 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
index 7053160..34df5fa 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/JkSketchCloudController.java
@@ -5,17 +5,19 @@
import com.doumee.core.annotation.excel.ExcelExporter;
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.business.model.JkCustomer;
import com.doumee.dao.business.model.JkSketch;
import com.doumee.service.business.JkSketchService;
import com.doumee.service.business.third.model.ApiResponse;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
-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;
@@ -35,14 +37,14 @@
@ApiOperation("鏂板缓")
@PostMapping("/create")
@CloudRequiredPermission("business:jksketch:create")
- public ApiResponse create(@RequestBody JkSketch jkSketch) {
+ public ApiResponse create(@RequestBody JkSketch jkSketch, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(jkSketchService.create(jkSketch));
}
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:jksketch:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
jkSketchService.deleteById(id);
return ApiResponse.success(null);
}
@@ -50,7 +52,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:jksketch:delete")
- public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
+ public ApiResponse deleteByIdInBatch(@RequestParam String ids, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
for (String id : idArray) {
@@ -63,29 +65,43 @@
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:jksketch:update")
- public ApiResponse updateById(@RequestBody JkSketch jkSketch) {
- jkSketchService.updateById(jkSketch);
+ public ApiResponse updateById(@RequestBody JkSketch jkSketch, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ jkSketch.setLoginUserInfo(this.getLoginUser(token));
+ JkSketch model = jkSketchService.updateById(jkSketch);
+ jkSketchService.startUpdateLineAsync(model);//寮傛浼樺寲
return ApiResponse.success(null);
}
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:jksketch:query")
- public ApiResponse<PageData<JkSketch>> findPage (@RequestBody PageWrap<JkSketch> pageWrap) {
+ public ApiResponse<PageData<JkSketch>> findPage (@RequestBody PageWrap<JkSketch> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(jkSketchService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:jksketch:exportExcel")
- public void exportExcel (@RequestBody PageWrap<JkSketch> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<JkSketch> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(JkSketch.class).export(jkSketchService.findPage(pageWrap).getRecords(), "浜ゆ帶-绾胯矾浼樺寲璁板綍淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:jksketch:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(jkSketchService.findById(id));
}
+
+ @ApiOperation(value = "璁㈠崟淇℃伅瀵煎叆" ,notes = "璁㈠崟淇℃伅瀵煎叆")
+ @PostMapping("/importExcel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ @ApiImplicitParam(name = "dateInfo", value = "dateInfo", required = true, paramType = "query", dataType = "String" ),
+ })
+ @CloudRequiredPermission("business:jksketch:create")
+ public ApiResponse<String> importExcel (@ApiParam(value = "file") MultipartFile file, String dateInfo, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+ List<JkSketch> list = jkSketchService.importBatch(file,dateInfo,this.getLoginUser(token));
+ return ApiResponse.success("瀵煎叆鎴愬姛");
+ }
}
--
Gitblit v1.9.3