From f7d2f20365467a834188edd35c464d9fb9349214 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期五, 23 十二月 2022 08:53:43 +0800
Subject: [PATCH] 安全物资和设备管理调整v2
---
equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/MaterialClassifyController.java | 37 ++++++++++++++++++++++++++++++-------
1 files changed, 30 insertions(+), 7 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..91a9ab1 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,10 +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.equipment.model.dto.req.SafeMaterialClassifyAddReq;
-import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyModReq;
-import com.gkhy.safePlatform.equipment.model.dto.req.SafeMaterialClassifyQuery;
+import com.gkhy.safePlatform.commons.vo.SearchResultVO;
+import com.gkhy.safePlatform.equipment.model.dto.req.*;
import com.gkhy.safePlatform.equipment.model.dto.resp.SafeMaterialClassifyDto;
import com.gkhy.safePlatform.equipment.service.MaterialClassifyService;
import org.springframework.beans.factory.annotation.Autowired;
@@ -28,9 +30,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(currentUser,pageQuery);
}
@@ -62,15 +75,25 @@
public ResultVO delete(Authentication authentication, @RequestBody JSONObject jsonObject){
ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long id = jsonObject.getLong("id");
- return materialClassifyService.delete(id);
+ return materialClassifyService.delete(currentUser,id);
}
+ /**
+ * 逻辑删除-批量
+ * @return
+ */
+// @PostMapping(value = "batch/delete")
+// public ResultVO batchDelete(Authentication authentication, @Validated @RequestBody ParamForm paramForm){
+// ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
+// return materialClassifyService.batchDelete(currentUser,paramForm);
+// }
/**
* 查询单条数据
*/
@PostMapping(value = "queryById")
public ResultVO<SafeMaterialClassifyDto> queryById(Authentication authentication, @RequestBody JSONObject jsonObject){
+ ContextCacheUser currentUser = (ContextCacheUser) authentication.getPrincipal();
Long id = jsonObject.getLong("id");
- return materialClassifyService.queryById(id);
+ return new ResultVO<>(ResultCodes.OK,materialClassifyService.queryById(currentUser,id));
}
}
--
Gitblit v1.9.2