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 | 30 ++++++++++++++----------------
1 files changed, 14 insertions(+), 16 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 595dea3..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
@@ -67,22 +67,20 @@
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);
- }
- /**
- * 应急物资-根据ids获取数据（为特殊作业提供数据）
- */
- @RequestMapping(value = "/listCountByIds",method = RequestMethod.POST)
- public ResultVO<List<EmergencySuppliesRespDTO>> listCountByIds(Authentication authentication,@RequestBody List<Long> ids){
- ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return emergencySuppliesService.listCountByIds(currentUser,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