~czt/igds-api.git

			@@ -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);

			@@ -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);

	src/main/java/com/fzzy/gateway/hx2023/service/DeviceReportServiceImpl.java	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	src/main/java/com/fzzy/protocol/sdkhk/common/LPRCallBask_V31.java	7 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史