调整MQTT

jiazx0107@163.com

2023-11-09 97c75a868e9fca03598dfa862bdd7ad94fd5fdcb

 src/main/java/com/fzzy/gateway/service/GatewayDeviceService.java

@@ -13,17 +13,20 @@
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.entity.GatewayDevice;
import com.fzzy.gateway.hx2023.ScConstant;
import com.fzzy.gateway.hx2023.data.*;
import com.fzzy.gateway.service.repository.GatewayDeviceRep;

import com.fzzy.mqtt.MqttProviderConfig;
import com.fzzy.mqtt.MqttPublishService;
import lombok.extern.slf4j.Slf4j;

import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.data.domain.Sort;
import org.springframework.stereotype.Component;

@@ -47,6 +50,9 @@
    private GatewayRemoteManager gatewayRemoteManager;
    @Resource
    private MqttPublishService mqttPublishService;
    @Resource
    private MqttProviderConfig providerClient;

    /**
     * gatewayDeviceService#listAll
     *
@@ -112,10 +118,6 @@
    }






    /**
     * gatewayDeviceService#ajaxTestWeight
     * 地磅推送测试
@@ -172,6 +174,7 @@
    /**
     * gatewayDeviceService#ajaxTestLpr
     * 地磅推送测试
     *
     * @return
     */
    @Expose
@@ -248,6 +251,9 @@

    }




    private String pushByV40(List<GatewayDevice> list, Date start, Date end) {

        String depotIdSys;