From 330fcece11892289f2936ec8e11e4c8a610d5bab Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:30:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao
---
server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HiddenDangerCloudController.java | 25 +++++++++++++++++++------
1 files changed, 19 insertions(+), 6 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 f6604e0..2ed3580 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
@@ -6,10 +6,11 @@
import com.doumee.core.annotation.pr.PreventRepeat;
import com.doumee.core.constants.ResponseStatus;
import com.doumee.core.exception.BusinessException;
-import com.doumee.core.model.ApiResponse;
-import com.doumee.core.model.LoginUserInfo;
-import com.doumee.core.model.PageData;
-import com.doumee.core.model.PageWrap;
+import com.doumee.dao.business.vo.HiddenDangerDataVO;
+import com.doumee.service.business.third.model.ApiResponse;
+import com.doumee.service.business.third.model.LoginUserInfo;
+import com.doumee.service.business.third.model.PageData;
+import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.model.HiddenDanger;
import com.doumee.service.business.HiddenDangerService;
@@ -19,6 +20,7 @@
import org.springframework.web.bind.annotation.*;
import javax.servlet.http.HttpServletResponse;
+import java.util.List;
import java.util.Objects;
/**
@@ -50,7 +52,7 @@
@GetMapping("/delete/{id}")
@CloudRequiredPermission("business:hiddendanger:delete")
public ApiResponse deleteById(@PathVariable Integer id,@RequestHeader(Constants.HEADER_USER_TOKEN) String token){
- hiddenDangerService.deleteById(id);
+ hiddenDangerService.deleteById(id,this.getLoginUser(token));
return ApiResponse.success(null);
}
@@ -88,7 +90,9 @@
@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);
+ List<HiddenDanger> list = hiddenDangerService.findPage(pageWrap).getRecords();
+
+ ExcelExporter.build(HiddenDanger.class).export(list, "闅愭偅淇℃伅琛�", response);
}
@ApiOperation("鏍规嵁ID鏌ヨ")
@@ -114,4 +118,13 @@
return ApiResponse.success("鎿嶄綔鎴愬姛");
}
+
+ @ApiOperation("闅愭偅鏁版嵁缁熻")
+ @PostMapping("/hiddenDangerData")
+ public ApiResponse<HiddenDangerDataVO> hiddenDangerData (@RequestBody HiddenDanger hiddenDanger, @RequestHeader(Constants.HEADER_USER_TOKEN) String token){
+ hiddenDanger.setLoginUserInfo(getLoginUser(token));
+ return ApiResponse.success("鎿嶄綔鎴愬姛",hiddenDangerService.hiddenDangerData(hiddenDanger));
+ }
+
+
}
--
Gitblit v1.9.3