From ce0fef1c976ede5d77dfba1c285bbd0436d02d04 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 14:00:21 +0800
Subject: [PATCH] 优云录像可用接口调通
---
ycl-common/src/main/java/constant/ApiConstants.java | 1
ycl-server/src/main/java/com/ycl/task/HKTask.java | 26 +++---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java | 105 ++++++++++----------------
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java | 2
ycl-server/src/main/java/com/ycl/task/UYTask.java | 55 +++++++------
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 10 +-
6 files changed, 90 insertions(+), 109 deletions(-)
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index e4b2164..9d4e6c4 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -6,6 +6,7 @@
public class ApiConstants {
//鎴愬姛鐘舵�佺爜
public final static String HKSuccessCode = "0";
+ public final static String UYSuccessCodeStr = "200";
public final static Integer UYSuccessCode = 200;
public final static Integer pageNo = 1;
public final static Integer pageSize = 5000;
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
index 83ea4e5..847f1b6 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/RecordMetaDSumParam.java
@@ -69,7 +69,7 @@
/**
* 缁熻鏃堕棿
*/
- private Date statTime;
+ private String statTime;
/**
* 绉熸埛ID
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
index ac26459..0f0fb90 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OnlineResult.java
@@ -21,100 +21,77 @@
/**
* 琛屾斂鍖哄垝缂栫爜
*/
- private String arealayerPath;
- /**
- * 琛屾斂鍖哄垝缂栫爜
- */
- private String arealayerno;
+ private String arealayernoCode;
+
/**
* 琛屾斂鍖哄垝鍚嶇О
*/
@TextIndexed
- private String arealayerName;
+ private String arealayernoName;
/**
- * 瑙ｇ爜鐘舵�佺爜
+ * 璇婃柇鏃ユ湡
*/
- private Integer decodingCode;
+ private String diagDate;
/**
- * 璁惧id
+ * 缁熻绾害
*/
- private Integer deviceId;
+ private String dim;
+
/**
- * 璁惧鍚嶇О
+ * icmp绂荤嚎鏁�
*/
- private String deviceName;
+ private Integer icmpOfflineNum;
+
/**
- * icmp寤惰繜
+ * icmp鍦ㄧ嚎鏁�
*/
- private Double icmpDelay;
+ private Integer icmpOnlineNum;
+
/**
- * icmp鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
+ * icmp鍦ㄧ嚎鐜囷紝鏍煎紡涓虹櫨鍒嗘瘮瀛楃涓诧紝濡� "99.9%"
*/
- private Integer icmpStatus;
+ private String icmpOnlineRate;
+
/**
- * 鏈�杩慽cmp鏃堕棿
+ * icmp璇婃柇鎬绘暟
*/
- private Date icmpTime;
+ private Integer icmpTotalNum;
+
/**
- * 鍏抽敭甯ф椂寤�
+ * 绂荤嚎鏁�
*/
- private Integer ifmDelay;
+ private Integer offlineNum;
+
/**
- * ip鍦板潃
+ * 鍦ㄧ嚎鏁�
*/
- private String ipAddr;
+ private Integer onlineNum;
+
/**
- * 鏈�杩戞寔缁绾挎晠闅滄鏁�
+ * 鍦ㄧ嚎鐜囷紝鏍煎紡涓虹櫨鍒嗘瘮瀛楃涓诧紝濡� "99.9%"
*/
- private Integer olErrEverduring;
+ private String onlineRate;
+
/**
- *
+ * 椤电爜
*/
- private Date olErrEverduringFirstTime;
+ private Integer pageNum;
+
/**
- * 绱绂荤嚎鏁呴殰娆℃暟
+ * 鍒嗛〉澶у皬
*/
- private Integer olErrTotal;
+ private Integer pageSize;
+
/**
- * 绱绂荤嚎鏁呴殰鐜�
+ * 鎺掑簭灞炴��
*/
- private String olErrTotalRate;
+ private String sortFiled;
+
/**
- * 宸℃娆℃暟
+ * 璇婃柇鎬绘暟
*/
- private Integer olTotal;
- /**
- * sip鐘舵�佺爜
- */
- private Integer sipCode;
- /**
- * 淇′护鏃跺欢
- */
- private Integer sipDelay;
- /**
- * 鍦ㄧ嚎鐘舵�� 2/1/-1/0 鍏ㄩ儴/鍦ㄧ嚎/绂荤嚎/鏈煡
- */
- private Integer status;
- /**
- * 鐪佸巺鏍囩
- */
- private String tagStr;
- /**
- * 鐪佸巺鏍囩
- */
- private List<String> tags;
- /**
- * 绉熸埛id
- */
- private Integer tenantId;
- /**
- * 瑙嗛娴佹椂寤�
- */
- private Integer videoDelay;
- /**
- *
- */
- private Date vqdTime;
+ private Integer totalNum;
+
}
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 0ad1cc9..a9c7c0b 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -35,7 +35,7 @@
* @param onlineParam 璇锋眰鍙傛暟
* @return 鏌ヨ鍦ㄧ嚎缁熻鍒楄〃
*/
- @GetMapping("/videomon/api/v1/onlineMonitor/list")
+ @GetMapping("/openapi/v1/report/online/list")
JSONObject onlineList(@SpringQueryMap OnlineParam onlineParam);
/**
@@ -44,14 +44,14 @@
* @param recordMetaDSumParam 璇锋眰鍙傛暟
* @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭�
*/
- @PostMapping("/report/recordMetaDSum/list")
+ @PostMapping("/videomon/report/recordMetaDSum/list")
JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam);
/**
* osd鏍囨敞淇℃伅
* @return
*/
- @GetMapping("/api/v1/app/osdMonitor/list")
+ @GetMapping("/videomon/api/v1/app/osdMonitor/list")
JSONObject osdMonitorList(@SpringQueryMap OsdMonitorParam param, @RequestHeader("tenantId") String tenantId);
/**
@@ -60,7 +60,7 @@
* @param param
* @return
*/
- @GetMapping("/openapi/v1/vqdMonitor/queryVqdResult")
+ @GetMapping("/videomon/openapi/v1/vqdMonitor/queryVqdResult")
JSONObject queryVqdResult(@SpringQueryMap QueryVqdParam param);
/**
@@ -69,7 +69,7 @@
* @param param
* @return
*/
- @GetMapping("/api/v1/app/report/vqd/detail/list")
+ @GetMapping("/videomon/api/v1/app/report/vqd/detail/list")
JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
/**
diff --git a/ycl-server/src/main/java/com/ycl/task/HKTask.java b/ycl-server/src/main/java/com/ycl/task/HKTask.java
index 181aa2d..52a33c8 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -53,7 +53,7 @@
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, VehicleDeviceInspectionResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(list);
+ mongoTemplate.insertAll(list);
//鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
ywThresholdService.carCheck(list);
}
@@ -72,7 +72,7 @@
Query query = new Query(Criteria.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, FaceDeviceInspectionResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(list);
+ mongoTemplate.insertAll(list);
//鍚屾鐨勬暟鎹繘琛屽伐鍗曢槇鍊煎鐞�
//TODO:鍙兘鏈夐噸澶嶅伐鍗�
ywThresholdService.faceCheck(list);
@@ -97,7 +97,7 @@
DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
- mongoTemplate.insert(carList);
+ mongoTemplate.insertAll(carList);
}
/** 浜鸿劯鏁版嵁 */
@@ -113,7 +113,7 @@
DeleteResult result = mongoTemplate.remove(query, SnapshotDataMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟
log.info("缁撴潫鎶撴媿鏁版嵁閲忔娴嬬粨鏋滄暟鎹悓姝�");
@@ -133,7 +133,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, MonitoringDetailResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫閲囬泦璁惧灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -153,7 +153,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, CrossDetailResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫鍗″彛灞炴�х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -173,7 +173,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, DataIntegrityMonitoringResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫鏁版嵁瀹屾暣鎬х洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -193,7 +193,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, AttrRecognitionMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫灞炴�ц瘑鍒噯纭洃娴嬬粨鏋滄暟鎹悓姝�");
@@ -217,7 +217,7 @@
DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_CAR));
- mongoTemplate.insert(carList);
+ mongoTemplate.insertAll(carList);
}
/** 浜鸿劯鏁版嵁 */
@@ -233,7 +233,7 @@
DeleteResult result = mongoTemplate.remove(query, SnapshotDelayMonitorParam.class);
//瀛樻斁鍦╩ongo涓�
carList.forEach(item -> item.setDataType(ApiConstants.HK_DataType_FACE));
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟
log.info("缁撴潫鎶撴媿鏁版嵁鏃跺欢鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -253,7 +253,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫鍥剧墖璁块棶鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -272,7 +272,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, VehicleDeviceSamplingResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫杞﹁締璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
@@ -292,7 +292,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, FaceDeviceSamplingResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(faceList);
+ mongoTemplate.insertAll(faceList);
}
//TODO:宸ュ崟澶勭悊
log.info("缁撴潫浜鸿劯璁惧鎶芥鎸囨爣鐩戞祴缁撴灉鏁版嵁鍚屾");
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 84d52ea..6790cac 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -18,10 +18,15 @@
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.Criteria;
import org.springframework.data.mongodb.core.query.Query;
+import org.springframework.format.annotation.DateTimeFormat;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
+import java.text.SimpleDateFormat;
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.Calendar;
import java.util.Date;
import java.util.List;
@@ -44,6 +49,7 @@
private String email;
@Value("${youYun.passwd}")
private String passwd;
+
//涓�鏈轰竴妗�
public void monitorTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
@@ -53,7 +59,7 @@
OneMachineFileParam param = new OneMachineFileParam();
JSONObject jsonObject = uyClient.oneMachineFile(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
+ log.info("鏁版嵁鏍煎紡" + jsonObject);
JSONObject cameraList = jsonObject.getJSONObject("CameraList");
if (cameraList != null) {
List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
@@ -85,7 +91,7 @@
param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.queryVqdResult(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
+ log.info("鏁版嵁鏍煎紡" + jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
@@ -97,7 +103,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
} else {
log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data);
}
@@ -119,44 +125,41 @@
log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�");
RecordMetaDSumParam param = new RecordMetaDSumParam();
param.setTenantId(tenantId);
+ Calendar instance = Calendar.getInstance();
+ instance.setTime(new Date());
+ instance.add(Calendar.DAY_OF_MONTH, -1);
+ SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+ String yesterday = format.format(instance.getTime());
+ param.setStatTime(yesterday);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- if (jsonObject.getBoolean("success")) {
- JSONObject data = jsonObject.getJSONObject("data");
- if (data != null) {
- List<RecordMetaDSumResult> records = data.getList("records", RecordMetaDSumResult.class);
- if (!CollectionUtils.isEmpty(records)) {
- //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
- Query query = new Query(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
- DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
- //瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", data);
- }
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
+ if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
+ List<RecordMetaDSumResult> records = jsonObject.getList("data", RecordMetaDSumResult.class);
+ if (!CollectionUtils.isEmpty(records)) {
+ //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎
+ Query query = new Query(Criteria
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
+ DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insertAll(records);
}
} else {
log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject);
}
- } else {
- log.error("褰曞儚鍙敤鏁版嵁涓虹┖");
}
log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾");
}
+
//瑙嗛鏍囨敞
public void OsdMonitorTask() {
//瑙嗛鏍囨敞
log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�");
OsdMonitorParam param = new OsdMonitorParam();
- JSONObject jsonObject = uyClient.osdMonitorList(param,tenantId);
+ JSONObject jsonObject = uyClient.osdMonitorList(param, tenantId);
if (jsonObject != null) {
- log.info("鏁版嵁鏍煎紡"+jsonObject);
- if (jsonObject.getBoolean("success")) {
+ log.info("鏁版嵁鏍煎紡" + jsonObject);
+ if (ApiConstants.UYSuccessCodeStr.equals(jsonObject.getString("code"))) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
List<OsdMonitorResult> records = data.getList("records", OsdMonitorResult.class);
@@ -166,7 +169,7 @@
.where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date())));
DeleteResult result = mongoTemplate.remove(query, OsdMonitorResult.class);
//瀛樻斁鍦╩ongo涓�
- mongoTemplate.insert(records);
+ mongoTemplate.insertAll(records);
} else {
log.error("瑙嗛鏍囨敞鏁版嵁涓虹┖{}", data);
}
--
Gitblit v1.8.0