功能完善

liuhaonan

2022-02-15 fa3ece9c09af10534a5d08e49d6c6ce0dde1c4f9

功能完善

 ximon-admin/src/main/java/com/sandu/ximon/admin/config/CommonConfig.java

ÎļþÒÑɾ³ý

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

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

import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
import com.sandu.ximon.admin.utils.AtmoAPIUtils;
import com.sandu.ximon.admin.utils.LogUtils;
import com.sandu.ximon.dao.bo.AirDataBo;
import com.sandu.ximon.admin.manager.iot.frame.FrameBuilder;
import com.sandu.ximon.admin.manager.iot.frame.IRequestFrame;
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.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.service.AirDataService;
import com.sandu.ximon.dao.bo.AirDataBo;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;

@@ -47,12 +50,14 @@

    @PostMapping("/updateAirEquipmentInfo")
    public ResponseVO<Object> updataAirEquipmentInfo(@RequestBody List<String> listMac) {
        AtmoAPIUtils atmoAPIUtils = new AtmoAPIUtils();
        for (String macString : listMac) {
            LogUtils.error(macString);
            atmoAPIUtils.queryHeartBeat(macString);
        }
        return null;

        IRequestFrame build = FrameBuilder.builderA5().innerFrame(new AirDataReqInnerFrame())
                .orderType(AtmoFunctionCode.QueryHeartBeat.getCode()).build();
//A5Frame frame=new A5Frame(AtmoFunctionCode.QueryHeartBeat.getCode(),build);

        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(listMac.get(0), build);

        return ResponseUtil.success(commonFrame);
    }

}

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

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

@@ -62,7 +62,7 @@
        return ResponseUtil.successPage(list);
    }

    @GetMapping("listPoleAndState")
    @GetMapping("/listPoleAndState")
    public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());


 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/AtmoHeartBeatDataPackage.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/DataTransportMainFrame.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/DataTransportMainResponse.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/DataTransportOrderType.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/MQTTConnectType.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/MainBoardResponse.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/RRPCParams.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/main/FunctionCode.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/main/InnerFrame.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/main/MainFrame.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/entity/main/OrderType.java

ÎļþÒÑɾ³ý

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

ÎļþÒÑɾ³ý

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

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,28 @@
package com.sandu.ximon.admin.manager.iot.frame.inner.request;

import com.sandu.ximon.admin.manager.iot.frame.inner.IRequestInnerFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.AtmoFunctionCode;
import com.sandu.ximon.admin.manager.iot.rrpc.enums.MQTTConnectTypeEnum;
import com.sandu.ximon.admin.manager.iot.rrpc.util.CRC32Utils;

/**
 * @Author liuhaonan
 * @Date 2022/2/15 11:07
 * @Version 1.0
 */

public class AirDataReqInnerFrame implements IRequestInnerFrame {

//    private final String payload;
//    private final String functionCode = DataTransportOrderType.LightTimer.getCode();
//    private final String payloadLength;
@Override
public String getEncodeFrame() {
    String functionCode = AtmoFunctionCode.QueryHeartBeat.getCode();
    String payloadLength = "0002";
    String payload = "FFFF";
    String frame = functionCode + payloadLength + payload;
    return MQTTConnectTypeEnum.SYNCHRONIZATION.getCode() + frame.toUpperCase() + CRC32Utils.getCRC32(frame.toUpperCase());
}

}

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/response/AtmoQueryHeartBeatResponse.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/AtmoFunctionCode.java

ÎļþÃû´Ó ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/frame/inner/AtmoFunctionCode.java ÐÞ¸Ä
@@ -1,4 +1,4 @@
package com.sandu.ximon.admin.manager.iot.frame.inner;
package com.sandu.ximon.admin.manager.iot.rrpc.enums;

/**
 * å¤§æ°”功能码

 ximon-admin/src/main/java/com/sandu/ximon/admin/manager/iot/rrpc/enums/MqttPDK.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampCountService.java

@@ -12,6 +12,9 @@
 */
@Service
@Data
/**
 * å·²å¼ƒç”¨
 */
public class LampCountService extends BaseServiceImpl<LampCountMapper, LampCount> {

  /*  public LampCount findCount(){

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampMissionService.java

@@ -13,6 +13,9 @@
import java.util.ArrayList;
import java.util.List;

/**
 * å·²å¼ƒç”¨
 */
@Service
@AllArgsConstructor
public class LampMissionService extends BaseServiceImpl<LampMissionMapper, LampMission> {

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/LampPostService.java

@@ -35,6 +35,9 @@
import java.util.ArrayList;
import java.util.List;

/**
 * å·²å¼ƒç”¨
 */
@Service
@Slf4j
@AllArgsConstructor

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/AtmoAPIUtils.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/Base64Util.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/ClientUtils.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/HexStrConvertUtil.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/MainBoardRRPCUtils.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/RRPCUtils.java

ÎļþÒÑɾ³ý

 ximon-admin/src/main/java/com/sandu/ximon/admin/vo/FrameDataVO.java

ÎļþÒÑɾ³ý