From 01a30369e55a754c28dec4939a99e59aefecdc60 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 20:48:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ycl-server/src/main/java/com/ycl/platform/controller/SynPY/SynPYController.java | 31 ++++
ycl-server/src/main/java/com/ycl/config/SecurityConfig.java | 2
ycl-server/src/main/java/com/ycl/task/UYTask.java | 5
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdMonitorResult.java | 220 +++++++++++++++++++++----------
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java | 144 ++++++++++++++++++++
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 2
6 files changed, 332 insertions(+), 72 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 531246b..03a8166 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,10 +1,12 @@
package com.ycl.platform.domain.result.UY;
import com.ycl.platform.domain.result.BaseResult;
+import io.swagger.models.auth.In;
import lombok.Data;
import org.springframework.data.mongodb.core.index.TextIndexed;
import org.springframework.data.mongodb.core.mapping.Document;
+import java.util.Date;
import java.util.List;
/**
@@ -17,111 +19,187 @@
@Document(collection = "uy_osd_monitor")
public class OsdMonitorResult extends BaseResult {
- /**
- * 鍖哄煙璺緞淇℃伅
- */
- @TextIndexed
- private String arealayerPath;
+ private Integer areaInfoFormat;
/**
- * 鍖哄煙鍚嶇О
+ * 杈栧尯淇℃伅
*/
- @TextIndexed
+ private String areaInfoMessage;
+
+ /**
+ * 琛屾斂鍖哄煙
+ */
private String arealayername;
- /**
- * 鍖哄煙缂栫爜
- */
+
private String arealayerno;
+
+ private Integer audited;
+
/**
- * 璁惧 ID
+ * 瀹℃牳鏃堕棿
*/
- @TextIndexed
+ private Date auditedTime;
+
+
+ private Integer cameraInfoFormat;
+
+ /**
+ * 鎽勫儚鏈轰俊鎭�
+ */
+ private String cameraInfoMessage;
+
+ /**
+ * 璁惧ID
+ */
private String deviceId;
/**
* 璁惧鍚嶇О
*/
- @TextIndexed
private String deviceName;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊鏄惁澶т簬鏈�澶у��
+ * ip鍦板潃
*/
- private String diff;
-
- /**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�), -1 琛ㄧず鏈煡
- */
- private Integer diffTime;
-
- /**
- * IP 鍦板潃
- */
- @TextIndexed
private String ip;
- /**
- * 鍥剧墖 ocr 璇嗗埆缁撴灉
- */
- private OcrResult ocrResult;
+
+ private Integer locationInfoFormat;
/**
- * 鍥剧墖鍦板潃
+ * 鍦扮偣淇℃伅
*/
- private String imgPath;
+ private String locationInfoMessage;
/**
- * 鐘舵�佺爜锛�0锛氭甯�
+ * ocr淇℃伅
*/
- private Integer statusCode;
+ private String ocrMessage;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿鍜屾憚鍍忔満鎷夌爜娴佹椂闂村樊锛屽崟浣�(绉�)
+ * ocr鐘舵��
*/
- private String osdFormat;
+ private Integer ocrStatus;
/**
- * osd 淇℃伅
+ * ocr璇嗗埆鏃堕棿
*/
- private OsdInfo osdInfo;
+ private Date ocrTime;
+
+ private Integer timeInfoFormat;
/**
- * 鍥剧墖涓婄殑瀛楀箷鏃堕棿
+ * 鏃堕棿淇℃伅
*/
- private String osdTime;
+ private Integer timeInfoMessage;
- /**
- * 鎽勫儚鏈烘爣绛�
- */
- 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;
- }
+// /**
+// * 鍖哄煙璺緞淇℃伅
+// */
+// @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/PyOsdResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
new file mode 100644
index 0000000..549786a
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/PyOsdResult.java
@@ -0,0 +1,144 @@
+package com.ycl.platform.domain.result.UY;
+
+import lombok.Data;
+import org.springframework.data.mongodb.core.annotation.Collation;
+
+/**
+ * python鑾峰彇osd鏁版嵁
+ *
+ * @author锛歺p
+ * @date锛�2024/8/8 19:35
+ */
+@Data
+@Collation("py_osd")
+public class PyOsdResult {
+
+ /**
+ * 鍥芥爣鐮�
+ */
+ private String deviceNo;
+
+ /**
+ * 鏉嗕綋缂栫爜
+ */
+ private String bodyNo;
+
+ /**
+ * 璁惧绫诲瀷
+ */
+ private String deviceType;
+
+ /**
+ * 鏃堕棿鏍煎紡
+ */
+ private String timeFormat;
+
+ private String ODS1;
+
+ private String ODS2;
+
+ /**
+ * ip
+ */
+ private String ip;
+
+ /**
+ * 鐪佸巺鑰冩牳
+ */
+ private String provinceCheck;
+
+ /**
+ * 鍏畨閮ㄨ�冩牳
+ */
+ private String policeCheck;
+
+ /**
+ * 鏂癐P
+ */
+ private String newIp;
+
+ /**
+ * ip鐘舵��
+ */
+ private String ipStatus;
+
+ /**
+ * 妫�娴嬫椂闂�
+ */
+ private String checkTime;
+
+ /**
+ * OSD妫�娴嬬姸鎬�
+ */
+ private String checkStatus;
+
+ /**
+ * 鏍囨敞鏃堕棿
+ */
+ private String setTime;
+
+ /**
+ * osd1鐪�
+ */
+ private String osd1Province;
+
+ /**
+ * osd1甯�
+ */
+ private String osd1City;
+
+ /**
+ * osd1鍖�
+ */
+ private String osd1Part;
+
+ /**
+ * osd1 宸︿笅瑙�
+ */
+ private String osd1LB;
+
+ /**
+ * osd1_osd
+ */
+ private String osd1OSD;
+
+ /**
+ * osd1_鏃堕棿鏍煎紡鏄惁姝ｇ‘
+ */
+ private String osd1TimeFormat;
+
+ /**
+ * osd1_鐪佽缃�
+ */
+ private String osd1ProvinceSet;
+
+ /**
+ * osd1_甯傝缃�
+ */
+ private String osd1CitySet;
+
+ /**
+ * osd1_鍖鸿缃槸鍚�
+ */
+ private String osd1PartSet;
+
+ /**
+ * osd1_osd宸︿笅瑙掕缃槸鍚︽纭�
+ */
+ private String osd1OsdLbSet;
+
+ /**
+ * osd1_osd璁剧疆
+ */
+ private String osd1OsdSet;
+
+ /**
+ * osd1 鏃堕棿鏍煎紡
+ */
+ private String osd1TimeFormatSet;
+
+ /**
+ * ntp_server
+ */
+ private String ntpServer;
+}
diff --git a/ycl-server/src/main/java/com/ycl/config/SecurityConfig.java b/ycl-server/src/main/java/com/ycl/config/SecurityConfig.java
index 4afe5a2..b0cf630 100644
--- a/ycl-server/src/main/java/com/ycl/config/SecurityConfig.java
+++ b/ycl-server/src/main/java/com/ycl/config/SecurityConfig.java
@@ -98,6 +98,8 @@
.authorizeRequests()
// 瀵逛簬鐧诲綍login 娉ㄥ唽register 楠岃瘉鐮乧aptchaImage 鍏佽鍖垮悕璁块棶
.requestMatchers("/login", "/register", "/captchaImage").permitAll()
+ // py鎺ㄩ�乸sd鏁版嵁鎺ュ彛
+ .requestMatchers("/py/syn/osd").permitAll()
// 闈欐�佽祫婧愶紝鍙尶鍚嶈闂�
.requestMatchers(HttpMethod.GET, "/", "/*.html", "/*/*.html", "/*/*.css", "/*/*.js", "/profile/**").permitAll()
.requestMatchers("/swagger-ui.html", "/swagger-resources/*", "/webjars/*", "/*/api-docs", "/druid/*").permitAll()
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYClient.java b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
index 6112da1..d8a09fc 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -50,7 +50,7 @@
* osd鏍囨敞淇℃伅
* @return
*/
- @GetMapping("/videomon/api/v1/app/osdMonitor/list")
+ @GetMapping("/videomon-ocr/api/v1/osd/format/list")
JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId);
/**
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/SynPY/SynPYController.java b/ycl-server/src/main/java/com/ycl/platform/controller/SynPY/SynPYController.java
new file mode 100644
index 0000000..2270144
--- /dev/null
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/SynPY/SynPYController.java
@@ -0,0 +1,31 @@
+package com.ycl.platform.controller.SynPY;
+
+import com.ycl.platform.domain.result.UY.PyOsdResult;
+import com.ycl.system.Result;
+import lombok.RequiredArgsConstructor;
+import org.springframework.data.mongodb.core.MongoTemplate;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * @author锛歺p
+ * @date锛�2024/8/8 20:04
+ */
+@RequiredArgsConstructor
+@RestController
+@RequestMapping("/py/syn")
+public class SynPYController {
+
+ private final MongoTemplate mongoTemplate;
+
+ @PostMapping("/osd")
+ public Result pySynOSD(@RequestBody List<PyOsdResult> dataList) {
+ mongoTemplate.insertAll(dataList);
+ return Result.ok();
+ }
+
+}
diff --git a/ycl-server/src/main/java/com/ycl/task/UYTask.java b/ycl-server/src/main/java/com/ycl/task/UYTask.java
index 7028c1a..09e43f3 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -4,6 +4,9 @@
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
import com.ycl.platform.domain.param.UY.*;
+import com.ycl.platform.domain.result.UY.OneMachineFileResult;
+import com.ycl.platform.domain.result.UY.OsdMonitorResult;
+import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
@@ -195,6 +198,8 @@
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
+ param.setPageNum(ApiConstants.pageNo);
+ param.setPageSize(ApiConstants.pageSize);
JSONObject jsonObject = uyClient.osdMonitorList(param, tenantId);
if (jsonObject != null) {
log.info("鏁版嵁鏍煎紡" + jsonObject);
--
Gitblit v1.8.0