From 9b17a8dcbc1f94eb117a37b3b24ca9dae0d2d588 Mon Sep 17 00:00:00 2001
From: qixiaoning <jony.kee@outlook.com>
Date: 星期三, 29 十月 2025 09:40:54 +0800
Subject: [PATCH] 摄像机相关接口跳转，推送配置修改，系统权限菜单修改
---
camera-common/models/Record.go | 26 +++++++++++++++++++-------
1 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/camera-common/models/Record.go b/camera-common/models/Record.go
index b950b7a..a72bfe1 100644
--- a/camera-common/models/Record.go
+++ b/camera-common/models/Record.go
@@ -503,15 +503,27 @@
lists := convertResultToMap(result)
layout := "2006-01-02 15:04:05.999999"
- var temp1 time.Time
- var temp2 time.Time
+ // var temp1 time.Time
+ // var temp2 time.Time
- //鎺掑簭
+ // //鎺掑簭
+ // sort.Slice(lists, func(i, j int) bool {
+ // //return lists[i].DetectTime > lists[j].:DetectTime
+ // temp1, _ = time.Parse(layout, lists[i].DetectTime)
+ // temp2, _ = time.Parse(layout, lists[j].DetectTime)
+ // return temp1.After(temp2)
+ // })
+
sort.Slice(lists, func(i, j int) bool {
- //return lists[i].DetectTime > lists[j].:DetectTime
- temp1, _ = time.Parse(layout, lists[i].DetectTime)
- temp2, _ = time.Parse(layout, lists[j].DetectTime)
- return temp1.After(temp2)
+ t1, err1 := time.Parse(layout, lists[i].DetectTime)
+ t2, err2 := time.Parse(layout, lists[j].DetectTime)
+
+ // 閿欒澶勭悊锛氳В鏋愰敊璇殑鏃堕棿鎺掑湪鍚庨潰
+ if err1 != nil || err2 != nil {
+ return err1 == nil && err2 != nil
+ }
+
+ return t1.After(t2)
})
items := Paginate(lists, int(pageNum), int(pageSize))
--
Gitblit v1.8.0