From 1e0fee57168f6190f5dc5a3e01f8cde2b5561811 Mon Sep 17 00:00:00 2001 From: fuliqi <fuliqi@qq.com> Date: 星期二, 03 九月 2024 19:50:01 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ycl-pojo/src/main/java/com/ycl/platform/domain/result/UY/OsdCheckResult.java | 2 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java | 3 + ycl-server/src/main/java/com/ycl/platform/service/impl/DataCenterServiceImpl.java | 95 +++++++++++++++++++++++------------------------ ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml | 2 + ycl-server/src/main/java/com/ycl/platform/controller/DataCenterController.java | 15 +++++++ 5 files changed, 66 insertions(+), 51 deletions(-) diff --git a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java index 9c35574..86b9dff 100644 --- a/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java +++ b/ycl-pojo/src/main/java/com/ycl/platform/domain/entity/CheckRule.java @@ -65,4 +65,7 @@ /** 鏁版嵁涓績瀵瑰簲鐨勬帴鍙e湴鍧� */ private String apiUrl; + /** 鎺掑簭鍊� */ + private Integer orderNum; + } 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..e135d62 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,10 +122,23 @@ @PostMapping("/videoMinistryVideoAvailable") public Result videoMinistryVideoAvailable(@RequestBody DataCenterQuery query) { query.setTime(); + // TODO 鍋氶儴绾ф暟鎹尯鍒� return dataCenterService.videoLabelingAccuracy(query); } /** + * 瑙嗛锛氬綍鍍忓彲鐢ㄧ巼 + * + * @param query + * @return + */ + @PostMapping("/videoAvailabilityRate") + public Result videoAvailabilityRate(@RequestBody DataCenterQuery query) { + query.setTime(); + return dataCenterService.videoAvailabilityRate(query); + } + + /** * 瑙嗛锛氶噸鐐圭偣浣嶅綍鍍忓彲鐢ㄧ巼 * * @param 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..b983667 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; @@ -105,9 +102,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -168,9 +165,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -200,9 +197,9 @@ query.with(Sort.by(Sort.Order.asc(TIME_FIELD))).skip(params.getSkipNum()).limit(Math.toIntExact(params.getPageSize())); List<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.class); // 缁熻鏁� - long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), OneMachineFileResult.class); - long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), OneMachineFileResult.class); - long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), OneMachineFileResult.class); + long one = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("1")), RecordMetaDSumResult.class); + long two = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("2")), RecordMetaDSumResult.class); + long three = mongoTemplate.count(new Query().addCriteria(Criteria.where("recordStatus").is("-1")), RecordMetaDSumResult.class); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(one, two, three)); map.put("list", resultList); @@ -260,15 +257,15 @@ ); } query.addCriteria(criteria); - long total = mongoTemplate.count(query, OneMachineFileResult.class); + long total = mongoTemplate.count(query, RecordMetaDSumResult.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<RecordMetaDSumResult> resultList = mongoTemplate.find(query, RecordMetaDSumResult.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")), RecordMetaDSumResult.class); + long network = mongoTemplate.count(new Query().addCriteria(Criteria.where("LWSX").is("1")), RecordMetaDSumResult.class); + long video = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*1.*")), RecordMetaDSumResult.class); + long car = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*2.*")), RecordMetaDSumResult.class); + long face = mongoTemplate.count(new Query().addCriteria(Criteria.where("SXJGNLX").regex(".*3.*")), RecordMetaDSumResult.class); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -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); @@ -334,9 +331,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -368,9 +365,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -402,9 +399,9 @@ // 缁熻鏁� 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 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); 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); @@ -539,9 +536,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); @@ -849,9 +846,9 @@ // 缁熻鏁� 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 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); HashMap<String, Object> map = new HashMap<>(); map.put("count", Arrays.asList(nonNetwork, network, video, car, face)); map.put("list", resultList); diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml index 3b178cd..4245c27 100644 --- a/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml +++ b/ycl-server/src/main/resources/mapper/zgyw/CheckRuleMapper.xml @@ -37,6 +37,8 @@ <if test="state != null "> and state = #{state}</if> <if test="deleted != null and deleted != ''"> and deleted = #{deleted}</if> </where> + ORDER BY + order_num </select> <select id="selectCheckRuleById" resultMap="CheckRuleResult"> -- Gitblit v1.8.0