From cb18d50564b078747a2bf4a30b767ad876a97b6a Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 12 八月 2024 15:28:25 +0800
Subject: [PATCH] HKClient
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java | 3 +
ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java | 3 -
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 110 +-----------------------------------------------------
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java | 4 ++
4 files changed, 11 insertions(+), 109 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
index 03a8166..ae832f1 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import io.swagger.models.auth.In;
import lombok.Data;
@@ -40,6 +41,7 @@
/**
* 瀹℃牳鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date auditedTime;
@@ -86,6 +88,7 @@
/**
* ocr璇嗗埆鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date ocrTime;
private Integer timeInfoFormat;
@@ -95,111 +98,4 @@
*/
private Integer timeInfoMessage;
-// /**
-// * 鍖哄煙璺緞淇℃伅
-// */
-// @TextIndexed
-// private String arealayerPath;
-//
-// /**
-// * 鍖哄煙鍚嶇О
-// */
-// @TextIndexed
-// private String arealayername;
-//
-// /**
-// * 鍖哄煙缂栫爜
-// */
-// private String arealayerno;
-//
-// /**
-// * 璁惧 ID
-// */
-// @TextIndexed
-// private String deviceId;
-//
-// /**
-// * 璁惧鍚嶇О
-// */
-// @TextIndexed
-// private String deviceName;
-//
-// /**
-// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у��
-// */
-// private String diff;
-//
-// /**
-// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡
-// */
-// private Integer diffTime;
-//
-// /**
-// * IP 鍦板潃
-// */
-// @TextIndexed
-// private String ip;
-//
-// /**
-// * 鍥剧墖 ocr 璇嗗埆缁撴灉
-// */
-// private OcrResult ocrResult;
-//
-// /**
-// * 鍥剧墖鍦板潃
-// */
-// private String imgPath;
-//
-// /**
-// * 鐘舵�佺爜锛�0锛氭甯�
-// */
-// private Integer statusCode;
-//
-// /**
-// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�)
-// */
-// private String osdFormat;
-//
-// /**
-// * osd 淇℃伅
-// */
-// private OsdInfo osdInfo;
-//
-// /**
-// * 鍥剧墖涓婄殑瀛楀箷鏃堕棿
-// */
-// private String osdTime;
-//
-// /**
-// * 鎽勫儚鏈烘爣绛�
-// */
-// private List<String> tags;
-//
-// /**
-// * 鏇存柊鏃堕棿
-// */
-// private String updateTime;
-//
-// /**
-// * 瑙嗛鐮佹祦鑾峰彇鏃堕棿
-// */
-// private String videoGetTime;
-//
-// /**
-// * OCR璇嗗埆缁撴灉鐨勫唴閮ㄧ被
-// */
-// @Data
-// public static class OcrResult {
-// private List<String> data;
-// }
-//
-// /**
-// * osd淇℃伅鐨勫唴閮ㄧ被
-// */
-// @Data
-// public static class OsdInfo {
-// private String timeInfo;
-// private String positionInfo;
-// private String cameraInfo;
-// }
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
index 3f2c9ed..9ed4af2 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/RecordMetaDSumResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
@@ -30,6 +31,7 @@
/**
* 鍒涘缓鏃堕棿锛屾牸寮忎负鏃ユ湡鏃堕棿瀛楃涓�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date createTime;
/**
@@ -72,6 +74,7 @@
/**
* 缁熻鏃堕棿锛屾牸寮忎负鏃ユ湡瀛楃涓�
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date statTime;
/**
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
index 91ab627..7516d2f 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/VideoOnlineResult.java
@@ -1,5 +1,6 @@
package com.ycl.platform.domain.result.UY;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
@@ -56,6 +57,7 @@
/**
* 鏈�杩慽cmp鏃堕棿
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date icmpTime;
/**
* 鍏抽敭甯ф椂寤�
@@ -72,6 +74,7 @@
/**
*
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date olErrEverduringFirstTime;
/**
* 绱绂荤嚎鏁呴殰娆℃暟
@@ -116,6 +119,7 @@
/**
*
*/
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private Date vqdTime;
}
diff --git a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
index 4e1a0ec..b1f27b0 100644
--- a/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
+++ b/ycl-server/src/main/java/com/ycl/feign/HkApiUtil.java
@@ -21,7 +21,6 @@
@Slf4j
public class HkApiUtil {
-
/**
* 璋冪敤娴峰悍鎺ュ彛
*
@@ -60,7 +59,7 @@
try {
result = ArtemisHttpUtil.doPostStringArtemis(path, body, null, null, contentType , null);
} catch (Exception e) {
- log.error("鎺ュ彛锛氥�恵}銆戯紝璋冪敤澶辫触");
+ log.error("鎺ュ彛锛氥�恵}銆戯紝璋冪敤澶辫触",apiUrl);
e.printStackTrace();
}
return HkApiUtil.getDataList(JSONObject.parseObject(result), resultType);
--
Gitblit v1.8.0