Merge branch 'master' of https://sinanoaq.cn:8888/r/safePlatform-out into zf

zhangfeng

2022-09-21 fee66fde68610850d4c8c52df022b9d53a0cd3f7

 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,10 +47,10 @@
     */
    @PostMapping(value = "/page/list")
    public ResultVO selectAll(@RequestBody PageQuery<EquipmentTypeMngQueryCriteria> pageQuery){
      PageUtils.checkCheck(pageQuery);

      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);
    }

@@ -97,4 +102,4 @@
    public ResultVO treeData(){
        return new ResultVO<>(ResultCodes.OK,this.equipmentTypeMngService.treeData(0L));
    }
}
}