From fcfbeef01d35c8da1b24a3dd3895d336bb42bf75 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期三, 31 七月 2024 16:21:35 +0800 Subject: [PATCH] 优云对接接口 --- ycl-common/src/main/java/constant/ApiConstants.java | 3 + ycl-server/src/main/java/com/ycl/task/HKTask.java | 2 ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java | 2 ycl-server/src/main/java/com/ycl/task/UYTask.java | 104 +++++++++++++++++++++++++++++++++++++++------------- ycl-server/src/main/java/com/ycl/feign/UYClient.java | 7 +-- 5 files changed, 85 insertions(+), 33 deletions(-) diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java index c5b77ba..c4fcf99 100644 --- a/ycl-common/src/main/java/constant/ApiConstants.java +++ b/ycl-common/src/main/java/constant/ApiConstants.java @@ -5,7 +5,8 @@ */ public class ApiConstants { //鎴愬姛鐘舵�佺爜 - public final static String successCode = "0"; + public final static String HKSuccessCode = "0"; + public final static Integer UYSuccessCode = 200; public final static Integer pageNo = 1; public final static Integer pageSize = 5000; //璇锋眰鍙傛暟dataType-鍗″彛杩囪溅 diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java similarity index 91% rename from ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java rename to ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java index 0a74a9d..efdfe1b 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/CameraParam.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/OneMachineFileParam.java @@ -12,7 +12,7 @@ @Data @Accessors(chain = true) -public class CameraParam { +public class OneMachineFileParam { /** * 鍒嗛〉 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 5286b2a..44d25b8 100644 --- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java +++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java @@ -8,7 +8,6 @@ import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestParam; /** * @author gonghl @@ -22,11 +21,11 @@ /** * 涓�鏈轰竴妗� * - * @param cameraParam 璇锋眰鍙傛暟 + * @param oneMachineFileParam 璇锋眰鍙傛暟 * @return 鏌ヨ鎽勫儚鏈烘竻鍗曢泦鍚� */ @GetMapping("/VIID/Cameras") - JSONObject cameraList(@SpringQueryMap CameraParam cameraParam); + JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam); /** * 鐐逛綅鍦ㄧ嚎 @@ -65,5 +64,5 @@ * @return */ @GetMapping("/api/v1/app/report/vqd/detail/list") - JSONObject queryVqdResult(@SpringQueryMap VideoQualityParam param); + 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 c3226fa..fccbe9f 100644 --- a/ycl-server/src/main/java/com/ycl/task/HKTask.java +++ b/ycl-server/src/main/java/com/ycl/task/HKTask.java @@ -301,7 +301,7 @@ //瑙f瀽鏁版嵁 private <T> List<T> getDataList(JSONObject faceJsonObject, Class<T> resultClass, String message) { - if (faceJsonObject != null && ApiConstants.successCode.equals(faceJsonObject.getString("code"))) { + if (faceJsonObject != null && ApiConstants.HKSuccessCode.equals(faceJsonObject.getString("code"))) { JSONObject data = faceJsonObject.getJSONObject("data"); if (data == null) { log.error(message, faceJsonObject); 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 a1e1be4..3d2f545 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -2,13 +2,16 @@ import com.alibaba.fastjson2.JSONObject; import com.mongodb.client.result.DeleteResult; -import com.ycl.platform.domain.param.UY.OnlineParam; -import com.ycl.platform.domain.param.UY.QueryVqdParam; -import com.ycl.platform.domain.result.HK.PicAccessResult; -import com.ycl.platform.domain.result.UY.QueryVqdResult; -import com.ycl.platform.service.IYwThresholdService; import com.ycl.feign.UYClient; +import com.ycl.platform.domain.param.UY.OneMachineFileParam; +import com.ycl.platform.domain.param.UY.QueryVqdParam; +import com.ycl.platform.domain.param.UY.RecordMetaDSumParam; +import com.ycl.platform.domain.result.UY.OneMachineFileResult; +import com.ycl.platform.domain.result.UY.QueryVqdResult; +import com.ycl.platform.domain.result.UY.RecordMetaDSumResult; +import com.ycl.platform.service.IYwThresholdService; import com.ycl.utils.DateUtils; +import constant.ApiConstants; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Value; @@ -18,7 +21,6 @@ import org.springframework.stereotype.Component; import org.springframework.util.CollectionUtils; -import java.text.SimpleDateFormat; import java.util.Date; import java.util.List; @@ -39,51 +41,101 @@ //涓�鏈轰竴妗� public void monitorTask() { - log.info("寮�濮嬫墽琛屼竴鏈轰竴妗f暟鎹悓姝�"); //涓�鏈轰竴妗e悎鏍肩巼 // 涓�鏈轰竴妗f敞鍐岀巼 // 妗f鑰冩牳姣� + log.info("寮�濮嬫墽琛屼竴鏈轰竴妗f暟鎹悓姝�"); + OneMachineFileParam param = new OneMachineFileParam(); + JSONObject jsonObject = uyClient.oneMachineFile(param); + if (jsonObject != null) { + JSONObject cameraList = jsonObject.getJSONObject("CameraList"); + if (cameraList != null) { + List<OneMachineFileResult> data = cameraList.getList("data", OneMachineFileResult.class); + if (!CollectionUtils.isEmpty(data)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insert(data); + } else { + log.error("涓�鏈轰竴妗f暟鎹负绌簕}", cameraList); + } + } else { + log.error("涓�鏈轰竴妗f暟鎹负绌簕}", jsonObject); + } + } else { + log.error("涓�鏈轰竴妗f暟鎹负绌�"); + } log.info("缁撴潫鎵ц涓�鏈轰竴妗f暟鎹悓姝�"); } //鍥惧儚鐩戞祴璇婃柇缁撴灉 public void queryVqdResultTask() { //鐐逛綅鍦ㄧ嚎鐜� + //瑙嗛鍥惧儚璐ㄩ噺 log.info("寮�濮嬫墽琛屽浘鍍忕洃娴嬭瘖鏂粨鏋滄暟鎹悓姝�"); QueryVqdParam param = new QueryVqdParam(); param.setTenantId(tenantId); JSONObject jsonObject = uyClient.queryVqdResult(param); if (jsonObject != null) { - JSONObject cameraList = jsonObject.getJSONObject("CameraList"); - if (cameraList != null) { - List<QueryVqdResult> data = cameraList.getList("data", QueryVqdResult.class); - if (!CollectionUtils.isEmpty(data)) { - //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 - Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); - DeleteResult result = mongoTemplate.remove(query, PicAccessResult.class); - //瀛樻斁鍦╩ongo涓� - mongoTemplate.insert(data); + Integer statusCode = jsonObject.getInteger("statusCode"); + if (ApiConstants.UYSuccessCode.equals(statusCode)) { + JSONObject data = jsonObject.getJSONObject("data"); + if (data != null) { + List<QueryVqdResult> records = data.getList("records", QueryVqdResult.class); + if (!CollectionUtils.isEmpty(records)) { + //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 + Query query = new Query(Criteria + .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class); + //瀛樻斁鍦╩ongo涓� + mongoTemplate.insert(records); + } else { + log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", data); + } } else { - log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", cameraList); + log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject); } } else { - log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖{}", jsonObject); + log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉璇锋眰澶辫触{}", jsonObject); } } else { log.error("鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁涓虹┖"); } - log.info("缁撴潫鎵ц鍥惧儚鐩戞祴璇婃柇缁撴灉鏁版嵁鍚屾"); } //褰曞儚鍙敤 - public void task3() { + public void recordMetaDSumTask() { //褰曞儚鍙敤鐜� - } - - //瑙嗛鍥惧儚璐ㄩ噺 - public void task4() { - //褰曞儚鍙敤鐜� + log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�"); + RecordMetaDSumParam param = new RecordMetaDSumParam(); + JSONObject jsonObject = uyClient.recordMetaDSumList(param); + if (jsonObject != null) { + 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("createTime").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); + } + } else { + log.error("褰曞儚鍙敤鏁版嵁涓虹┖{}", jsonObject); + } + } else { + log.error("褰曞儚鍙敤鏁版嵁涓虹┖"); + } + log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾"); } } -- Gitblit v1.8.0