From f1d3e99f71f28d42861d6599b3f6190480f830db Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 24 十月 2024 09:50:31 +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/HiddenDangerCloudController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 deletions(-)
diff --git a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
index 9ad1b32..a4960d6 100644
--- a/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
+++ b/server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java
@@ -67,6 +67,7 @@
@PostMapping("/page")
@CloudRequiredPermission("business:hiddendanger:query")
public ApiResponse<PageData<HiddenDanger>> findPage (@RequestBody PageWrap<HiddenDanger> pageWrap,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
return ApiResponse.success(hiddenDangerService.findPage(pageWrap));
}
@@ -74,13 +75,31 @@
@PostMapping("/exportExcel")
@CloudRequiredPermission("business:hiddendanger:exportExcel")
public void exportExcel (@RequestBody PageWrap<HiddenDanger> pageWrap, HttpServletResponse response,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ pageWrap.getModel().setLoginUserInfo(this.getLoginUser(token));
ExcelExporter.build(HiddenDanger.class).export(hiddenDangerService.findPage(pageWrap).getRecords(), "闅愭偅淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@GetMapping("/{id}")
@CloudRequiredPermission("business:hiddendanger:query")
- public ApiResponse findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ public ApiResponse<HiddenDanger> findById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
return ApiResponse.success(hiddenDangerService.findById(id));
}
+
+ @ApiOperation("闅愭偅澶勭悊")
+ @PostMapping("/dealHiddenDanger")
+ public ApiResponse dealHiddenDanger (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(getLoginUser(token));
+ hiddenDangerService.dealHiddenDanger(hiddenDanger);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
+ @ApiOperation("闅愭偅杞氦")
+ @PostMapping("/transferHiddenDanger")
+ public ApiResponse transferHiddenDanger (@RequestBody HiddenDanger hiddenDanger,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(getLoginUser(token));
+ hiddenDangerService.transferHiddenDanger(hiddenDanger);
+ return ApiResponse.success("鎿嶄綔鎴愬姛");
+ }
+
}
--
Gitblit v1.9.3