bug修复

liuhaonan

2022-06-06 15fe445c820f28139e4e7e1a4cb286ad6ae37e6e

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/AirEquipmentController.java

@@ -1,9 +1,12 @@
package com.sandu.ximon.admin.controller;

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirEquipmentService;
import com.sandu.ximon.dao.domain.AirEquipment;
import com.sandu.ximon.dao.bo.AirEquipmentBo;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -17,26 +20,27 @@
@RequestMapping("/v1/admin/airequipment")
public class AirEquipmentController {
    private final AirEquipmentService airEquipmentService;

    @GetMapping
    public ResponseVO<Object> listAirEquipment() {
        List<AirEquipment> list = airEquipmentService.listAirEquipment();
        return ResponseUtil.successPage(list);
    }
    private PermissionConfig permissionConfig;

    /**
     * 模糊查询
     * 查询大气设备
     *
     * @return
     */
    @GetMapping("/listAirEquipmentByKeyword/{keyword}")
    public ResponseVO<Object> listAirEquipmentByKeyword(@PathVariable String keyword) {
        List<AirEquipment> list = airEquipmentService.listAirEquipmentByKeyword(keyword);
    @GetMapping("/listAirEquipment")
    public ResponseVO<Object> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirEquipmentBo> list = airEquipmentService.listAirEquipmentByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }

    @PostMapping("/delete/{id}")
    public ResponseVO<Object> deleteAirEquipment(@PathVariable Long id) {
        if (!permissionConfig.check(MenuEnum.AIR_EQUIPMENT_DELETE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        boolean result = airEquipmentService.deleteAirEquipment(id);
        if (result) {
            return ResponseUtil.success(null);
@@ -44,4 +48,5 @@
            return ResponseUtil.fail("操作失败");
        }
    }

}