From 38ab8fbd4355070def9e3b39f362731dd4dea6d1 Mon Sep 17 00:00:00 2001
From: CZT <czt18638530771@163.com>
Date: 星期三, 30 八月 2023 20:54:12 +0800
Subject: [PATCH] 优化设备状态解析
---
igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java | 61 +++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 14 deletions(-)
diff --git a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
index 44a5e1f..ab9f1a3 100644
--- a/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
+++ b/igds-protocol-block/src/main/java/com/ld/igds/protocol/openapi/OpenApiInoutService.java
@@ -1,8 +1,15 @@
package com.ld.igds.protocol.openapi;
+import com.alibaba.fastjson.JSONObject;
+import com.ld.igds.camera.CameraUtil;
import com.ld.igds.inout.ApiInoutService;
import com.ld.igds.inout.dto.ApiInoutData;
+import com.ld.igds.inout.dto.InoutData;
import com.ld.igds.io.constant.ProtocolEnum;
+import com.ld.igds.protocol.openapi.data.PlateReqVo;
+import com.ld.igds.protocol.openapi.data.SinglePlateRepVo;
+import com.ld.igds.util.HttpUtils;
+import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.stereotype.Component;
@@ -11,6 +18,7 @@
* @author: andy.jia
* @update-time: 2023/6/29 15:21
*/
+@Slf4j
@Component
public class OpenApiInoutService implements ApiInoutService {
@@ -32,22 +40,42 @@
@Override
public ApiInoutData getPlateNum(ApiInoutData param) {
+ try {
- String rtsp = param.getMediaAddr();
- if (StringUtils.isEmpty(rtsp)) {
- param.setErrorMsg("褰撳墠杞︾墝璇嗗埆璁惧鏈厤缃挱鏀惧湴鍧�");
+ log.info("-----------璋冪敤椋庢鑷磋繙---OPEN-API-HTTP杞︾墝璇嗗埆-----");
- return param;
+ String rtsp = param.getMediaAddr();
+
+ if (StringUtils.isEmpty(rtsp)) {
+ param.setErrorMsg("褰撳墠杞︾墝璇嗗埆璁惧鏈厤缃挱鏀惧湴鍧�");
+
+ return param;
+ }
+
+ //璇存槑鍦板潃鏈仛淇℃伅鏇挎崲
+ if (rtsp.indexOf("{0}") > 0) {
+ rtsp = CameraUtil.updateMediaAddr(rtsp, param.getLoginId(), param.getPwd(), param.getIp(), param.getPortCtrl(), param.getChanNum());
+ }
+
+ PlateReqVo reqVo = new PlateReqVo();
+ reqVo.setImage(null);
+ reqVo.setLimit(1);
+ reqVo.setRtsp(rtsp);
+
+ String jsonReturn = HttpUtils.doPostJson(http_url, JSONObject.toJSONString(reqVo));
+
+ SinglePlateRepVo repVo = JSONObject.parseObject(jsonReturn, SinglePlateRepVo.class);
+
+ if (0 == repVo.getCode() && "SUCCESS".equalsIgnoreCase(repVo.getMessage())) {
+ param.setPlateNum(repVo.getPlateNo());
+ } else {
+ param.setErrorMsg("璇嗗埆澶辫触锛�" +repVo.getMessage());
+ }
+
+ } catch (Exception e) {
+ param.setErrorMsg("璇嗗埆澶辫触锛�" + e.getMessage());
}
-
- //璇存槑鍦板潃鏈仛淇℃伅鏇挎崲
- if (rtsp.indexOf("{0}") > 0) {
-
- }
-
- // HttpUtils.doPostJson()
-
return param;
}
@@ -64,12 +92,17 @@
}
@Override
- public String noticeRadio(ApiInoutData param) {
+ public String lightControl(ApiInoutData param) {
+ return null;
+ }
+
+ @Override
+ public String noticeRadio(ApiInoutData param, InoutData data) {
return "褰撳墠鍗忚涓嶆敮鎸�";
}
@Override
- public String noticeLed(ApiInoutData param) {
+ public String noticeLed(ApiInoutData param, InoutData data) {
return "褰撳墠鍗忚涓嶆敮鎸�";
}
}
--
Gitblit v1.9.3