From f600f38c6c23a282b61ed4db1b2da094d695276f Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 25 十一月 2022 16:43:52 +0800
Subject: [PATCH] 安全物资和设备管理调整
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java
index ebad542..56a8311 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java
@@ -2,7 +2,12 @@
import com.alibaba.fastjson.JSONObject;
import com.gkhy.safePlatform.commons.co.ContextCacheUser;
+import com.gkhy.safePlatform.commons.enums.ResultCodes;
+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.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.equipment.model.dto.req.MaterialClassifyQuery;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyAddReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyModReq;
import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery;
@@ -28,9 +33,20 @@
* @return
*/
@PostMapping(value = "/list")
- public ResultVO<List<SafeMaterialClassifyDto>> list(Authentication authentication, @RequestBody SafeMaterialClassifyQuery query){
+ public ResultVO<List<SafeMaterialClassifyDto>> list(Authentication authentication){
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
- return materialClassifyService.list(query);
+ return new ResultVO<>(ResultCodes.OK,materialClassifyService.list());
+
+ }
+ /**
+ * 列表
+ * @return
+ */
+ @PostMapping(value = "page/list")
+ public SearchResultVO<List<SafeMaterialClassifyDto>> listByPage(Authentication authentication,@RequestBody PageQuery<MaterialClassifyQuery> pageQuery){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+ PageUtils.checkCheck(pageQuery);
+ return materialClassifyService.listByPage(pageQuery);
}
@@ -71,6 +87,6 @@
@PostMapping(value = "queryById")
public ResultVO<SafeMaterialClassifyDto> queryById(Authentication authentication, @RequestBody JSONObject jsonObject){
Long id = jsonObject.getLong("id");
- return materialClassifyService.queryById(id);
+ return new ResultVO<>(ResultCodes.OK,materialClassifyService.queryById(id));
}
}
--
Gitblit v1.9.2