From fee66fde68610850d4c8c52df022b9d53a0cd3f7 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期三, 21 九月 2022 14:40:34 +0800
Subject: [PATCH] Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 14 ++++++++++++--
1 files changed, 12 insertions(+), 2 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
index 98841a1..6e32171 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java
@@ -27,9 +27,10 @@
* 应急预案列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
- private ResultVO<List<EmergencyPlanPageRespDTO>> list (@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
+ private ResultVO<List<EmergencyPlanPageRespDTO>> list (Authentication authentication,@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
PageUtils.checkCheck(pageQuery);
- return emergencyPlanService.selectEmergencyPlanList(pageQuery);
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.selectEmergencyPlanList(currentUser.getUid(),pageQuery);
}
/**
@@ -65,4 +66,13 @@
public ResultVO batchDeleteEmergencyPlan(@RequestBody Long[] ids){
return emergencyPlanService.batchDeleteEmergencyPlan(ids);
}
+
+ /**
+ * 应急预案废止/还原
+ */
+ @RequestMapping(value = "/updateAbolish",method = RequestMethod.GET)
+ public ResultVO updateAbolish(Long id ,Boolean abolishStatus){
+ return emergencyPlanService.updateAbolish(id,abolishStatus);
+ }
+
}
--
Gitblit v1.9.2