fix

zhanzhiqin

2022-05-09 098dd2ed33b90a8a14ff0b04bace845ec119244c

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

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

import com.alibaba.fastjson.JSON;
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.ximon.admin.manager.iot.amqp.processor.AirDataProcessor;
import com.sandu.ximon.admin.manager.iot.frame.A5Frame;
@@ -10,8 +10,10 @@
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.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.AirDataService;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -28,6 +30,7 @@
@RequestMapping("/v1/admin/airdata")
public class AirDataController {
    private final AirDataService airDataService;
    private PermissionConfig permissionConfig;

    /**
     * 查询大气数据模糊查询
@@ -37,6 +40,9 @@
     */
    @GetMapping("/listAirData")
    public ResponseVO<Object> listAirDataByKeyword(BaseConditionVO baseConditionVO, @RequestParam(required = false) String keyword) {
        if (!permissionConfig.check(MenuEnum.AIR_DATA_LIST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }
        List<AirDataBo> list = airDataService.listAirDataByKeyword(baseConditionVO, keyword);
        return ResponseUtil.successPage(list);
    }
@@ -48,16 +54,27 @@
     */
    @GetMapping("/listAirEquipmentMAC")
    public ResponseVO<Object> listAirEquipmentMAC() {
        //TODO
        List<String> list = airDataService.listAirEquipmentMAC();
        return ResponseUtil.success(list);
    }

    /**
     * 根据灯杆查询大气数据
     * @param
     * @return
     */
    @AnonymousAccess
    @GetMapping("/listAirDataByLamp")
    public ResponseVO<Object> listAirDataByLamp(@RequestParam Long lampId) {
        return ResponseUtil.success(airDataService.getDataByPoleid(lampId));
    }

    @PostMapping("/updateAirEquipmentInfo")
    public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
        AirDataReqInnerFrame airDataReqInnerFrame = new AirDataReqInnerFrame();
        A5Frame a5Frame = new A5Frame(A5OrderEnum.REQUEST_ATMOSPHERE_DATA.getCode(), airDataReqInnerFrame);
//        WrapResponseCommonFrame<A5AtmosphereHeartbeatReportInnerFrame> wrapResponseCommonFrame =
//                MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), a5Frame, A5AtmosphereHeartbeatReportInnerFrame.class);
        System.out.println(a5Frame + "          --------a5Frame");

        List<String> success = new ArrayList<>();
        List<String> failed = new ArrayList<>();
@@ -65,11 +82,8 @@
        listMac.parallelStream().forEach(macStr -> {
            try {
                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
//                //测试用的
//                String s = "{\"connectType\":\"FE\",\"crc32\":\"8685DF1B\",\"functionCode\":\"A5\",\"orderType\":\"84\",\"payload\":\"F0010022FFFF0101016666640000000000000000419D000000360089000000000002019300008CA14C69\",\"payloadLength\":\"002A\",\"validate\":true}";
//                CommonFrame commonFrame1 = JSON.parseObject(s, CommonFrame.class);
//                AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame1);
                AirDataProcessor.getInstance().process("a1JsfPG4iKW",macStr,commonFrame);
                System.out.println(commonFrame + "         -----------commonFrame");
                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                if (commonFrame != null) {
                    success.add(macStr);
                } else {