fix

zhangqian

2023-11-01 1773bcb483d0a1c06e45a6e748719cb24818ee4a

fix

 pkg/timex/time.go

New file
@@ -0,0 +1,68 @@
package timex

import (
    "time"
)

func StringToTime(timeStr string) (time.Time, error) {
    return time.ParseInLocation("2006-01-02 15:04:05", timeStr, time.Local)
}

func StringToTime2(timeStr string) (time.Time, error) {
    return time.ParseInLocation("2006-01-02", timeStr, time.Local)
}

func StringToTime3(timeStr string) (time.Time, error) {
    return time.ParseInLocation("2006-01-02 15:04", timeStr, time.Local)
}

func StringToClock(timeStr string) (time.Time, error) {
    return time.ParseInLocation("15:04", timeStr, time.Local)
}

func TimeToString(time time.Time) string {
    return time.Format("2006-01-02 15:04:05")
}

func TimeToString2(time time.Time) string {
    return time.Format("2006-01-02")
}

func TimeToString3(time time.Time) string {
    return time.Format("15:04")
}

func UnixTimeToString(_t int64) string {
    return time.Unix(_t, 0).In(time.Local).Format("2006-01-02 15:04:05")
}
func UnixTimeToDate(_t int64) string {
    return time.Unix(_t, 0).In(time.Local).Format("2006-01-02")
}

func DayStartTime(_t time.Time) time.Time {
    l := _t.In(time.Local)
    k := time.Date(l.Year(), l.Month(), l.Day(), 0, 0, 0, 0, time.Local)
    return k
}

func TodayStartTime() time.Time {
    l := time.Now().In(time.Local)
    k := time.Date(l.Year(), l.Month(), l.Day(), 0, 0, 0, 0, time.Local)
    return k
}

func TodayStartTs() int64 {
    return TodayStartTime().Unix()
}

func DayStartTimeDateStr(_t int64) string {
    l := time.Unix(_t, 0).In(time.Local)
    k := time.Date(l.Year(), l.Month(), l.Day(), 0, 0, 0, 0, time.Local)
    return TimeToString2(k)
}

const timeLayout = "2006-01-02 15:04:05"

func GetCurrentTime() string {
    return time.Now().Format(timeLayout)
}

 service/task.go

@@ -8,6 +8,7 @@
    "apsClient/model/response"
    "apsClient/pkg/ecode"
    "apsClient/pkg/logx"
    "apsClient/pkg/timex"
    "fmt"
    "github.com/jinzhu/gorm"
    "time"
@@ -222,12 +223,12 @@
    search := model.NewProceduresSearch(nil).
        SetDeviceId(deviceID).
        SetOffset(offset, limit).SetChannels(channels)
    nowTs := time.Now().Unix()
    todayStartTs := timex.TodayStartTs()
    switch queryType {
    case request.QueryTypeUnFinish:
        search.SetStatusNot(model.ProcedureStatusFinished).SetOrder("status desc, start_time asc")
    case request.QueryTypeToday:
        search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(nowTs).SetEndTimeMax(nowTs + 86400).SetOrder("status desc, start_time asc")
        search.SetStatusNot(model.ProcedureStatusFinished).SetStartTimeMin(todayStartTs).SetEndTimeMax(todayStartTs + 86400).SetOrder("status desc, start_time asc")
    case request.QueryTypeFinished:
        search.SetStatus(model.ProcedureStatusFinished).SetOrder("start_time desc")
    }