重新调整代码结构和实现方式2,注意设备中的上行协议调整

jiazx0107@163.com

2023-11-10 715f40da0c953ec0080ccf056f9d759c3a249ea0

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

@@ -1,20 +1,18 @@
package com.fzzy.gateway.service;

import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson2.JSONObject;
import com.bstek.dorado.annotation.Expose;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.api.utils.DateUtil;
import com.fzzy.async.fzzy40.Fzzy40CommonService;
import com.fzzy.async.fzzy40.entity.Fz40Grain;
import com.fzzy.gateway.api.DeviceReportService;
import com.fzzy.gateway.api.GatewayDeviceReportService;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.data.BaseReqData;
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.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang.time.DateFormatUtils;
@@ -59,7 +57,7 @@
     */
    @Expose
    public String ajaxTestGrain2(GatewayDevice data) {
        SyncReqData reqData = new SyncReqData();
        BaseReqData reqData = new BaseReqData();
        reqData.setDevice(data);
        reqData.setAutoReplay(true);
        reqData.setMessageType(ScConstant.MESSAGE_TYPE_INVOKE_FUNCTION);
@@ -75,7 +73,7 @@
            return "ERROR：当前设备没有配置布线规则，无法执行";
        }

        BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain2(reqData);
        BaseResp resp = gatewayRemoteManager.getSyncGrainService(data.getSyncProtocol()).syncGrain(reqData);

        //自动推送
        if (200 == resp.getCode() && reqData.isAutoReplay()) {
@@ -130,7 +128,7 @@

        KafaGrainData pushData;

        DeviceReportService deviceReportService = null;
        GatewayDeviceReportService deviceReportService = null;
        for (GatewayDevice device : list) {
            depotIdSys = device.getDepotIdSys();

@@ -155,11 +153,11 @@


            if (null == deviceReportService) {
                deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getProvinceProtocol());
                deviceReportService = gatewayRemoteManager.getDeviceReportService(device.getPushProtocol());
            }


            deviceReportService.pushGrainData2Cloud(pushData);
           // deviceReportService.pushGrainData2Cloud(pushData);

        }