From cd02923a7ce1ffa004b3abbb7af67ab6173dd99d Mon Sep 17 00:00:00 2001
From: zf <1603559716@qq.com>
Date: 星期一, 25 三月 2024 10:59:40 +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/EmergencySuppliesController.java | 34 ++++++++++++++++++++++++++--------
1 files changed, 26 insertions(+), 8 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 ae1e471..e9792f5 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
@@ -7,6 +7,8 @@
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;
@@ -24,16 +26,16 @@
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(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
@@ -42,7 +44,7 @@
}
/**
- * 应急预案详情
+ * 应急物资详情
*/
@RequestMapping(value = "/info/{id}",method = RequestMethod.GET)
public ResultVO<EmergencySuppliesDetailRespDTO> getEmergencySuppliesById(@PathVariable("id")Long id){
@@ -50,7 +52,7 @@
}
/**
- * 应急预案修改
+ * 应急物资修改
*/
@RequestMapping(value = "/update",method = RequestMethod.POST)
public ResultVO updateEmergencySupplies(Authentication authentication, @RequestBody EmergencySuppliesReqDTO emergencySuppliesReqDTO) {
@@ -59,10 +61,26 @@
}
/**
- * 应急预案删除/批量删除
+ * 应急物资删除/批量删除
*/
- @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 List<EmergencySuppliesTypeRespDTO> emergencySuppliesList(Authentication authentication){
+// ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+// return emergencySuppliesService.emergencySuppliesList(currentUser);
+// }
+// /**
+// * 应急物资-根据ids获取数据（为特殊作业提供数据）
+// */
+// @RequestMapping(value = "/listCountByIds",method = RequestMethod.POST)
+// public List<EmergencySuppliesRespDTO> listCountByIds(Authentication authentication,@RequestBody List<Long> ids){
+// ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+// return emergencySuppliesService.listCountByIds(currentUser,ids);
+// }
+
+
}
--
Gitblit v1.9.2