From 3b0516a2959e25576e4f3fda697a3b025d06c8c9 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期二, 24 六月 2025 14:09:07 +0800
Subject: [PATCH] 每日录像可用指标添加日志，修改大屏为查看当前月平均
---
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 2 ++
ycl-server/src/main/java/com/ycl/task/UYTask.java | 2 ++
ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml | 53 ++++++++---------------------------------------------
ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java | 2 +-
4 files changed, 13 insertions(+), 46 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
index 18c3c56..d2428b6 100644
--- a/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
+++ b/ycl-server/src/main/java/com/ycl/calculate/VideoUsabilityCalculation.java
@@ -61,7 +61,7 @@
}
}
});
-
+ log.error("鐢熸垚浠婃棩褰曞儚鎸囨爣鏁版嵁{}",checkIndexVideos);
checkIndexVideoService.saveOrUpdateBatch(checkIndexVideos);
}
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 a84bb9e..b1dfe89 100644
--- a/ycl-server/src/main/java/com/ycl/task/UYTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/UYTask.java
@@ -416,8 +416,10 @@
instance.setTime(new Date());
instance.add(Calendar.DAY_OF_MONTH, -1);
SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
+
String yesterday = format.format(instance.getTime());
param.setStatTime(yesterday);
+ log.error("寮�濮嬪悓姝ongodb褰曞儚鍙敤鏁版嵁鏃ユ湡涓簕}",yesterday);
JSONObject jsonObject = uyClient.recordMetaDSumList(param);
double minTime = getSySMinTime();
AtomicReference<Integer> count = new AtomicReference<>(0);
diff --git a/ycl-server/src/main/java/com/ycl/task/VideoTask.java b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
index 615ddfa..8e780cb 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -63,6 +63,7 @@
Date yesterday = DateUtils.addDays(new Date(), -1);
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Query query = new Query();
+ log.error("鏌ヨmongodb鏃ユ湡鏁版嵁涓簕}" , yesterday);
query.addCriteria(Criteria
.where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));//<&== 鏄ㄥぉ鐨勫紑濮嬫椂闂� < 缁撴潫鏃堕棿
List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);//
@@ -76,6 +77,7 @@
log.info("缁撴潫璁＄畻鐐逛綅鍦ㄧ嚎鐜�");
}
+ //鍦�15鍙锋墽琛屾寚鏍囷紝鏌ヨmongodb鍒涘缓鏃堕棿鍦�14鍙� 锛屽畾鏃朵换鍔″簲璇ュ湪15鍙锋墽琛� 鑾峰緱鐨刴ongodb鏁版嵁鍦�14鍙锋墠姝ｇ‘
public void videoUsabilityTask() {
log.info("寮�濮嬭绠楀綍鍍忓彲鐢ㄧ巼鍜岄噸鐐瑰綍鍍忓彲鐢ㄧ巼");
Date yesterday = DateUtils.addDays(new Date(), -1);
diff --git a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
index 8a086c3..b6311e1 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/CheckIndexVideoMapper.xml
@@ -154,49 +154,12 @@
</select>
<select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
-<!-- SELECT-->
-<!-- IFNULL(ROUND(AVG(platform_online * 100), 0), 0) AS platform_online,-->
-<!-- IFNULL(ROUND(AVG(monitor_qualification * 100), 0), 0) AS monitor_qualification,-->
-<!-- IFNULL(ROUND(AVG(monitor_registration * 100), 0), 0) AS monitor_registration,-->
-<!-- IFNULL(ROUND(AVG(archives_rate * 100), 0), 0) AS archives_rate,-->
-<!-- IFNULL(ROUND(AVG(site_online * 100), 0), 0) AS site_online,-->
-<!-- IFNULL(ROUND(AVG(video_available * 100), 0), 0) AS video_available,-->
-<!-- IFNULL(ROUND(AVG(ministry_site_online * 100), 0), 0) AS ministry_site_online,-->
-<!-- IFNULL(ROUND(AVG(ministry_video_available * 100), 0), 0) AS ministry_video_available,-->
-<!-- IFNULL(ROUND(AVG(key_site_online * 100), 0), 0) AS key_site_online,-->
-<!-- IFNULL(ROUND(AVG(key_video_available * 100), 0), 0) AS key_video_available,-->
-<!-- IFNULL(ROUND(AVG(key_annotation_accuracy * 100), 0), 0) AS key_annotation_accuracy,-->
-<!-- IFNULL(ROUND(AVG(key_timing_accuracy * 100), 0), 0) AS key_timing_accuracy,-->
-<!-- IFNULL(ROUND(AVG(key_command_image_online * 100), 0), 0) AS key_command_image_online,-->
-<!-- IFNULL(ROUND(AVG(image_resource_security * 100), 0), 0) AS image_resource_security-->
-<!-- FROM-->
-<!-- t_check_index_video-->
-<!-- <where>-->
-<!-- <if test="deptId != null">-->
-<!-- AND dept_id = #{deptId}-->
-<!-- </if>-->
-<!-- <if test="dataScope == 1">-->
-<!-- AND examine_tag = 0-->
-<!-- </if>-->
-<!-- <if test="dataScope == 2">-->
-<!-- AND examine_tag = 1-->
-<!-- </if>-->
-<!-- <if test="dataScope == 3">-->
-<!-- AND examine_tag = 2-->
-<!-- </if>-->
-<!-- </where>-->
-<!-- ORDER BY-->
-<!-- create_time DESC-->
-<!-- <if test="deptId == null">-->
-<!-- LIMIT 7-->
-<!-- </if>-->
-<!-- <if test="deptId != null">-->
-<!-- LIMIT 1-->
-<!-- </if>-->
WITH LatestRecords AS (
SELECT *
FROM t_check_index_video
<where>
+ YEAR(create_time) = YEAR(CURRENT_DATE)
+ AND MONTH(create_time) = MONTH(CURRENT_DATE)
<if test="deptId != null">
AND dept_id = #{deptId}
</if>
@@ -211,12 +174,6 @@
</if>
</where>
ORDER BY create_time DESC
- <if test="deptId == null">
- LIMIT 7
- </if>
- <if test="deptId != null">
- LIMIT 1
- </if>
)
SELECT
IFNULL(ROUND(AVG(platform_online * 100), 0), 0) AS platform_online,
@@ -237,6 +194,12 @@
LatestRecords;
</select>
+ <select id="dashboard" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
+
+ </select>
+
+
+
<select id="selectAndDeptName" resultType="com.ycl.platform.domain.entity.CheckIndexVideo">
WITH temp AS (
SELECT
--
Gitblit v1.8.0