From d6a9c5a9a93364c812b9149823facf5a118afa4f Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 08 八月 2024 17:44:29 +0800
Subject: [PATCH] mongo启动类注解
---
ycl-common/src/main/java/constant/ApiConstants.java | 2
ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/MonitorQualifyResult.java | 64 ++++++++++++++++++++++++++++++-
ycl-server/src/main/java/com/ycl/PlatformApplication.java | 2 +
ycl-server/src/main/java/com/ycl/task/UYTask.java | 15 +++----
ycl-pojo/src/main/java/com/ycl/platform/domain/param/UY/MonitorQualifyParam.java | 2 +
5 files changed, 73 insertions(+), 12 deletions(-)
diff --git a/ycl-common/src/main/java/constant/ApiConstants.java b/ycl-common/src/main/java/constant/ApiConstants.java
index 9d4e6c4..05e6849 100644
--- a/ycl-common/src/main/java/constant/ApiConstants.java
+++ b/ycl-common/src/main/java/constant/ApiConstants.java
@@ -9,7 +9,7 @@
public final static String UYSuccessCodeStr = "200";
public final static Integer UYSuccessCode = 200;
public final static Integer pageNo = 1;
- public final static Integer pageSize = 5000;
+ public final static Integer pageSize = 20000;
//璇锋眰鍙傛暟dataType-鍗″彛杩囪溅
public final static Integer HK_DataType_CAR = 1;
//璇锋眰鍙傛暟dataType-浜鸿劯鏁版嵁
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
index 1c45f09..daea266 100644
--- 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
@@ -4,4 +4,6 @@
@Data
public class MonitorQualifyParam {
+ private Integer pageNum;
+ private Integer pageSize;
}
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
index 33bf7f3..6e24c3e 100644
--- 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
@@ -1,16 +1,74 @@
package com.ycl.platform.domain.result.UY;
+import com.ycl.platform.domain.result.BaseResult;
import lombok.Data;
+import org.springframework.data.mongodb.core.mapping.Document;
@Data
-public class MonitorQualifyResult {
+@Document(collection = "uy_monitor_qualify")
+public class MonitorQualifyResult extends BaseResult {
+ /**
+ * 琛屾斂缂栫爜
+ */
private QualifyResult civilCode;
-
-
+ /**
+ * 鏄惁闆嗘垚璁惧
+ */
+ private QualifyResult integrated_device;
+ /**
+ * IP鍦板潃
+ */
+ private QualifyResult ip;
+ /**
+ * 鐩戞帶鐐逛綅绫诲瀷
+ */
+ private QualifyResult jkdwlx;
+ /**
+ * 绾害
+ */
+ private QualifyResult latitude;
+ /**
+ * 缁忓害
+ */
+ private QualifyResult longitude;
+ /**
+ * mac鍦板潃
+ */
+ private QualifyResult macdz;
+ /**
+ * 璁惧鍚�
+ */
+ private QualifyResult name;
+ /**
+ * 璁惧鐘舵��
+ */
+ private QualifyResult sbzt;
+ /**
+ * 璁惧缂栫爜
+ */
+ private QualifyResult serialNumber;
+ /**
+ * 鎽勫儚鏈洪噰闆嗗尯鍩�
+ */
+ private QualifyResult sxjcjqy;
+ /**
+ * 鎽勫儚鏈哄姛鑳界被鍨�
+ */
+ private QualifyResult sxjgnlx;
+ /**
+ * 绉熸埛id
+ */
+ private QualifyResult tenantId;
@Data
public static class QualifyResult {
+ /**
+ * 鏄惁閿欒 姝ｅ父鏄痜alse锛宼ure琛ㄧず鏈夐棶棰�
+ * */
private Boolean error;
private String errorMessage;
+ /**
+ * 灞曠ず鍊�
+ * */
private String showValue;
private String value;
}
diff --git a/ycl-server/src/main/java/com/ycl/PlatformApplication.java b/ycl-server/src/main/java/com/ycl/PlatformApplication.java
index 9ec8815..bc1cb05 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.data.mongodb.config.EnableMongoAuditing;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.transaction.annotation.EnableTransactionManagement;
@@ -16,6 +17,7 @@
@EnableFeignClients(basePackages = {"com.ycl.feign"})
@ImportAutoConfiguration({FeignAutoConfiguration.class})
@SpringBootApplication
+@EnableMongoAuditing
//@EnableScheduling
public class PlatformApplication {
public static void main(String[] args) {
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 1460a02..f301921 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -4,10 +4,7 @@
import com.mongodb.client.result.DeleteResult;
import com.ycl.feign.UYClient;
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;
-import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
+import com.ycl.platform.domain.result.UY.*;
import com.ycl.platform.service.ITMonitorService;
import com.ycl.platform.service.IYwThresholdService;
import com.ycl.utils.DateUtils;
@@ -90,20 +87,22 @@
public void monitorQualifyTask() {
//涓�鏈轰竴妗ｅ悎鏍肩巼
log.info("寮�濮嬫墽琛屼竴鏈轰竴妗ｅ悎鏍肩巼鏁版嵁鍚屾");
- OneMachineFileParam param = new OneMachineFileParam();
- JSONObject jsonObject = uyClient.oneMachineFile(param);
+ MonitorQualifyParam param = new MonitorQualifyParam();
+ param.setPageNum(ApiConstants.pageNo);
+ param.setPageSize(ApiConstants.pageSize);
+ JSONObject jsonObject = uyClient.monitorQualify(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);
+ List<MonitorQualifyResult> records = data.getList("records", MonitorQualifyResult.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);
+ DeleteResult result = mongoTemplate.remove(query, MonitorQualifyResult.class);
//瀛樻斁鍦╩ongo涓�
mongoTemplate.insertAll(records);
} else {
--
Gitblit v1.8.0