From 638f3b042a0a29e287491e08a7ebe6f460b17532 Mon Sep 17 00:00:00 2001 From: 龚焕茏 <2842157468@qq.com> Date: 星期一, 05 八月 2024 15:04:55 +0800 Subject: [PATCH] feat:首页考核报表 --- ycl-server/src/main/java/com/ycl/task/UYTask.java | 48 +++++++++++++++++++++++++++++++++++++++++++----- 1 files changed, 43 insertions(+), 5 deletions(-) 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 3d2f545..1e2558e 100644 --- a/ycl-server/src/main/java/com/ycl/task/UYTask.java +++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java @@ -4,11 +4,14 @@ 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.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.service.ITMonitorService; import com.ycl.platform.service.IYwThresholdService; import com.ycl.utils.DateUtils; import constant.ApiConstants; @@ -24,7 +27,7 @@ import java.util.Date; import java.util.List; - +//浼樹簯瀵规帴鏁版嵁浠诲姟 @Slf4j @Component("UYTask") public class UYTask { @@ -35,7 +38,8 @@ private UYClient uyClient; @Autowired private IYwThresholdService ywThresholdService; - + @Autowired + private ITMonitorService monitorService; @Value("${youYun.tenantId}") private String tenantId; @@ -54,7 +58,7 @@ if (!CollectionUtils.isEmpty(data)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, OneMachineFileResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(data); @@ -87,7 +91,7 @@ if (!CollectionUtils.isEmpty(records)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, QueryVqdResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(records); @@ -111,6 +115,7 @@ //褰曞儚鍙敤鐜� log.info("寮�濮嬫墽琛屽綍鍍忓彲鐢ㄦ暟鎹悓姝�"); RecordMetaDSumParam param = new RecordMetaDSumParam(); + param.setTenantId(tenantId); JSONObject jsonObject = uyClient.recordMetaDSumList(param); if (jsonObject != null) { if (jsonObject.getBoolean("success")) { @@ -120,7 +125,7 @@ if (!CollectionUtils.isEmpty(records)) { //濡傛灉浠婂ぉ瀛樺湪涔嬪墠鐨勬暟鎹厛鍒犻櫎 Query query = new Query(Criteria - .where("createTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); + .where("mongoCreateTime").gte(DateUtils.getDayStart(new Date())).lt(DateUtils.getDayEnd(new Date()))); DeleteResult result = mongoTemplate.remove(query, RecordMetaDSumResult.class); //瀛樻斁鍦╩ongo涓� mongoTemplate.insert(records); @@ -138,4 +143,37 @@ } log.info("缁撴潫鎵ц褰曞儚鍙敤鏁版嵁鍚屾"); } + + //瑙嗛鏍囨敞 + public void OsdMonitorTask() { + //瑙嗛鏍囨敞 + log.info("寮�濮嬫墽琛岃棰戞爣娉ㄦ暟鎹悓姝�"); + OsdMonitorParam param = new OsdMonitorParam(); + JSONObject jsonObject = uyClient.osdMonitorList(param,tenantId); + if (jsonObject != null) { + if (jsonObject.getBoolean("success")) { + JSONObject data = jsonObject.getJSONObject("data"); + if (data != null) { + List<OsdMonitorResult> records = data.getList("records", OsdMonitorResult.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, OsdMonitorResult.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