From 17f8dd032fc267b38cdddc88de416aeab2600f90 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: Wed, 21 Sep 2022 14:38:23 +0800
Subject: [PATCH] 根据物资类型分类-应急物资列表
---
emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java | 42 ++++++++++++++++++++++++++++--------------
1 files changed, 28 insertions(+), 14 deletions(-)
diff --git a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
index e5b98c0..2d67e62 100644
--- a/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
+++ b/emergency/emergency-service/src/main/java/com/gkhy/safePlatform/emergency/controller/EmergencySuppliesController.java
@@ -1,14 +1,18 @@
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.EmergencySuppliesReqDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesDetailRespDTO;
import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesPageRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesRespDTO;
+import com.gkhy.safePlatform.emergency.model.dto.resp.EmergencySuppliesTypeRespDTO;
import com.gkhy.safePlatform.emergency.query.EmergencySuppliesQuery;
import com.gkhy.safePlatform.emergency.service.EmergencySuppliesService;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
import org.springframework.web.bind.annotation.*;
import java.security.Principal;
@@ -22,25 +26,25 @@
private EmergencySuppliesService emergencySuppliesService;
/**
- * 应急预案列表
+ * 应急物资列表
*/
@RequestMapping(value = "/page/list" ,method = RequestMethod.POST)
private ResultVO<List<EmergencySuppliesPageRespDTO>> list (@RequestBody PageQuery<EmergencySuppliesQuery> pageQuery){
- PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+ PageUtils.checkCheck(pageQuery);
return emergencySuppliesService.selectEmergencySuppliesList(pageQuery);
}
/**
- * 应急预案新增
+ * 应急物资新增
*/
@RequestMapping(value = "/add",method = RequestMethod.POST)
- public ResultVO addEmergencySupplies(Principal principal, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesService.addEmergencySupplies(Long.valueOf(uid), emergencySuppliesReqDTO);
+ public ResultVO addEmergencySupplies(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesService.addEmergencySupplies(currentUser.getUid(), emergencySuppliesReqDTO);
}
/**
- * 应急预案详情
+ * 应急物资详情
*/
@RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
public ResultVO<EmergencySuppliesDetailRespDTO> getEmergencySuppliesById(@PathVariable("id")Long id){
@@ -48,19 +52,29 @@
}
/**
- * 应急预案修改
+ * 应急物资修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
- public ResultVO updateEmergencySupplies(Principal principal, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
- String uid = principal.getName();
- return emergencySuppliesService.updateEmergencySupplies(Long.valueOf(uid), emergencySuppliesReqDTO);
+ public ResultVO updateEmergencySupplies(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesService.updateEmergencySupplies(currentUser.getUid(), emergencySuppliesReqDTO);
}
/**
- * 应急预案删除/批量删除
+ * 应急物资删除/批量删除
*/
- @RequestMapping(value = "/batchDelete/{ids}",method = RequestMethod.GET)
- public ResultVO batchDeleteEmergencySupplies(@PathVariable("ids")String ids){
+ @RequestMapping(value = "/batchDelete",method = RequestMethod.POST)
+ public ResultVO batchDeleteEmergencySupplies(@RequestBody Long[] ids){
return emergencySuppliesService.batchDeleteEmergencySupplies(ids);
}
+ /**
+ * 应急物资-列表（为特殊作业提供数据）
+ */
+ @RequestMapping(value = "/emergencySuppliesList",method = RequestMethod.POST)
+ public ResultVO<List<EmergencySuppliesTypeRespDTO>> emergencySuppliesList(Authentication authentication){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ return emergencySuppliesService.emergencySuppliesList(currentUser);
+ }
+
+
}
--
Gitblit v1.9.2