From f15b4feb486a85dcc3b9b5c68a8526957a6ad0bd Mon Sep 17 00:00:00 2001
From: jiazx0107@163.com <jiazx0107@163.com>
Date: 星期六, 18 十一月 2023 16:53:24 +0800
Subject: [PATCH] 调整车牌识别配置3
---
src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java | 5 ++++-
src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java | 7 ++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
index d71a7c5..7ba5fdc 100644
--- a/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
+++ b/src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java
@@ -14,6 +14,7 @@
import com.fzzy.gateway.hx2023.kafka.KafkaDeviceReportService;
import com.fzzy.mqtt.MqttGatewayService;
import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang.StringUtils;
import org.springframework.stereotype.Component;
import javax.annotation.Resource;
@@ -97,7 +98,7 @@
GatewayDevice device = reqData.getDevice();
- if (null == reqData.getData()) {
+ if (StringUtils.isEmpty(reqData.getData())) {
WebSocketPacket packet = new WebSocketPacket();
WebSocketPacketHeader header = new WebSocketPacketHeader();
header.setDeviceName(reqData.getDeviceName());
@@ -116,6 +117,8 @@
jsonObject.put("position", device.getPosition());
packet.setProperties(jsonObject);
packet.setTimestamp(System.currentTimeMillis());
+
+ reqData.setData(JSONObject.toJSONString(packet));
}
publishService.publishMqttWithTopic(reqData.getData(), topic);
diff --git a/src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java b/src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java
index 8b7246a..7e9e557 100644
--- a/src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java
+++ b/src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java
@@ -61,8 +61,9 @@
if (StringUtils.isNotEmpty(deviceIp)) deviceIp = deviceIp.trim();
- log.info("杞︾墝鍙凤細" + sLicense + ":杞﹁締绫诲瀷锛�" + VehicleType + ":鐩戞帶鐐圭紪鍙凤細" + MonitoringSiteID + "-璁惧IP=" + deviceIp + "-SN=" + deviceSn);
+ //log.info("杞︾墝鍙凤細" + sLicense + ":杞﹁締绫诲瀷锛�" + VehicleType + ":鐩戞帶鐐圭紪鍙凤細" + MonitoringSiteID + "-璁惧IP=" + deviceIp + "-SN=" + deviceSn);
+ log.info("杞︾墝鍙凤細" + sLicense + ":杞﹁締绫诲瀷锛�" + VehicleType + "-璁惧IP=" + deviceIp + "-SN=" + deviceSn);
//寮�濮嬫墽琛屾帹閫�
GatewayDevice device = GatewayUtils.getCacheByDeviceSn(deviceSn);
@@ -77,6 +78,10 @@
//鏁版嵁灏佽鎺ㄩ��
BaseReqData reqData = new BaseReqData(device);
+
+ if (sLicense.startsWith("钃�") || sLicense.startsWith("榛�")) {
+ sLicense = sLicense.replace("钃�", "").replace("榛�", "");
+ }
reqData.setCarNumber(sLicense);
gatewayRemoteManager.getDeviceReportService(device.getPushProtocol()).reportLprData(reqData);
--
Gitblit v1.9.3