From 3433f3e9a0254b24cec2836b112267b1af3f9101 Mon Sep 17 00:00:00 2001
From: tj <1378534974@qq.com>
Date: 星期一, 07 四月 2025 10:57:40 +0800
Subject: [PATCH] 1.jks打包相关修改 2.vip续费页面相关修改
---
app/src/main/java/com/example/firstapp/database/dao/CodeDao.kt | 116 ++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 85 insertions(+), 31 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 39d54e2..7572a45 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
@@ -10,6 +10,7 @@
import com.example.firstapp.model.CourierStat
import com.example.firstapp.model.DailyStat
import com.example.firstapp.model.HeatmapStat
+import com.example.firstapp.model.StationGroup
import io.reactivex.Completable
import kotlinx.coroutines.flow.Flow
@@ -35,7 +36,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>
@@ -48,47 +49,51 @@
@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")
- fun queryByTypeAndCodeAndDate(content: String, code: String, dateString: String): Code
+ @Query("""
+ SELECT * FROM Code
+ WHERE category = :category
+ AND code = :code
+ AND substr(createTime, 1, 10) = substr(:dateString, 1, 10)
+ LIMIT 1
+ """)
+ fun queryByTypeAndCodeAndDate(category: String, code: String, dateString: String): Code?
@Query("update Code set pickup = '1' , pickuptime = CURRENT_TIMESTAMP where id=:id")
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("""
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')
@@ -96,9 +101,9 @@
SELECT
strftime('%Y-%m-%d', date_value) as date,
COUNT(c.id) as count,
- date_value as weekStart
+ strftime('%Y-%m-%d', date_value) as weekStart
FROM dates d
- LEFT JOIN code c ON strftime('%Y-%m-%d', c.createtime) BETWEEN
+ 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
@@ -109,28 +114,28 @@
@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 type as courierName, COUNT(*) as count
+ SELECT oneLevel as courierName, COUNT(*) as count
FROM code
- WHERE strftime('%Y-%m', substr(createtime, 1, 10)) =
+ WHERE strftime('%Y-%m', substr(createTime, 1, 10)) =
strftime('%Y-%m', datetime(:date/1000, 'unixepoch', 'localtime'))
- GROUP BY type
+ GROUP BY oneLevel
ORDER BY count DESC
""")
fun getCourierStatsByMonth(date: Long): Flow<List<CourierStat>>
@Query("""
- SELECT type as courierName, COUNT(*) as count
+ SELECT oneLevel as courierName, COUNT(*) as count
FROM code
- WHERE strftime('%Y', substr(createtime, 1, 10)) =
+ WHERE strftime('%Y', substr(createTime, 1, 10)) =
strftime('%Y', datetime(:date/1000, 'unixepoch', 'localtime'))
- GROUP BY type
+ GROUP BY oneLevel
ORDER BY count DESC
""")
fun getCourierStatsByYear(date: Long): Flow<List<CourierStat>>
@@ -148,7 +153,7 @@
// 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)
+// 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
// """)
@@ -165,9 +170,9 @@
SELECT
strftime('%Y', year_start) as date,
COUNT(code.id) as count,
- year_start as week_start
+ strftime('%Y-%m-%d', year_start) as weekStart
FROM years
- LEFT JOIN code ON strftime('%Y', code.createtime) = strftime('%Y', years.year_start)
+ LEFT JOIN code ON strftime('%Y', code.createTime) = strftime('%Y', years.year_start)
GROUP BY years.year_start
ORDER BY years.year_start ASC
""")
@@ -186,7 +191,7 @@
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
+ LEFT JOIN code ON date(code.createTime) = dates.date
GROUP BY dates.date
ORDER BY dates.date
""")
@@ -201,11 +206,11 @@
WHERE date < date(datetime(:date/1000, 'unixepoch', 'localtime'), 'start of month', '+1 month', '-1 day')
)
SELECT
- strftime('%d', days.date) || '' as date, -- 确保 date 不为空
+ strftime('%d', days.date) || '' as date,
COUNT(code.id) as count,
- days.date as week_start
+ strftime('%Y-%m-%d', days.date) as weekStart
FROM days
- LEFT JOIN code ON date(code.createtime) = days.date
+ LEFT JOIN code ON date(code.createTime) = days.date
GROUP BY days.date
ORDER BY days.date ASC
""")
@@ -222,11 +227,60 @@
SELECT
strftime('%m', month_start) as date,
COUNT(code.id) as count,
- month_start as weekStart
+ strftime('%Y-%m-%d', month_start) as weekStart
FROM months
- LEFT JOIN code ON strftime('%Y-%m', code.createtime) = strftime('%Y-%m', months.month_start)
+ 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,
+ strftime('%Y-%m-%d', 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,
+ strftime('%Y-%m-%d', 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>>
+
+ @Query("""
+ SELECT oneLevel as stationName, COUNT(*) as count
+ FROM Code
+ WHERE category = :type AND pickup = '0'
+ GROUP BY oneLevel
+ ORDER BY createTime DESC
+ """)
+ fun getStationsByType(type: String): List<StationGroup>
+
+ @Query("""
+ SELECT * FROM Code
+ WHERE category = :type AND pickup = '0'
+ AND oneLevel = :stationName
+ ORDER BY createTime DESC
+ """)
+ fun getPackagesByTypeAndStation(type: String, stationName: String): List<Code>
}
--
Gitblit v1.9.3