From f1f506172a3edff8d31e4db77b8940f115660919 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期二, 20 九月 2022 16:25:43 +0800
Subject: [PATCH] fix
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencyPlanController.java | 51 ++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 44 insertions(+), 7 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 02ec7db..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
@@ -1,13 +1,16 @@
package com.gkhy.safePlatform.emergency.controller;
+import com.gkhy.safePlatform.commons.co.ContextCacheUser;
import com.gkhy.safePlatform.commons.query.PageQuery;
import com.gkhy.safePlatform.commons.utils.PageUtils;
import com.gkhy.safePlatform.commons.vo.ResultVO;
import com.gkhy.safePlatform.emergency.model.dto.req.EmergencyPlanReqDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencyPlanPageRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencyPlanQuery;
import com.gkhy.safePlatform.emergency.service.EmergencyPlanService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -24,18 +27,52 @@
* 应急预案列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
- private ResultVO<List<EmergencyPlanPageRespDTO>> list (@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
- PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
- return emergencyPlanService.selectEmergencyPlanList(pageQuery);
+ private ResultVO<List<EmergencyPlanPageRespDTO>> list (Authentication authentication,@RequestBody PageQuery<EmergencyPlanQuery> pageQuery){
+ PageUtils.checkCheck(pageQuery);
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.selectEmergencyPlanList(currentUser.getUid(),pageQuery);
}
/**
- * 新增应急预案
+ * 应急预案新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO<String> add(Principal principal, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
- String uid = principal.getName();
- return emergencyPlanService.add(Long.valueOf(uid), emergencyPlanReqDTO);
+ public ResultVO addEmergencyPlan(Authentication authentication, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.addEmergencyPlan(currentUser.getUid(), emergencyPlanReqDTO);
+ }
+
+ /**
+ * 应急预案详情
+ */
+ @RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
+ public ResultVO<EmergencyPlanDetailRespDTO> getEmergencyPlanById(@PathVariable("id")Long id){
+ return emergencyPlanService.getEmergencyPlanById(id);
+ }
+
+ /**
+ * 应急预案修改
+ */
+ @RequestMapping(value = "/update",method = RequestMethod.POST)
+ public ResultVO updateEmergencyPlan(Authentication authentication, @RequestBody EmergencyPlanReqDTO emergencyPlanReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencyPlanService.updateEmergencyPlan(currentUser.getUid(), emergencyPlanReqDTO);
+ }
+
+ /**
+ * 应急预案删除/批量删除
+ */
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ 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