From 5bb3ad3944ff229baff1d8bb92caf55d816ee68b Mon Sep 17 00:00:00 2001 From: jiazx0107@163.com <jiazx0107@163.com> Date: 星期六, 02 十二月 2023 18:34:45 +0800 Subject: [PATCH] 提交粮情协议1 --- src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java | 18 +++++++++++++++--- 1 files changed, 15 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java index 0d6b52a..a29e503 100644 --- a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java +++ b/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()); -- Gitblit v1.9.3