changes

liuhaonan

2022-10-21 0a30812acaa26ebe654340f7e749a6801b63b194

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

@@ -5,11 +5,22 @@
 * @date 2022/4/24 17:36
 */

import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
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.AirDataNongGengService;
import com.sandu.ximon.dao.bo.AirDataNongGengBo;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import java.util.List;


/**
@@ -24,19 +35,31 @@
    private final AirDataNongGengService airDataNongGengService;



    /**
     * 查询大气数据模糊查询
     *
     * @param keyword 关键字
     * @return
     */
//    @GetMapping("/listAirData")
//    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
//        if (!permissionConfig.check(MenuEnum.AIR_DATA__NONG_GENG_LIST.getCode())) {
//            return ResponseUtil.fail("缺少对应用户权限");
//        }
//        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword);
//        return ResponseUtil.successPage(list);
//    }
    @GetMapping("/listAirData")
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword
            , @RequestParam(value = "type", required = false) String type) {
        if (type == null || type.isEmpty()) {
            throw new BusinessException("数据类型不能为空");
        }
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataNongGengBo> list = airDataNongGengService.listAirDataByKeyword(baseConditionVO, keyword, type);
        return ResponseUtil.success(list);
    }

    @GetMapping("/historyData")
    public ResponseVO<Object> historyData(BaseConditionVO baseConditionVO, @RequestParam(value = "mac", required = false) String mac) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataNongGengBo> list = airDataNongGengService.historyData(baseConditionVO, mac);
        return ResponseUtil.success(list);
    }
}