changes

liuhaonan

2022-11-04 e55c8b0a92eb9715edd90c31dfd4de51a47b588b

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

@@ -1,11 +1,12 @@
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.util.ResponseUtil;
import com.sandu.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AirDataReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereHeartBeatReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
@@ -42,11 +43,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);
    }

@@ -55,7 +71,7 @@
        if (!permissionConfig.check(MenuEnum.AIR_DATA_UPDATE.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
        AtmosphereHeartBeatReqInnerFrame airDataReqInnerFrame = new AtmosphereHeartBeatReqInnerFrame();
        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
        System.out.println(a5Frame + "          --------a5Frame");

@@ -88,6 +104,17 @@
        resultMap.put("success", success);
        resultMap.put("failed", failed);

        /**
         * 服务端更新大气数据日志记录开始
         */
        String content = "更新结果：" + resultMap.toString();


        StoreOperationRecordsUtils.storeOperationData(listMac, null, "服务端更新大气数据", content);
        /**
         * 服务端更新大气数据日志记录结束
         */

        return ResponseUtil.success(resultMap);
    }