From 002372c5cfd2c9b9881fda5e527c2b6c4ee4d599 Mon Sep 17 00:00:00 2001
From: zxl <763096477@qq.com>
Date: 星期三, 19 二月 2025 09:26:40 +0800
Subject: [PATCH] 代码注释,运维监控报表接口统计sql重新编写
---
ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java | 2
ycl-server/src/main/java/com/ycl/task/VideoTask.java | 4 +-
ycl-server/src/main/resources/application-dev.yml | 2
ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml | 48 ++++++++++++++++-------
ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java | 7 +++
5 files changed, 43 insertions(+), 20 deletions(-)
diff --git a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
index 9b3c66e..0bde409 100644
--- a/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
+++ b/ycl-server/src/main/java/com/ycl/platform/mapper/TMonitorMapper.java
@@ -95,7 +95,7 @@
/**
* 鑾峰彇鎭㈠寮傚父璁惧
- * @param time 鏃堕棿
+ * @param monitor 鏃堕棿
* @return 鏁版嵁
*/
Map<String, String> recoveryException(TMonitorVO monitor);
diff --git a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
index c17d4ee..55976c3 100644
--- a/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
+++ b/ycl-server/src/main/java/com/ycl/platform/service/impl/TMonitorServiceImpl.java
@@ -372,16 +372,21 @@
*/
@Override
public Map<String, Object> home(HomeQuery monitorQuery) {
-
+ System.out.println(monitorQuery + "~~~~~~~~~~~~~鎵撳嵃");
Map<String, Object> dataMap = new HashMap<>();
Map<String, Object> monthMap1 = new HashMap<>();
Map<String, Object> monthMap2 = new HashMap<>();
List<Map<String, Object>> home = baseMapper.home(monitorQuery);
if (ObjectUtils.isNotEmpty(home)) {
+ //鎷垮埌鏁版嵁搴� 寰幆鏌ヨ
+ System.out.println(home + "~~~~~~~~~~~~~鎵撳嵃");
for (Map<String, Object> map : home) {
+ //寰楀埌map鐨� months閿殑鍊� num1閿殑鍊� 缁勮涓烘柊瀵硅薄
monthMap1.put(map.get("months").toString(), map.get("num1"));
+ //寰楀埌map鐨� months閿殑鍊� num2閿殑鍊� 缁勮涓烘柊瀵硅薄
monthMap2.put(map.get("months").toString(), map.get("num2"));
}
+ //home 鐨勪笅鏍�0鐨� map鐨� name閿殑鍊�
dataMap.put("name", home.get(0).get("name"));
dataMap.put("state", monthMap1);
dataMap.put("state2", monthMap2);
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 72c32a6..615ddfa 100644
--- a/ycl-server/src/main/java/com/ycl/task/VideoTask.java
+++ b/ycl-server/src/main/java/com/ycl/task/VideoTask.java
@@ -64,8 +64,8 @@
//璁＄畻鐐逛綅鍦ㄧ嚎鐜囧拰閲嶇偣鐐逛綅鍦ㄧ嚎鐜囧拰鎸囨尌鍥惧儚鍦ㄧ嚎鐜�
Query query = new Query();
query.addCriteria(Criteria
- .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));
- List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);
+ .where("mongoCreateTime").gte(DateUtils.getDayStart(yesterday)).lt(DateUtils.getDayEnd(yesterday)));//<&== 鏄ㄥぉ鐨勫紑濮嬫椂闂� < 缁撴潫鏃堕棿
+ List<VideoOnlineResult> results = mongoTemplate.find(query, VideoOnlineResult.class);//
//浼樹簯涓婃湁杞﹁締鍜屼汉鑴哥殑璁惧鏁版嵁锛岄渶瑕佽繃婊ゅ嚭瑙嗛璁惧
List<String> videoIds = monitorMapper.getVideoIds();
if(!CollectionUtils.isEmpty(results)){
diff --git a/ycl-server/src/main/resources/application-dev.yml b/ycl-server/src/main/resources/application-dev.yml
index 3d5e6c0..0d3752e 100644
--- a/ycl-server/src/main/resources/application-dev.yml
+++ b/ycl-server/src/main/resources/application-dev.yml
@@ -42,7 +42,7 @@
# password: ycl@202466
url: jdbc:mysql://localhost:3306/zgyw?useUnicode=true&characterEncoding=utf8&autoReconnect=true&useSSL=false&serverTimezone=GMT%2B8&rewriteBatchedStatements=true&allowMultiQueries=true&allowPublicKeyRetrieval=true
username: root
- password: 1234
+ password: 123456
type: com.alibaba.druid.pool.DruidDataSource
driver-class-name: com.mysql.cj.jdbc.Driver
diff --git a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
index e18e830..aa9bcf4 100644
--- a/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
+++ b/ycl-server/src/main/resources/mapper/zgyw/TMonitorMapper.xml
@@ -487,26 +487,44 @@
WHERE TIMESTAMPDIFF(DAY, p.recovery_time, NOW()) <= #{time}
]]>
</select>
-
+<!-- 鏌ヨ t_yw_unit 涓璱d 涓猴紵 骞朵笖 t_work_order-->
+<!-- <select id="home" resultType="java.util.Map">-->
+<!-- SELECT-->
+<!-- u.unit_name AS name,-->
+<!-- CONCAT(MONTH(w.create_time), '鏈�') AS months,-->
+<!-- COUNT(w.id) AS num1,-->
+<!-- COUNT(w.id) - COUNT(m.id) AS num2-->
+<!-- FROM-->
+<!-- t_monitor m-->
+<!-- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number-->
+<!-- LEFT JOIN t_yw_unit u ON p.unit_id = u.id-->
+<!-- LEFT JOIN t_work_order w ON w.serial_number = p.serial_number-->
+<!-- WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL-->
+<!-- <if test="dateRange != null and dateRange.size > 0">-->
+<!-- AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')-->
+<!-- </if>-->
+<!-- GROUP BY months-->
+<!-- ORDER BY months-->
+<!-- </select>-->
<select id="home" resultType="java.util.Map">
- SELECT
+ select count(distinct w.serial_number) as num1,
+ CASE WHEN( a.num -count(distinct w.serial_number))
+ <![CDATA[ < 0 THEN 0 ELSE (a.num -count(distinct w.serial_number)) END as num2 ]]>,
u.unit_name AS name,
- CONCAT(MONTH(w.create_time), '鏈�') AS months,
- COUNT(w.id) AS num1,
- COUNT(m.id) - COUNT(w.id) AS num2
- FROM
- t_monitor m
- LEFT JOIN t_yw_point p ON m.serial_number = p.serial_number
- LEFT JOIN t_yw_unit u ON p.unit_id = u.id
- LEFT JOIN t_work_order w ON w.serial_number = p.serial_number
- WHERE u.id = #{unitId} AND MONTH(w.create_time) IS NOT NULL
+ CONCAT(MONTH(w.create_time), '鏈�') AS months
+ from
+ (select count(m.id) as num from t_monitor m where m.serial_number IN (SELECT p.serial_number from t_yw_unit u,t_yw_point p where p.unit_id = u.id and u.id = 21 AND p.examine_status = 1)
+ ) as a
+ join
+ t_work_order w
+ JOIN t_yw_unit u ON u.id = w.unit_id
+ where w.unit_id=#{unitId}
<if test="dateRange != null and dateRange.size > 0">
- AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0]}, '%Y-%m') AND DATE_FORMAT(#{dateRange[1]}, '%Y-%m')
+ AND DATE_FORMAT(w.create_time, '%Y-%m') BETWEEN DATE_FORMAT(#{dateRange[0], '%Y-%m') AND DATE_FORMAT(#{dateRange[1], '%Y-%m')
</if>
+ AND w.deleted = 1
GROUP BY months
- ORDER BY months
- </select>
-
+</select>
<select id="monitorTotal" resultType="com.ycl.platform.domain.vo.screen.MonitorTotalVO">
SELECT
'video' as type,
--
Gitblit v1.8.0