changes

LHN

2022-10-20 04598cd1d53ed99675f8142e632c71dc5fd87daa

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

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

import com.baomidou.mybatisplus.core.toolkit.StringUtils;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.util.StringUtil;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.execption.BusinessException;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.security.annotation.AnonymousAccess;
import com.sandu.common.util.ResponseUtil;
import com.sandu.common.util.SpringContextHolder;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.CommonFrame;
import com.sandu.ximon.admin.manager.iot.rrpc.dto.InvokeParam;
import com.sandu.ximon.admin.manager.iot.rrpc.mainboard.MainBoardInvokeSyncService;
import com.sandu.ximon.admin.param.MonitorParam;
import com.sandu.ximon.admin.param.MQTTTestPrarm;
import com.sandu.ximon.admin.security.PermissionConfig;
import com.sandu.ximon.admin.service.PoleService;
import com.sandu.ximon.dao.domain.Pole;
import com.sandu.ximon.dao.enums.MenuEnum;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.*;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

/**
 * MQTT测试
@@ -37,22 +38,20 @@
     *
     * @return
     */
    @GetMapping("/sendRRPC")
    public ResponseVO<Object> listMonitorByKeyword(@RequestParam(value = "poleId", required = false) Long poleId,
                                                   @RequestParam(value = "frameStr", required = false) String frameStr) {
        if (poleId == null) {
            throw new BusinessException("灯杆ID不能为空！");
        }

        if (StringUtil.isEmpty(frameStr)) {
            throw new BusinessException("请求帧数据不能为空！");
        }
    @AnonymousAccess
    @PostMapping("/sendRRPC")
    public ResponseVO<Object> sendRRPC(@RequestBody @Validated MQTTTestPrarm mqttTestPrarm) {
        /**
         * 测试数据
         * poleMac:32313243305005ff3867ffff
         * frameStr:/qUBAAv+AQAD//8ARZcUd7bYwso=
         */
        if (!permissionConfig.check(MenuEnum.MQTT_TEST.getCode())) {
            return ResponseUtil.fail("缺少对应用户权限");
        }


        Pole pole = SpringContextHolder.getBean(PoleService.class).getById(poleId);
        Pole pole = SpringContextHolder.getBean(PoleService.class).getById(mqttTestPrarm.getPoleId());
        if (pole == null) {
            throw new BusinessException("灯杆不存在！");
        }
@@ -63,7 +62,7 @@

        InvokeParam param = new InvokeParam();
        param.setOperate("1001");
        param.setFrame(frameStr);
        param.setFrame(mqttTestPrarm.getFrameStr());
        CommonFrame commonFrame = MainBoardInvokeSyncService.getInstance().sendRRPC(pole.getDeviceCode(), param);
        if (commonFrame == null) {
            throw new BusinessException("请求失败，请重新请求");