From 7ba8d7ee12e7a3600afe67f3450d3a9a50bc09bb Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期三, 07 八月 2024 17:19:21 +0800
Subject: [PATCH] 打通获取token接口
---
ycl-server/src/main/java/com/ycl/task/HKTask.java | 9 ++--
pom.xml | 2
ycl-server/src/main/java/com/ycl/feign/UYClient.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/UYTokenParam.java | 1
ycl-server/src/main/java/com/ycl/utils/DateUtils.java | 20 ++++++++++
ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml | 4 ++
ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java | 3 +
ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java | 3 -
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/UYLoginResult.java | 14 +++++++
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 7 +++
ycl-server/src/main/java/com/ycl/PlatformApplication.java | 2 +
ycl-server/src/main/java/com/ycl/task/UYTask.java | 15 +++++--
ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java | 10 +++--
13 files changed, 73 insertions(+), 19 deletions(-)
diff --git a/pom.xml b/pom.xml
index 903f2e4..a1e7c97 100644
--- a/pom.xml
+++ b/pom.xml
@@ -256,7 +256,7 @@
<dependency>
<groupId>org.springframework.cloud</groupId>
<artifactId>spring-cloud-starter-openfeign</artifactId>
- <version>4.1.3</version>
+ <version>4.0.4</version>
</dependency>
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/UYTokenParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/UYTokenParam.java
index 447bce6..54e181c 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/UYTokenParam.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/UYTokenParam.java
@@ -4,7 +4,6 @@
import lombok.experimental.Accessors;
@Data
-@Accessors(chain = true)
public class UYTokenParam {
/**
* 璐﹀彿
diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/UYLoginResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/UYLoginResult.java
new file mode 100644
index 0000000..9e6229f
--- /dev/null
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/UYLoginResult.java
@@ -0,0 +1,14 @@
+package com.ycl.platform.domain.result.UY;
+
+import lombok.Data;
+
+@Data
+public class UYLoginResult {
+ private String userId;
+ private String tenantId;
+ private String token;
+ private String language;
+ private String loginIp;
+ private Boolean updateFlag;
+ private Boolean expiryFlag;
+}
diff --git a/ycl-server/src/main/java/com/ycl/PlatformApplication.java b/ycl-server/src/main/java/com/ycl/PlatformApplication.java
index d1ce599..9ec8815 100644
--- a/ycl-server/src/main/java/com/ycl/PlatformApplication.java
+++ b/ycl-server/src/main/java/com/ycl/PlatformApplication.java
@@ -7,6 +7,7 @@
import org.springframework.cache.annotation.EnableCaching;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@Slf4j
@@ -15,6 +16,7 @@
@EnableFeignClients(basePackages = {"com.ycl.feign"})
@ImportAutoConfiguration({FeignAutoConfiguration.class})
@SpringBootApplication
+//@EnableScheduling
public class PlatformApplication {
public static void main(String[] args) {
SpringApplication.run(PlatformApplication.class, args);
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 17a3026..a5aa905 100644
--- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java
+++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java
@@ -78,6 +78,6 @@
* @param param
* @return
*/
- @PostMapping(value = "/tenant/api/vi/user/login",headers = "No-Need-To-Token=true")
+ @PostMapping(value = "/tenant/api/v1/user/login",headers = "No-Need-To-Token=true")
JSONObject getToken(@RequestBody UYTokenParam param);
}
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 e7b5b1c..f206c4c 100644
--- a/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
+++ b/ycl-server/src/main/java/com/ycl/interceptor/YYFeignInterceptor.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.ycl.feign.UYClient;
import com.ycl.platform.domain.param.UY.UYTokenParam;
+import com.ycl.platform.domain.result.UY.UYLoginResult;
import com.ycl.utils.redis.RedisCache;
import feign.RequestInterceptor;
import feign.RequestTemplate;
@@ -34,7 +35,7 @@
@Override
public void apply(RequestTemplate requestTemplate) {
boolean flag = requestTemplate.headers().containsKey("No-Need-To-Token");
- if(! flag) {
+ if (!flag) {
String uyToken = redisCache.getCacheObject("UY_Token");
if (uyToken == null) {
uyToken = getToken();
@@ -48,8 +49,9 @@
param.setPasswd(passwd);
param.setEmail(email);
JSONObject jsonObject = uyClient.getToken(param);
- log.info("璇锋眰token鏁版嵁鏍煎紡" + jsonObject);
- redisCache.setCacheObject("Uy_Token",jsonObject.toJSONString(),3600, TimeUnit.SECONDS);
- return "1";
+ UYLoginResult loginResult = jsonObject.getObject("data", UYLoginResult.class);
+ String token = loginResult.getToken();
+ redisCache.setCacheObject("Uy_Token", token, 3600, TimeUnit.SECONDS);
+ return token;
}
}
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
index 24bf22f..0f775cb 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/PlatformOnlineMapper.java
@@ -31,4 +31,7 @@
*/
IPage getPage(IPage page, @Param("query") DataCenterQuery query);
+ //缁熻绂荤嚎鏃堕暱
+ Integer sumOffTime(@Param("startDate")String startDate,@Param("endDate")String endDate);
+
}
diff --git a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
index 12f0be7..5e11f00 100644
--- a/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/CheckScoreTask.java
@@ -88,11 +88,8 @@
addToList(templateId, checkTemplate, examineTag, templateRuleList, scoreList, indexFace, CheckConstants.Rule_Category_Face);
}
}
-
//鍌ㄥ瓨鍒嗘暟
scoreMapper.saveBatch(scoreList);
- //TODO锛氭牴鎹姤璀﹀垎鏁伴槇鍊硷紝娣诲姞鎶ヨ淇℃伅
-
}
}
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 8cf4f0b..181aa2d 100644
--- a/ycl-server/src/main/java/com/ycl/task/HKTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java
@@ -299,11 +299,12 @@
}
//瑙ｆ瀽鏁版嵁
- private <T> List<T> getDataList(JSONObject faceJsonObject, Class<T> resultClass, String message) {
- if (faceJsonObject != null && ApiConstants.HKSuccessCode.equals(faceJsonObject.getString("code"))) {
- JSONObject data = faceJsonObject.getJSONObject("data");
+ private <T> List<T> getDataList(JSONObject jsonObject, Class<T> resultClass, String message) {
+ if (jsonObject != null && ApiConstants.HKSuccessCode.equals(jsonObject.getString("code"))) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
+ JSONObject data = jsonObject.getJSONObject("data");
if (data == null) {
- log.error(message, faceJsonObject);
+ log.error(message, jsonObject);
return null;
}
List<T> list = data.getList("list", resultClass);
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 1e2558e..7534569 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -3,10 +3,7 @@
import com.alibaba.fastjson2.JSONObject;
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
-import com.ycl.platform.domain.param.UY.OneMachineFileParam;
-import com.ycl.platform.domain.param.UY.OsdMonitorParam;
-import com.ycl.platform.domain.param.UY.QueryVqdParam;
-import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
+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.QueryVqdResult;
@@ -21,6 +18,7 @@
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.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
import org.springframework.util.CollectionUtils;
@@ -42,7 +40,10 @@
private ITMonitorService monitorService;
@Value("${youYun.tenantId}")
private String tenantId;
-
+ @Value("${youYun.email}")
+ private String email;
+ @Value("${youYun.passwd}")
+ private String passwd;
//涓�鏈轰竴妗�
public void monitorTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
@@ -52,6 +53,7 @@
OneMachineFileParam param = new OneMachineFileParam();
JSONObject jsonObject = uyClient.oneMachineFile(param);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
JSONObject cameraList = jsonObject.getJSONObject("CameraList");
if (cameraList != null) {
List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class);
@@ -83,6 +85,7 @@
param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.queryVqdResult(param);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
Integer statusCode = jsonObject.getInteger("statusCode");
if (ApiConstants.UYSuccessCode.equals(statusCode)) {
JSONObject data = jsonObject.getJSONObject("data");
@@ -118,6 +121,7 @@
param.setTenantId(tenantId);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
if (jsonObject.getBoolean("success")) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
@@ -151,6 +155,7 @@
OsdMonitorParam param = new OsdMonitorParam();
JSONObject jsonObject = uyClient.osdMonitorList(param,tenantId);
if (jsonObject != null) {
+ log.info("鏁版嵁鏍煎紡"+jsonObject);
if (jsonObject.getBoolean("success")) {
JSONObject data = jsonObject.getJSONObject("data");
if (data != null) {
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 1e98bbe..81c523c 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -6,6 +6,8 @@
import com.ycl.platform.domain.param.UY.RecordMetaDSumParam;
import com.ycl.platform.domain.result.HK.SnapshotDataMonitorResult;
import com.ycl.platform.domain.result.UY.QueryVqdResult;
+import com.ycl.platform.mapper.PlatformOnlineMapper;
+import com.ycl.platform.service.PlatformOnlineService;
import com.ycl.utils.DateUtils;
import constant.ApiConstants;
import constant.CalculationStrategyConstants;
@@ -28,6 +30,8 @@
public class VideoTask {
@Autowired
private MongoTemplate mongoTemplate;
+ @Autowired
+ private PlatformOnlineMapper platformOnlineMapper;
public void siteOnlineTask(){
Date yesterday = DateUtils.addDays(new Date(), -1);
@@ -56,5 +60,8 @@
}
public void platformOnlineTask(){
//璁＄畻骞冲彴鍦ㄧ嚎鐜�
+ //鎷垮埌浠婃棩绂荤嚎鏃堕暱鏁版嵁
+ Integer time = platformOnlineMapper.sumOffTime(DateUtils.getMouthStart(new Date()),DateUtils.getMouthEnd(new Date()));
+
}
}
diff --git a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
index a27708e..9988e85 100644
--- a/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
+++ b/ycl-server/src/main/java/com/ycl/utils/DateUtils.java
@@ -230,6 +230,26 @@
}
/**
+ * 鑾峰彇鏌愭湀寮�濮嬫棩鏈�
+ */
+ public static String getMouthStart(@Nullable Date date) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar c = Calendar.getInstance();
+ c.add(Calendar.MONTH, 0);
+ c.set(Calendar.DAY_OF_MONTH,1);
+ return df.format(c.getTime());
+ }
+
+ /**
+ * 鑾峰彇鏌愭湀缁撴潫鏃ユ湡
+ */
+ public static String getMouthEnd(@Nullable Date date) {
+ SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
+ Calendar c = Calendar.getInstance();
+ c.set(Calendar.DAY_OF_MONTH, c.getActualMaximum(Calendar.DAY_OF_MONTH));
+ return df.format(c.getTime());
+ }
+ /**
* 鑾峰彇鎸囧畾Calendar鐨勫搴﹀紑濮嬫棩鏈�
* @param calendar 鏃ュ巻
* @return 瀛ｅ害绗竴澶�
diff --git a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
index 56539c4..3a1ea2f 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/YwPointMapper.xml
@@ -93,4 +93,8 @@
</where>
</select>
+ <select id="sumOffTime" resultType="java.lang.Integer">
+ select sum(today_outline_sed) from t_platform_online
+ where create_date between #{startDate} and #{endDate}
+ </select>
</mapper>
--
Gitblit v1.8.0