From ff087240b3dee29ce4e14ad0836e76b9fdf312cf Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 19 八月 2025 09:28:07 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/lianhelihua_sh
---
server/src/main/java/com/doumee/api/business/CategoryController.java | 26 ++++++++++++++++++++++----
1 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/server/src/main/java/com/doumee/api/business/CategoryController.java b/server/src/main/java/com/doumee/api/business/CategoryController.java
index 1a46aa7..43b93f4 100644
--- a/server/src/main/java/com/doumee/api/business/CategoryController.java
+++ b/server/src/main/java/com/doumee/api/business/CategoryController.java
@@ -9,14 +9,17 @@
import com.doumee.core.model.PageWrap;
import com.doumee.core.model.PageData;
import com.doumee.dao.business.model.Category;
+import com.doumee.dao.business.vo.CategoryDcaProblemDto;
import com.doumee.service.business.CategoryService;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
+import io.swagger.annotations.*;
+import org.apache.shiro.authz.annotation.RequiresPermissions;
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.List;
/**
@@ -95,6 +98,13 @@
public void exportExcel (@RequestBody PageWrap<Category> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Category.class).export(categoryService.findPage(pageWrap).getRecords(), "鍒嗙被淇℃伅琛�", response);
}
+ @ApiOperation("瀵煎嚭DCAExcel")
+ @PostMapping("/exportDcaExcel")
+ @EncryptionReq
+ @RequiresPermissions("business:category:exportExcel")
+ public void exportDcaExcel (@RequestBody Category pageWrap, HttpServletResponse response) {
+ ExcelExporter.build(CategoryDcaProblemDto.class).export(categoryService.findListForDca(pageWrap), "DCA浜嬩欢涓婚鍜岃瀵熼」閰嶇疆_"+System.currentTimeMillis(), response);
+ }
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@@ -114,5 +124,13 @@
public ApiResponse<List<Category>> tree (@RequestBody Category param){
return ApiResponse.success(categoryService.treeList(param));
}
-
+ @ApiOperation(value = "DCA涓婚鍜岃瀵熼」淇℃伅瀵煎叆" ,notes = "淇濆崟鐢宠")
+ @PostMapping("/importDcaExcel")
+ @ApiImplicitParams({
+ @ApiImplicitParam(name = "file", value = "file", required = true, paramType = "query", dataType = "file", dataTypeClass = File.class),
+ })
+ @RequiresPermissions("business:member:create")
+ public ApiResponse<String> imporimportDcaExceltExcel (@ApiParam(value = "file") MultipartFile file ) {
+ return ApiResponse.success(categoryService.importDcaBatch(file));
+ }
}
--
Gitblit v1.9.3