From 46aaf9e30acf14a777cda37fe761b3b39e53f568 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期二, 03 九月 2024 15:51:21 +0800
Subject: [PATCH] 数据中心优化

---
 ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java      |    2 +-
 ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java |   33 +++++++++++++++------------------
 ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java    |    3 ++-
 3 files changed, 18 insertions(+), 20 deletions(-)

diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
index cc87869..df50bda 100644
--- a/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
+++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java
@@ -68,7 +68,7 @@
     private String osdPart;
 
     /**
-     * osd 宸︿笅瑙�
+     * osd宸︿笅瑙�
      */
     private String osdLB;
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
index c9bc5b8..dba8912 100644
--- a/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
+++ b/ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java
@@ -110,7 +110,7 @@
     @PostMapping("/videoMinistrySiteOnline")
     public Result videoMinistrySiteOnline(@RequestBody DataCenterQuery query) {
         query.setTime();
-        return dataCenterService.videoAvailabilityRate(query);
+        return dataCenterService.videoPointOnlineRate(query);
     }
 
     /**
@@ -122,6 +122,7 @@
     @PostMapping("/videoMinistryVideoAvailable")
     public Result videoMinistryVideoAvailable(@RequestBody DataCenterQuery query) {
         query.setTime();
+        // TODO 鍋氶儴绾ф暟鎹尯鍒�
         return dataCenterService.videoLabelingAccuracy(query);
     }
 
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
index a653ef3..6f50941 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java
@@ -5,10 +5,7 @@
 import com.ycl.platform.domain.entity.ImageResourceSecurityDetail;
 import com.ycl.platform.domain.query.DataCenterQuery;
 import com.ycl.platform.domain.result.HK.*;
-import com.ycl.platform.domain.result.UY.MonitorQualifyResult;
-import com.ycl.platform.domain.result.UY.OneMachineFileResult;
-import com.ycl.platform.domain.result.UY.RecordMetaDSumResult;
-import com.ycl.platform.domain.result.UY.VideoOnlineResult;
+import com.ycl.platform.domain.result.UY.*;
 import com.ycl.platform.mapper.ImageResourceSecurityDetailMapper;
 import com.ycl.platform.service.DataCenterService;
 import com.ycl.system.Result;
@@ -294,15 +291,15 @@
             );
         }
         query.addCriteria(criteria);
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        long total = mongoTemplate.count(query, OsdCheckResult.class);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+        List<OsdCheckResult> resultList = mongoTemplate.find(query, OsdCheckResult.class);
         // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OsdCheckResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OsdCheckResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OsdCheckResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OsdCheckResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OsdCheckResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);
@@ -430,15 +427,15 @@
             );
         }
         query.addCriteria(criteria);
-        long total = mongoTemplate.count(query, OneMachineFileResult.class);
+        long total = mongoTemplate.count(query, VideoOnlineResult.class);
         query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize()));
-        List<OneMachineFileResult> resultList = mongoTemplate.find(query, OneMachineFileResult.class);
+        List<VideoOnlineResult> resultList = mongoTemplate.find(query, VideoOnlineResult.class);
         // 缁熻鏁�
-        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), OneMachineFileResult.class);
-        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), OneMachineFileResult.class);
-        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), OneMachineFileResult.class);
-        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), OneMachineFileResult.class);
-        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), OneMachineFileResult.class);
+        long nonNetwork = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("0")), VideoOnlineResult.class);
+        long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), VideoOnlineResult.class);
+        long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/1/")), VideoOnlineResult.class);
+        long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/2/")), VideoOnlineResult.class);
+        long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex("/3/")), VideoOnlineResult.class);
         HashMap<String, Object> map = new HashMap<>();
         map.put("count", Arrays.asList(nonNetwork, network, video, car, face));
         map.put("list", resultList);

--
Gitblit v1.8.0