From 07e4b1114feadc19478847a9bcda869b5d6a5bf7 Mon Sep 17 00:00:00 2001
From: songhuangfeng123 <shf18767906695@163.com>
Date: 星期五, 02 九月 2022 14:23:10 +0800
Subject: [PATCH] 项目目录结构调整

---
 equipment/equipment-service/src/main/java/com/gkhy/safePlatform/equipment/controller/EquipmentTypeMngController.java |   28 +++++++++++-----------------
 1 files changed, 11 insertions(+), 17 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 80f2e30..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;
@@ -33,7 +34,11 @@
      */
     @Resource
     private EquipmentTypeMngService equipmentTypeMngService;
-
+    /**
+     * 服务对象
+     */
+    @Resource
+    private EquipmentTypeMngBaseService equipmentTypeMngBaseService;
     /**
      * 分页查询所有数据
      *
@@ -42,7 +47,7 @@
      */
     @PostMapping(value = "/page/list")
     public ResultVO selectAll(@RequestBody PageQuery<EquipmentTypeMngQueryCriteria> pageQuery){
-        PageUtils.checkCheck(pageQuery);
+
 		return this.equipmentTypeMngService.queryAll(pageQuery);
     }
 	
@@ -55,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));
     }
 
 	/**
@@ -67,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);
         }
     }
@@ -82,19 +87,8 @@
      */
     @RequestMapping(value = "/delete",method = RequestMethod.POST)
     public ResultVO delete(@RequestBody Long[] ids) {
-        if(ids == null){
-            return new ResultVO<>(ResultCodes.CLIENT_PARAM_ILLEGAL);
-        }
-        List<Long> idList = Arrays.asList(ids);
 
-        List<EquipmentTypeMng> delList = new ArrayList<>();
-        idList.forEach(f->{
-            EquipmentTypeMng info = new EquipmentTypeMng();
-            info.setDelFlag(1);
-            info.setId(f);
-            delList.add(info);
-        });
-        this.equipmentTypeMngService.updateBatchById(delList);
+        this.equipmentTypeMngService.delete(ids);
         return new ResultVO<>(ResultCodes.OK);
     }
 

--
Gitblit v1.9.2