fix

zhanzhiqin

2022-06-29 6b0f6b3cae661291ced89676bfc9481ebf7eb763

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

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

import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
@@ -47,11 +49,26 @@
     * @return
     */
    @GetMapping("/listAirData")
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
        CommonPage commonPage = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.success(commonPage);
    }

    /**
     * 查询大气数据历史
     *
     * @param deviceMac 设备号
     * @return
     */
    @GetMapping("/listAirDataOfDeviceCode")
    public ResponseVO<Object> listAirDataOfDeviceCode(BaseConditionVO baseConditionVO, @RequestParam(value = "deviceMac", required = false) String deviceMac) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST_HISTORY.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataBo> list = airDataService.listAirDataOfDeviceCode(baseConditionVO, deviceMac);
        return ResponseUtil.successPage(list);
    }