From 99968f83982943669af3829ea6bc3bbe745cada4 Mon Sep 17 00:00:00 2001
From: zhangfeng <1603559716@qq.com>
Date: 星期一, 21 十一月 2022 08:41:48 +0800
Subject: [PATCH] 安全物资和设备管理相关rpc接口

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java |   25 +++++++++++++++----------
 1 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
index 1cfb6b4..80744e2 100644
--- a/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
+++ b/equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java
@@ -5,6 +5,7 @@
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.gkhy.safePlatform.equipment.entity.EquipmentTypeMng;
 import com.gkhy.safePlatform.equipment.service.EquipmentTypeMngService;
+import com.gkhy.safePlatform.equipment.service.baseService.EquipmentTypeMngBaseService;
 import org.springframework.web.bind.annotation.*;
 import com.gkhy.safePlatform.commons.query.PageQuery;
 import com.gkhy.safePlatform.commons.utils.PageUtils;
@@ -12,6 +13,7 @@
 import com.gkhy.safePlatform.commons.enums.ResultCodes;
 import com.gkhy.safePlatform.equipment.model.dto.req.EquipmentTypeMngQueryCriteria;
 
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.stream.Collectors;
 import javax.annotation.Resource;
@@ -32,7 +34,11 @@
      */
     @Resource
     private EquipmentTypeMngService equipmentTypeMngService;
-
+    /**
+     * 服务对象
+     */
+    @Resource
+    private EquipmentTypeMngBaseService equipmentTypeMngBaseService;
     /**
      * 分页查询所有数据
      *
@@ -41,7 +47,7 @@
      */
     @PostMapping(value = "/page/list")
     public ResultVO selectAll(@RequestBody PageQuery<EquipmentTypeMngQueryCriteria> pageQuery){
-		PageUtils.checkCheck(pageQuery.getPageIndex(), pageQuery.getPageSize());
+
 		return this.equipmentTypeMngService.queryAll(pageQuery);
     }
 	
@@ -54,7 +60,7 @@
      */
     @GetMapping(value = "/selectOne/{id}")
     public ResultVO selectOne(@PathVariable Serializable id) {
-        return new ResultVO<>(ResultCodes.OK,this.equipmentTypeMngService.getById(id));
+        return new ResultVO<>(ResultCodes.OK,this.equipmentTypeMngBaseService.getById(id));
     }
 
 	/**
@@ -66,9 +72,9 @@
     @PostMapping(value = "/addOrUpdate")
     public ResultVO update(@RequestBody EquipmentTypeMng equipmentTypeMng) {
         if (equipmentTypeMng.getId() == null) {
-            return new ResultVO<>(ResultCodes.OK,equipmentTypeMngService.save(equipmentTypeMng));
+            return new ResultVO<>(ResultCodes.OK,equipmentTypeMngBaseService.save(equipmentTypeMng));
         } else {
-            equipmentTypeMngService.update(equipmentTypeMng,new UpdateWrapper<EquipmentTypeMng>().eq("id",equipmentTypeMng.getId()));
+            equipmentTypeMngBaseService.update(equipmentTypeMng,new UpdateWrapper<EquipmentTypeMng>().eq("id",equipmentTypeMng.getId()));
             return new ResultVO<>(ResultCodes.OK);
         }
     }
@@ -79,11 +85,10 @@
      * @param ids 主键结合
      * @return 删除结果
      */
-    @GetMapping(value = "/delete")
-    public ResultVO delete(String ids) {
-	List<String> idList = Arrays.stream(ids.split(","))
-                .collect(Collectors.toList());
-        this.equipmentTypeMngService.removeByIds(idList);
+    @RequestMapping(value = "/delete",method = RequestMethod.POST)
+    public ResultVO delete(@RequestBody Long[] ids) {
+
+        this.equipmentTypeMngService.delete(ids);
         return new ResultVO<>(ResultCodes.OK);
     }
 

--
Gitblit v1.9.2