From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
index 4edf42c..65809ef 100644
--- a/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
+++ b/server/meeting/meeting_admin/src/main/java/com/doumee/cloud/admin/ProjectsCloudController.java
@@ -19,6 +19,7 @@
import javax.servlet.http.HttpServletResponse;
import java.util.ArrayList;
import java.util.List;
+import java.util.Map;
/**
* @author 姹熻箘韫�
@@ -45,7 +46,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:projects:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
projectsService.deleteById(id);
return ApiResponse.success(null);
}
@@ -53,7 +54,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:projects: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) {
@@ -75,31 +76,30 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse<PageData<Projects>> findPage (@RequestBody PageWrap<Projects> pageWrap) {
+ public ApiResponse<PageData<Projects>> findPage (@RequestBody PageWrap<Projects> pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectsService.findPage(pageWrap));
}
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:projects:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Projects> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Projects> pageWrap, HttpServletResponse response, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
ExcelExporter.build(Projects.class).export(projectsService.findPage(pageWrap).getRecords(), "鏈嶅姟椤圭洰淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
return ApiResponse.success(projectsService.findById(id));
}
-
-
@ApiOperation("浼氳鍏宠仈鐨勯」鐩�")
@PostMapping("/findListByObjId")
@CloudRequiredPermission("business:projects:query")
- public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestParam Integer objId, @RequestParam Integer objType) {
- return ApiResponse.success(projectsService.getProjectsList(objId,objType));
+ public ApiResponse<List<ProjectsResponse>> findListByObjId (@RequestBody Map<String,Object> param, @RequestHeader(Constants.HEADER_USER_TOKEN) String token) {
+// @RequestParam Integer objId, @RequestParam Integer objType,
+ return ApiResponse.success(projectsService.getProjectsList((Integer) param.get("objId"), (Integer) param.get("objType")));
}
}
--
Gitblit v1.9.3