From b49816062dd5dccc5d3a32e929abc726162f7294 Mon Sep 17 00:00:00 2001
From: ZengTao <2773468879@qq.com>
Date: 星期四, 15 五月 2025 09:02:45 +0800
Subject: [PATCH] 修改ip为配置ip
---
hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml | 46 +++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 45 insertions(+), 1 deletions(-)
diff --git a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
index 238ae73..02adb4e 100644
--- a/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
+++ b/hangzhoumesParent/moduleService/CacheGlassModule/src/main/resources/mapper/EdgStorageDeviceTaskHistoryMapper.xml
@@ -18,7 +18,52 @@
<result column="hollow_total_area_out_two" property="hollowTotalAreaOutTwo"/>
</resultMap>
+ <select id="queryDailyProduction" resultMap="baseMap">
+ SELECT
+ count( t.glass_id_out ) AS count_out_one,
+ round( sum( t1.width * t1.height )/ 1000000, 2 ) AS total_area_out_one
+ FROM
+ edg_storage_device_task_history t
+ INNER JOIN glass_info t1 ON t.glass_id_out = t1.glass_id
+ WHERE
+ t.task_type IN ( 2, 3 )
+ <if test="beginDate != null and beginDate != ''">
+ AND STR_TO_DATE( t.create_time, '%Y-%m-%d' ) BETWEEN #{beginDate}
+ AND #{endDate}
+ </if>
+ <if test="deviceId != null and deviceId != 0">
+ AND device_id = #{deviceId}
+ </if>
+ </select>
+ <select id="queryRunTimes" resultType="com.mes.largenscreen.entity.RunTime">
+ with edg_storage_cage_history_task_temp as (
+ select distinct create_time from edg_storage_device_task_history where task_type in (1,3) and
+ create_time BETWEEN CURDATE() AND DATE_ADD(CURDATE(), INTERVAL 1 DAY)
+ )
+ SELECT
+ t1.create_time AS first_timestamp,
+ t2.create_time AS second_timestamp,
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) as diff_minutes
+ ,(select min(create_time) from edg_storage_cage_history_task_temp) as start_timestamp
+ ,(select max(create_time) from edg_storage_cage_history_task_temp) as end_timestamp
+ FROM
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ edg_storage_cage_history_task_temp ) t1
+ JOIN
+ (SELECT
+ create_time,
+ LEAD(create_time) OVER (ORDER BY create_time) AS next_timestamp
+ FROM
+ edg_storage_cage_history_task_temp ) t2 ON t1.next_timestamp = t2.create_time
+ WHERE
+ TIMESTAMPDIFF(MINUTE, t1.create_time, t2.create_time) between 6 and 500
+ GROUP BY t1.create_time,t2.create_time
+ ;
+ </select>
<select id="queryEdgDailyProduction" resultMap="baseMap">
SELECT
count( t.glass_id_out ) AS count_out_one,
@@ -36,6 +81,5 @@
AND device_id = #{deviceId}
</if>
</select>
-
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0