fix

zhanzhiqin

2022-05-18 c060df1d22f23f059c03c432b6ff420bcb9801cf

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

@@ -3,17 +3,24 @@
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
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.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
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.admin.service.PoleBindingService;
import com.sandu.ximon.admin.utils.RedisUtils;
import com.sandu.ximon.admin.utils.StoreOperationRecordsUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.MenuEnum;
import com.sandu.ximon.dao.enums.PoleBindingEnums;
import com.sandu.ximon.dao.mapper.PoleBindingMapper;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -40,7 +47,7 @@
     * @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("缺少对应用户权限");
        }
@@ -63,9 +70,15 @@
        listMac.parallelStream().forEach(macStr -> {
            try {
                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
                StoreOperationRecordsUtils.storeInnerFrameData(macStr, "大气设备-心跳包", a5Frame, commonFrame);
                System.out.println(commonFrame + "         -----------commonFrame");
                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                if (commonFrame != null) {

                    //存缓存心跳包
                    RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT.getCode() + macStr, commonFrame);
                    //存缓存状态
                    RedisUtils.getBean().set(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + macStr, commonFrame, 300L);

                    success.add(macStr);
                } else {
@@ -80,6 +93,17 @@
        resultMap.put("success", success);
        resultMap.put("failed", failed);

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


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

        return ResponseUtil.success(resultMap);
    }