From 697c874804efcb02f0b96de29d1e99bcac3eebb6 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期五, 09 八月 2024 09:44:53 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java | 4 ++-- ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/ImageDetectionParam.java | 5 +++++ ycl-server/src/main/java/com/ycl/task/UYTask.java | 1 + ycl-server/src/main/java/com/ycl/feign/UYClient.java | 4 ++-- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/ImageDetectionParam.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/ImageDetectionParam.java index bda14ab..6f5c3aa 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/ImageDetectionParam.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/ImageDetectionParam.java @@ -22,6 +22,11 @@ private Integer pageSize; /** + * 琛屾斂鍖哄煙 + */ + private String arealayerno; + + /** * 寮傚父绫诲瀷 */ private String code = "1,2,3"; diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java index 78e4031..34403df 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/ImageDetectionResult.java @@ -2,7 +2,7 @@ import com.ycl.platform.domain.result.BaseResult; import lombok.Data; -import org.springframework.data.mongodb.core.annotation.Collation; +import org.springframework.data.mongodb.core.mapping.Document; import java.util.Date; import java.util.List; @@ -12,7 +12,7 @@ * @date锛�2024/8/8 20:36 */ @Data -@Collation("uy_image_detection") +@Document(collation = "uy_image_detection") public class ImageDetectionResult extends BaseResult { /** 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 60b4681..ca8e48b 100644 --- a/ycl-server/src/main/java/com/ycl/feign/UYClient.java +++ b/ycl-server/src/main/java/com/ycl/feign/UYClient.java @@ -29,12 +29,12 @@ JSONObject oneMachineFile(@SpringQueryMap OneMachineFileParam oneMachineFileParam); /** - * 鍥惧儚妫�娴� + * 鍥惧儚鐩戞祴 * * @param imageDetectionParam 璇锋眰鍙傛暟 * @return */ - @GetMapping("/api/v1/vqdMonitor/list") + @GetMapping("/videomon/api/v1/app/vqdMonitor/list") JSONObject imageDetection(@SpringQueryMap ImageDetectionParam imageDetectionParam); /** 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 1c16d37..5bbc64b 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -60,6 +60,7 @@ ImageDetectionParam param = new ImageDetectionParam(); param.setPageNum(ApiConstants.PageNo); param.setPageSize(ApiConstants.PageSize); + param.setArealayerno(ApiConstants.AreaNo); JSONObject jsonObject = uyClient.imageDetection(param); if (jsonObject != null) { log.info("鏁版嵁鏍煎紡" + jsonObject); -- Gitblit v1.8.0