From 48b4e46f22ec83843cb8a3087b8ec9511a7ea8a2 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期一, 06 五月 2024 10:24:52 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCloudController.java | 36 ++++++++++++++++++------------------
1 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCloudController.java
index 0efc9cf..2b9c561 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/api/cloud/MemberCloudController.java
@@ -61,7 +61,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:member:delete")
- public ApiResponse deleteById(@PathVariable Integer id) {
+ public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.deleteById(id);
return ApiResponse.success(null);
}
@@ -69,10 +69,10 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:member: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) {
+ for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
memberService.deleteByIdInBatch(idList);
@@ -90,26 +90,26 @@
@ApiOperation("鍚屾浜鸿劯淇℃伅")
@PostMapping("/updateFace")
- public ApiResponse updateFace(@RequestBody Member member) {
+ public ApiResponse updateFace(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateFace(member);
return ApiResponse.success(null);
}
@ApiOperation("寮哄埗鍒犻櫎瀹夐槻骞冲彴浜哄憳淇℃伅")
@PostMapping("/delHkForce")
- public ApiResponse delHkForce(@RequestBody Member member) {
+ public ApiResponse delHkForce(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.delHkForce(member);
return ApiResponse.success(null);
}
@ApiOperation("閲嶆柊涓嬪彂浜鸿劯")
@PostMapping("/empowerByList")
- public ApiResponse empowerByList(@RequestBody Member member) {
+ public ApiResponse empowerByList(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.empowerByList(member);
return ApiResponse.success(null);
}
@ApiOperation("鏍规嵁ID淇敼")
@PostMapping("/updateById")
@CloudRequiredPermission("business:member:update")
- public ApiResponse updateById(@RequestBody Member member) {
+ public ApiResponse updateById(@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.updateById(member);
return ApiResponse.success(null);
}
@@ -147,10 +147,10 @@
@ApiOperation("鎵归噺鎷夐粦")
@GetMapping("/batchBlock")
@CloudRequiredPermission("business:member:delete")
- public ApiResponse batchBlock(@RequestParam String ids) {
+ public ApiResponse batchBlock(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
+ for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
memberService.batchBlock(idList,2);
@@ -160,10 +160,10 @@
@ApiOperation("鎵归噺鍐荤粨")
@GetMapping("/batchFreeze")
@CloudRequiredPermission("business:member:delete")
- public ApiResponse batchFreeze(@RequestParam String ids) {
+ public ApiResponse batchFreeze(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
- for (String id : idArray) {
+ for (String id : idArray ){
idList.add(Integer.valueOf(id));
}
memberService.batchBlock(idList,1);
@@ -183,7 +183,7 @@
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap) {
+ public ApiResponse<PageData<Member>> findPage (@RequestBody PageWrap<Member> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findPage(pageWrap));
}
@@ -197,14 +197,14 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:member:exportExcel")
- public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response) {
+ public void exportExcel (@RequestBody PageWrap<Member> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
ExcelExporter.build(Member.class).export(memberService.findPage(pageWrap).getRecords(), "浜哄憳淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:member:query")
- public ApiResponse findById(@PathVariable Integer id) {
+ public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findById(id));
}
@@ -233,7 +233,7 @@
@ApiOperation("鍒嗛〉鏌ヨ璁垮浜哄憳淇℃伅")
@PostMapping("/findVisitPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<MemberInfoDTO>> findVisitPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findVisitPage(pageWrap));
}
@@ -241,14 +241,14 @@
@ApiOperation("寮傚父浜哄憳鍐荤粨/鎷夐粦")
@PostMapping("/findUnusualPage")
@CloudRequiredPermission("business:member:query")
- public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap) {
+ public ApiResponse<PageData<MemberInfoDTO>> findUnusualPage (@RequestBody PageWrap<MemberQuery> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findUnusualPage(pageWrap));
}
@ApiOperation("鏍规嵁绫诲瀷鏌ヨ浜哄憳淇℃伅")
@PostMapping("/findTypeMemberInfo")
//@CloudRequiredPermission("business:member:query")
- public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member) {
+ public ApiResponse<List<Member>> findTypeMemberInfo (@RequestBody Member member,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(memberService.findList(member));
}
@@ -268,7 +268,7 @@
@ApiOperation("娴嬭瘯浜哄憳鍐荤粨")
@PostMapping("/testFreeFz")
- public ApiResponse testFreeFz() {
+ public ApiResponse testFreeFz(@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
memberService.memberFreeze();
return ApiResponse.success(null);
}
--
Gitblit v1.9.3