From 8ab31157536e116dba27e942a05a20e3caaa4812 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期三, 28 八月 2024 09:22:52 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java | 16 ++++++++++++++--
1 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
index b8c30f1..a614144 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/PlatformGroupCloudController.java
@@ -16,6 +16,8 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
+
/**
* @author 姹熻箘韫�
* @since 2024/04/28 16:06
@@ -33,6 +35,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:platformgroup:create")
public ApiResponse create(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformGroup.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(platformGroupService.create(platformGroup));
}
@@ -40,7 +43,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:platformgroup:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformGroupService.deleteById(id);
+ platformGroupService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -48,7 +51,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:platformgroup:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- platformGroupService.deleteByIdInBatch(this.getIdList(ids));
+ platformGroupService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,6 +59,7 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:platformgroup:update")
public ApiResponse updateById(@RequestBody PlatformGroup platformGroup,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ platformGroup.setLoginUserInfo(this.getLoginUser(token));
platformGroupService.updateById(platformGroup);
return ApiResponse.success(null);
}
@@ -64,8 +68,16 @@
@PostMapping("/page")
@CloudRequiredPermission("business:platformgroup:query")
public ApiResponse<PageData<PlatformGroup>> findPage (@RequestBody PageWrap<PlatformGroup> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setIsdeleted(Constants.ZERO);
return ApiResponse.success(platformGroupService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ鍒楄〃")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:platformgroup:query")
+ public ApiResponse<List<PlatformGroup>> list (@RequestBody PlatformGroup pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.setIsdeleted(Constants.ZERO);
+ return ApiResponse.success(platformGroupService.findList(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
--
Gitblit v1.9.3