From 8a7b05e0683ff738233d39295e4ad169b72efc95 Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 18 十一月 2023 16:17:48 +0800
Subject: [PATCH] 调整车牌识别配置2
---
src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java | 6 +++++-
src/main/java/com/fzzy/protocol/sdkhk/HkGatewaySyncLprImpl.java | 2 ++
src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java | 6 +++++-
src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml | 2 +-
src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java | 4 ++++
src/main/java/com/fzzy/gateway/view/GatewayDevice.js | 2 +-
6 files changed, 18 insertions(+), 4 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..6c59892 100644
--- a/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
+++ b/src/main/java/com/fzzy/gateway/controller/GatewayDeviceController.java
@@ -3,6 +3,7 @@
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;
@@ -87,6 +88,7 @@
BaseReqData reqData;
int i = 1;
+ GatewaySyncLprService syncLprService;
for (GatewayDevice device : list) {
if (!GatewayDeviceType.TYPE_02.getCode().equals(device.getType())) {
@@ -94,7 +96,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++;
}
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java b/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
index 7f303e0..31ca79d 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/ApiInitService.java
@@ -4,6 +4,7 @@
import com.fzzy.api.data.GatewayDeviceType;
import com.fzzy.gateway.api.GatewayRemoteManager;
import com.fzzy.gateway.api.GatewayRemoteService;
+import com.fzzy.gateway.api.GatewaySyncLprService;
import com.fzzy.gateway.data.BaseReqData;
import com.fzzy.gateway.entity.GatewayConf;
import com.fzzy.gateway.entity.GatewayDevice;
@@ -65,6 +66,7 @@
BaseReqData reqData;
int i = 1;
+ GatewaySyncLprService syncLprService;
for (GatewayDevice device : list) {
if (!GatewayDeviceType.TYPE_02.getCode().equals(device.getType())) {
@@ -73,7 +75,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++;
}
}
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.js b/src/main/java/com/fzzy/gateway/view/GatewayDevice.js
index faff578..fcb9f63 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.js
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.js
@@ -25,7 +25,7 @@
$.ajax({
type:"POST",
contentType:"application/json;charset=UTF-8",
- url:"/gateway/control/initLpr",
+ url:"/gateway/control/init-lpr",
data:JSON.stringify(param),
success:function(result){
$alert(result);
diff --git a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
index 54c02aa..3e7e883 100644
--- a/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
+++ b/src/main/java/com/fzzy/gateway/view/GatewayDevice.view.xml
@@ -398,7 +398,7 @@
<Property name="property">httpUrl</Property>
<Editor/>
</AutoFormElement>
- <AutoFormElement layoutConstraint="colSpan:2">
+ <AutoFormElement>
<Property name="name">position</Property>
<Property name="property">position</Property>
<Editor/>
diff --git a/src/main/java/com/fzzy/protocol/sdkhk/HkGatewaySyncLprImpl.java b/src/main/java/com/fzzy/protocol/sdkhk/HkGatewaySyncLprImpl.java
index 29d535a..dadbb44 100644
--- a/src/main/java/com/fzzy/protocol/sdkhk/HkGatewaySyncLprImpl.java
+++ b/src/main/java/com/fzzy/protocol/sdkhk/HkGatewaySyncLprImpl.java
@@ -59,6 +59,8 @@
} catch (Exception e) {
log.error("----------------鍒濆鍖栬溅鐗岃瘑鍒墽琛岃瘑鍒け璐�----------------------{}", e);
+
+ return new BaseResp(500,"鎵ц澶辫触锛�"+e.getMessage());
}
return new BaseResp();
diff --git a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
index 24ec86f..7f73839 100644
--- a/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
+++ b/src/main/java/com/fzzy/protocol/weightyh/GatewaySyncWeightImplHttp.java
@@ -50,6 +50,10 @@
log.debug("--HTTP-WEIGHT-璇锋眰杩斿洖--{}", responseText);
+ if(StringUtils.isEmpty(responseText)) {
+ return new BaseResp(500, "鍚庡彴鎵ц澶辫触");
+ }
+
JSONObject resp;
String jsonStr;
//璇存槑鏄疛SONP鏍煎紡-jsonpCallback({"content":""})
--
Gitblit v1.9.3