From b3059e1a596b4fb05a708f3c3ac0ff3bc369d06b Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 12 十二月 2024 16:03:27 +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/HiddenDangerParamCloudController.java | 22 ++++++++++++++++++++--
1 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
index c74d591..042c1a0 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerParamCloudController.java
@@ -8,7 +8,9 @@
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.core.utils.Constants;
+import com.doumee.dao.admin.request.MemberQuery;
import com.doumee.dao.business.model.HiddenDangerParam;
+import com.doumee.dao.business.model.Member;
import com.doumee.service.business.HiddenDangerParamService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -16,6 +18,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 +37,7 @@
@PostMapping("/create")
@CloudRequiredPermission("business:hiddendangerparam:create")
public ApiResponse create(@RequestBody HiddenDangerParam hiddenDangerParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDangerParam.setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(hiddenDangerParamService.create(hiddenDangerParam));
}
@@ -40,7 +45,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:hiddendangerparam:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- hiddenDangerParamService.deleteById(id);
+ hiddenDangerParamService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -48,7 +53,7 @@
@GetMapping("/delete/batch")
@CloudRequiredPermission("business:hiddendangerparam:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- hiddenDangerParamService.deleteByIdInBatch(this.getIdList(ids));
+ hiddenDangerParamService.deleteByIdInBatch(this.getIdList(ids),this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -56,16 +61,29 @@
@PostMapping("/updateById")
@CloudRequiredPermission("business:hiddendangerparam:update")
public ApiResponse updateById(@RequestBody HiddenDangerParam hiddenDangerParam,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDangerParam.setLoginUserInfo(this.getLoginUser(token));
hiddenDangerParamService.updateById(hiddenDangerParam);
return ApiResponse.success(null);
}
+ @ApiOperation("鏌ヨ鍏ㄩ儴")
+ @PostMapping("/list")
+ @CloudRequiredPermission("business:hiddendangerparam:query")
+ public ApiResponse<List<HiddenDangerParam>> findPage (@RequestBody HiddenDangerParam pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(hiddenDangerParamService.findList(pageWrap));
+ }
@ApiOperation("鍒嗛〉鏌ヨ")
@PostMapping("/page")
@CloudRequiredPermission("business:hiddendangerparam:query")
public ApiResponse<PageData<HiddenDangerParam>> findPage (@RequestBody PageWrap<HiddenDangerParam> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(hiddenDangerParamService.findPage(pageWrap));
}
+ @ApiOperation("鏌ヨ闅愭偅鍖哄煙鍏ㄩ儴瀹夊叏鍛�")
+ @PostMapping("/findHiddenAreaMemberList")
+ @CloudRequiredPermission("business:member:query")
+ public ApiResponse<List<Member>> findVisitPage (@RequestBody HiddenDangerParam pageWrap, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ return ApiResponse.success(hiddenDangerParamService.findHiddenAreaMemberList(pageWrap));
+ }
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
--
Gitblit v1.9.3