From 7b3e1399955666b183608b6d0fcf53d7cdeee919 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 16:49:47 +0800
Subject: [PATCH] feign日志
---
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 17 ++++++++
ycl-server/src/main/resources/application-prod.yml | 1
ycl-server/src/main/resources/application-dev.yml | 2 +
ycl-server/src/main/java/com/ycl/task/UYTask.java | 39 +++++++++++++++++++
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java | 3 +
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/MonitorQualifyParam.java | 7 +++
ycl-server/src/main/java/com/ycl/feign/UYFeignConfig.java | 6 +++
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 13 +++++-
ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java | 2
9 files changed, 87 insertions(+), 3 deletions(-)
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/MonitorQualifyParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/MonitorQualifyParam.java
new file mode 100644
index 0000000..1c45f09
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/MonitorQualifyParam.java
@@ -0,0 +1,7 @@
+package com.ycl.platform.domain.param.UY;
+
+import lombok.Data;
+
+@Data
+public class MonitorQualifyParam {
+}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java
index 2357dc2..44141b3 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/QueryVqdParam.java
@@ -133,4 +133,7 @@
* 鏄惁闇�瑕佸垎椤佃繑鍥炵粨鏋滐紝褰撲负true鏃秔ageSize鍜宲ageNum鍙傛暟澶辨晥
*/
private Boolean withOutPaging;
+
+ private String apikey;
+ private String accesskey;
}
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
new file mode 100644
index 0000000..33bf7f3
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java
@@ -0,0 +1,17 @@
+package com.ycl.platform.domain.result.UY;
+
+import lombok.Data;
+
+@Data
+public class MonitorQualifyResult {
+ private QualifyResult civilCode;
+
+
+ @Data
+ public static class QualifyResult {
+ private Boolean error;
+ private String errorMessage;
+ private String showValue;
+ private String value;
+ }
+}
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 a9c7c0b..3610c41 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -45,7 +45,7 @@
* @return 鏌ヨ婊¤冻鏉′欢鐨勫綍鍍忔眹鎬讳俊鎭�
*/
@PostMapping("/videomon/report/recordMetaDSum/list")
- JSONObject recordMetaDSumList(@RequestBody RecordMetaDSumParam recordMetaDSumParam);
+ JSONObject recordMetaDSumList( RecordMetaDSumParam recordMetaDSumParam);
/**
* osd鏍囨敞淇℃伅
@@ -60,7 +60,7 @@
* @param param
* @return
*/
- @GetMapping("/videomon/openapi/v1/vqdMonitor/queryVqdResult")
+ @GetMapping("/openapi/v1/vqdMonitor/queryVqdResult")
JSONObject queryVqdResult(@SpringQueryMap QueryVqdParam param);
/**
@@ -73,6 +73,15 @@
JSONObject videoQuality(@SpringQueryMap VideoQualityParam param);
/**
+ * 涓�鏈轰竴妗ｅ悎鏍肩巼
+ *
+ * @param param
+ * @return
+ */
+ @GetMapping("/iotdiscovery/api/v1/app/camera/precision/stat/detail")
+ JSONObject monitorQualify(@SpringQueryMap MonitorQualifyParam param);
+
+ /**
* 浼樹簯鑾峰彇token鎺ュ彛
*
* @param param
diff --git a/ycl-server/src/main/java/com/ycl/feign/UYFeignConfig.java b/ycl-server/src/main/java/com/ycl/feign/UYFeignConfig.java
index d11f33e..bf18698 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYFeignConfig.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYFeignConfig.java
@@ -2,6 +2,7 @@
import com.ycl.feign.FeignErrorDecoder;
import com.ycl.interceptor.YYFeignInterceptor;
+import feign.Logger;
import feign.RequestInterceptor;
import feign.codec.ErrorDecoder;
import org.springframework.context.annotation.Bean;
@@ -28,4 +29,9 @@
public ErrorDecoder errorDecoder() {
return new FeignErrorDecoder();
}
+
+ @Bean
+ Logger.Level feignLoggerLevel(){
+ return Logger.Level.FULL;
+ }
}
diff --git a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
index f206c4c..c9a594e 100644
--- a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
+++ b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
@@ -40,7 +40,7 @@
if (uyToken == null) {
uyToken = getToken();
}
- requestTemplate.header("Cookie", "token" + uyToken);
+ requestTemplate.header("Cookie", "token=" + uyToken);
}
}
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 6790cac..1460a02 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -45,6 +45,10 @@
private ITMonitorService monitorService;
@Value("${youYun.tenantId}")
private String tenantId;
+ @Value("${youYun.apikey}")
+ private String apikey;
+ @Value("${youYun.accesskey}")
+ private String accesskey;
@Value("${youYun.email}")
private String email;
@Value("${youYun.passwd}")
@@ -82,6 +86,39 @@
log.info("缁撴潫鎵ц涓�鏈轰竴妗ｆ暟鎹悓姝�");
}
+ //涓�鏈轰竴妗ｅ悎鏍肩巼
+ public void monitorQualifyTask() {
+ //涓�鏈轰竴妗ｅ悎鏍肩巼
+ log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
+ OneMachineFileParam param = new OneMachineFileParam();
+ JSONObject jsonObject = uyClient.oneMachineFile(param);
+ if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡" + jsonObject);
+ String code = jsonObject.getString("code");
+ if (ApiConstants.UYSuccessCodeStr.equals(code)) {
+ JSONObject data = jsonObject.getJSONObject("data");
+ if (data != null) {
+ List<OneMachineFileResult> records = data.getList("records", OneMachineFileResult.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, OneMachineFileResult.class);
+ //瀛樻斁鍦╩ongo涓�
+ mongoTemplate.insertAll(records);
+ } else {
+ log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", data);
+ }
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖{}", jsonObject);
+ }
+ } else {
+ log.error("涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁涓虹┖");
+ }
+ log.info("缁撴潫涓�鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
+ }
+
//鍥惧儚鐩戞祴璇婃柇缁撴灉
public void queryVqdResultTask() {
//鐐逛綅鍦ㄧ嚎鐜�
@@ -89,6 +126,8 @@
log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�");
QueryVqdParam param = new QueryVqdParam();
param.setTenantId(tenantId);
+ param.setApikey(apikey);
+ param.setAccesskey(accesskey);
JSONObject jsonObject = uyClient.queryVqdResult(param);
if (jsonObject != null) {
log.info("鏁版嵁鏍煎紡" + jsonObject);
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index a84f9d2..63fd3e8 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -137,3 +137,5 @@
tenantId: 11
email: 11
passwd: 11
+ apikey: 11
+ accesskey: 11
diff --git a/ycl-server/src/main/resources/application-prod.yml b/ycl-server/src/main/resources/application-prod.yml
index 2eb8adf..94730ac 100644
--- a/ycl-server/src/main/resources/application-prod.yml
+++ b/ycl-server/src/main/resources/application-prod.yml
@@ -139,4 +139,5 @@
tenantId: e10adc3949ba59abbe56e057f2gg88dd
email: 11
passwd: 11
+ apikey: 11
--
Gitblit v1.8.0