提交粮情协议1

jiazx0107@163.com

2023-12-02 5bb3ad3944ff229baff1d8bb92caf55d816ee68b

 src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java

@@ -1,8 +1,10 @@
package com.fzzy.gateway.controller;

import com.fzzy.api.data.GatewayDeviceProtocol;
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.GatewayUtils;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.api.GatewaySyncLprService;
import com.fzzy.gateway.data.BaseResp;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.entity.GateWayParam;
@@ -86,7 +88,8 @@
        }

        BaseReqData reqData;
        int i = 1;
        int i = 0;
        GatewaySyncLprService syncLprService;
        for (GatewayDevice device : list) {

            if (!GatewayDeviceType.TYPE_02.getCode().equals(device.getType())) {
@@ -94,7 +97,9 @@
            }
            reqData = new BaseReqData(device);
            reqData.setIndex(i);
            gatewayRemoteManager.getSyncLprService(device.getSyncProtocol()).initLpr(reqData);
            syncLprService = gatewayRemoteManager.getSyncLprService(device.getSyncProtocol());
            if(null == syncLprService) continue;
            syncLprService.initLpr(reqData);
            i++;
        }

@@ -121,7 +126,14 @@
            return "ERROR：当前设备没有配置布线规则，无法执行";
        }

        BaseResp resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrain(reqData);
        BaseResp resp =null;
        if(GatewayDeviceProtocol.DEVICE_TEST.getCode().equals(device.getSyncProtocol())){
            resp = gatewayRemoteManager.getGatewayTestService(device.getPushProtocol()).testGrain(reqData);
        }else{
            reqData.setAutoReplay(false);
            resp = gatewayRemoteManager.getSyncGrainService(device.getSyncProtocol()).syncGrain(reqData);
        }

        //自动推送
        if (BaseResp.CODE_200 == resp.getCode() && reqData.isAutoReplay()) {
            reqData.setData(resp.getData());