From dde2eeddbaf07246da7c2c352e7d49ec63fddcd2 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期五, 28 三月 2025 14:56:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt | 201 +++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 181 insertions(+), 20 deletions(-)
diff --git a/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt b/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
index 00e535f..f79e67a 100644
--- a/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
+++ b/app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt
@@ -9,6 +9,7 @@
import com.example.firstapp.database.entity.Msg
import com.example.firstapp.model.CourierStat
import com.example.firstapp.model.DailyStat
+import com.example.firstapp.model.HeatmapStat
import io.reactivex.Completable
import kotlinx.coroutines.flow.Flow
@@ -34,7 +35,7 @@
@Query("SELECT * FROM Code")
fun getAllCodes(): List<Code>
- @Query("SELECT * FROM Code WHERE type = :type")
+ @Query("SELECT * FROM Code WHERE oneLevel = :type")
fun getCodesByType(type: String): List<Code>
@@ -47,13 +48,13 @@
@Query("""
SELECT * FROM Code
- WHERE type LIKE '%' || :keyword || '%'
+ WHERE oneLevel LIKE '%' || :keyword || '%'
AND pickup = '0'
ORDER BY time DESC
""")
fun getByKeyword(keyword: String): List<Code>
- @Query("SELECT * FROM Code WHERE type = :content and code= :code and createtime = :dateString LIMIT 1")
+ @Query("SELECT * FROM Code WHERE oneLevel = :content and code= :code and createTime = :dateString LIMIT 1")
fun queryByTypeAndCodeAndDate(content: String, code: String, dateString: String): Code
@@ -61,43 +62,203 @@
fun pickup(id: Long)
//查询当天包裹信息
- @Query("SELECT * FROM code WHERE date(createtime) = date(:date/1000, 'unixepoch', 'localtime') ORDER BY createtime DESC")
+ @Query("SELECT * FROM code WHERE date(createTime) = date(:date/1000, 'unixepoch', 'localtime') ORDER BY createTime DESC")
fun getNewPackagesByDay(date: Long): List<Code>
@Query("""
SELECT * FROM code
- WHERE substr(createtime, 1, 10) =
+ WHERE substr(createTime, 1, 10) =
date(:date/1000, 'unixepoch', 'localtime')
- ORDER BY createtime DESC
+ ORDER BY createTime DESC
""")
fun getPackagesByDay(date: Long): Flow<List<Code>>
@Query("""
- SELECT type as courierName, COUNT(*) as count
+ SELECT oneLevel as courierName, COUNT(*) as count
FROM code
- WHERE strftime('%Y-%W', substr(createtime, 1, 10)) =
+ WHERE strftime('%Y-%W', substr(createTime, 1, 10)) =
strftime('%Y-%W', datetime(:date/1000, 'unixepoch', 'localtime'))
- GROUP BY type
+ GROUP BY oneLevel
ORDER BY count DESC
""")
fun getCourierStatsByWeek(date: Long): Flow<List<CourierStat>>
@Query("""
- SELECT strftime('%W', createtime) as date,
- COUNT(*) as count,
- MIN(createtime) as week_start
- FROM code
- WHERE strftime('%Y', createtime) = strftime('%Y', 'now')
- GROUP BY strftime('%W', createtime)
- ORDER BY week_start ASC
- """)
- fun getDailyStatsByWeek(): Flow<List<DailyStat>>
+ WITH RECURSIVE dates(date_value) AS (
+ -- 从当前日期往前3周的周一开始
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'weekday 0', '-21 days') as date_value
+ UNION ALL
+ -- 每次加7天，直到后2周
+ SELECT date(date_value, '+7 days')
+ FROM dates
+ WHERE date_value < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'weekday 0', '+14 days')
+ )
+ SELECT
+ strftime('%Y-%m-%d', date_value) as date,
+ COUNT(c.id) as count,
+ date_value as weekStart
+ FROM dates d
+ LEFT JOIN code c ON strftime('%Y-%m-%d', c.createTime) BETWEEN
+ strftime('%Y-%m-%d', d.date_value)
+ AND strftime('%Y-%m-%d', date(d.date_value, '+6 days'))
+ GROUP BY d.date_value
+ ORDER BY d.date_value ASC
+ LIMIT :weekCount
+""")
+ fun getWeeklyStats(date: Long, weekCount: Int): Flow<List<DailyStat>>
@Query("""
SELECT * FROM code
- WHERE substr(createtime, 1, 10) =
+ WHERE substr(createTime, 1, 10) =
date(:date/1000, 'unixepoch', 'localtime')
- ORDER BY createtime DESC
+ ORDER BY createTime DESC
""")
fun getPackagesByWeek(date: Long): Flow<List<Code>>
+
+ @Query("""
+ SELECT oneLevel as courierName, COUNT(*) as count
+ FROM code
+ WHERE strftime('%Y-%m', substr(createTime, 1, 10)) =
+ strftime('%Y-%m', datetime(:date/1000, 'unixepoch', 'localtime'))
+ GROUP BY oneLevel
+ ORDER BY count DESC
+ """)
+ fun getCourierStatsByMonth(date: Long): Flow<List<CourierStat>>
+
+ @Query("""
+ SELECT oneLevel as courierName, COUNT(*) as count
+ FROM code
+ WHERE strftime('%Y', substr(createTime, 1, 10)) =
+ strftime('%Y', datetime(:date/1000, 'unixepoch', 'localtime'))
+ GROUP BY oneLevel
+ ORDER BY count DESC
+ """)
+ fun getCourierStatsByYear(date: Long): Flow<List<CourierStat>>
+
+// @Query("""
+// WITH RECURSIVE months(month_start) AS (
+// SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of month', '-11 months')
+// UNION ALL
+// SELECT date(month_start, '+1 month')
+// FROM months
+// WHERE date(month_start) < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of month')
+// )
+// SELECT
+// strftime('%m', month_start) as date,
+// COUNT(code.id) as count,
+// month_start as week_start
+// FROM months
+// LEFT JOIN code ON strftime('%Y-%m', code.createTime) = strftime('%Y-%m', months.month_start)
+// GROUP BY months.month_start
+// ORDER BY months.month_start ASC
+// """)
+// fun getMonthlyStats(date: Long): Flow<List<DailyStat>>
+
+ @Query("""
+ WITH RECURSIVE years(year_start) AS (
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of year', '-4 years')
+ UNION ALL
+ SELECT date(year_start, '+1 year')
+ FROM years
+ WHERE date(year_start) < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of year')
+ )
+ SELECT
+ strftime('%Y', year_start) as date,
+ COUNT(code.id) as count,
+ year_start as week_start
+ FROM years
+ LEFT JOIN code ON strftime('%Y', code.createTime) = strftime('%Y', years.year_start)
+ GROUP BY years.year_start
+ ORDER BY years.year_start ASC
+ """)
+ fun getYearlyStats(date: Long): Flow<List<DailyStat>>
+
+ @Query("""
+ WITH RECURSIVE dates(date) AS (
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of year')
+ UNION ALL
+ SELECT date(date, '+1 day')
+ FROM dates
+ WHERE date < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of year', '+1 year', '-1 day')
+ )
+ SELECT
+ CAST(strftime('%w', dates.date) AS INTEGER) as dayOfWeek,
+ CAST(strftime('%W', dates.date) AS INTEGER) as weekOfYear,
+ COUNT(code.id) as count
+ FROM dates
+ LEFT JOIN code ON date(code.createTime) = dates.date
+ GROUP BY dates.date
+ ORDER BY dates.date
+ """)
+ fun getYearlyHeatmap(date: Long): Flow<List<HeatmapStat>>
+
+ @Query("""
+ WITH RECURSIVE days(date) AS (
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of month')
+ UNION ALL
+ SELECT date(date, '+1 day')
+ FROM days
+ WHERE date < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of month', '+1 month', '-1 day')
+ )
+ SELECT
+ strftime('%d', days.date) || '' as date, -- 确保 date 不为空
+ COUNT(code.id) as count,
+ days.date as week_start
+ FROM days
+ LEFT JOIN code ON date(code.createTime) = days.date
+ GROUP BY days.date
+ ORDER BY days.date ASC
+ """)
+ fun getMonthlyStats(date: Long): Flow<List<DailyStat>>
+
+ @Query("""
+ WITH RECURSIVE months(month_start) AS (
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of year') as month_start
+ UNION ALL
+ SELECT date(month_start, '+1 month')
+ FROM months
+ WHERE strftime('%m', month_start) < '12'
+ )
+ SELECT
+ strftime('%m', month_start) as date,
+ COUNT(code.id) as count,
+ month_start as weekStart
+ FROM months
+ LEFT JOIN code ON strftime('%Y-%m', code.createTime) = strftime('%Y-%m', months.month_start)
+ GROUP BY months.month_start
+ ORDER BY months.month_start ASC
+ """)
+ fun getYearMonthlyStats(date: Long): Flow<List<DailyStat>>
+
+
+ // 新增当前周统计方法
+ @Query("""
+ WITH RECURSIVE days(date) AS (
+ SELECT date(datetime(:date/1000, 'unixepoch', 'localtime'), 'weekday 0') as date
+ UNION ALL
+ SELECT date(date, '+1 day')
+ FROM days
+ WHERE date < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'weekday 6')
+ )
+ SELECT
+ strftime('%Y-%m-%d', days.date) as date,
+ COUNT(code.id) as count,
+ days.date as weekStart
+ FROM days
+ LEFT JOIN code ON date(code.createTime) = days.date
+ GROUP BY days.date
+ ORDER BY days.date ASC
+""")
+ fun getCurrentWeekStats(date: Long): Flow<List<DailyStat>>
+
+ // 新增当前年统计方法
+ @Query("""
+ SELECT
+ strftime('%Y', datetime(:date/1000, 'unixepoch', 'localtime')) as date,
+ COUNT(id) as count,
+ datetime(:date/1000, 'unixepoch', 'localtime') as weekStart
+ FROM code
+ WHERE strftime('%Y', createTime) = strftime('%Y', datetime(:date/1000, 'unixepoch', 'localtime'))
+""")
+ fun getCurrentYearStats(date: Long): Flow<List<DailyStat>>
}
--
Gitblit v1.9.3