fix

zhanzhiqin

2022-10-14 e084918081ddd9c923060f67e3be676afe777a41

fix

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

@@ -8,8 +8,10 @@
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.report.A5AtmosphereNewHeartbeatReportInnerFrame;
import com.sandu.ximon.admin.manager.iot.frame.inner.request.AtmosphereNewReqInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.A5OrderEnum;
@@ -20,6 +22,7 @@
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 java.util.ArrayList;
@@ -32,6 +35,7 @@
 */
@RestController
@AllArgsConstructor
@Slf4j
@RequestMapping("/v1/admin/airdata_nonggeng")
public class AirDataNongGengController {
    private PermissionConfig permissionConfig;
@@ -51,7 +55,13 @@
                CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(macStr, a5Frame);
                StoreOperationRecordsUtils.storeInnerFrameData(macStr, "大气设备-心跳包", a5Frame, commonFrame);
                System.out.println(commonFrame + "         -----------commonFrame");
                AirDataProcessor.getInstance().process("a1JsfPG4iKW", macStr, commonFrame);
                A5AtmosphereNewHeartbeatReportInnerFrame heartbeatReportInnerFrame = new A5AtmosphereNewHeartbeatReportInnerFrame().transformFrame(commonFrame.getPayload());
                if (heartbeatReportInnerFrame != null && heartbeatReportInnerFrame.isValidate()) {
                    log.info(heartbeatReportInnerFrame.toString());
                    SpringContextHolder.getBean(AirDataNongGengService.class).saveReportData(macStr, heartbeatReportInnerFrame.getHeartBeatDataPackage());
                } else {
                    System.out.println("数据校验异常！");
                }
                if (commonFrame != null) {
                    success.add(macStr);
                } else {

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/request/AtmosphereNewReqInnerFrame.java

@@ -23,10 +23,10 @@
    @Override
    public String getEncodeFrame() {
        String functionCode = NewAtmoFunctionCode.NewQueryHeartBeat.getCode();
        String payloadLength = "0000";
        String payload = "0010";
        String sensorAddress = "0000";
        String sensorNums = "0013";

        String frame = MQTTConnectTypeEnum.NONG_GENG_SYSTEM_ADDRESS.getCode() + functionCode + payloadLength + payload;
        String frame = MQTTConnectTypeEnum.NONG_GENG_SYSTEM_ADDRESS.getCode() + functionCode + sensorAddress + sensorNums;
        return frame.toUpperCase() + CRC16Utils.getCRC16(frame.toUpperCase());
    }