From db4397ad56201acfce015acbb79a8c7606267768 Mon Sep 17 00:00:00 2001
From: junleea <354425203@qq.com>
Date: Wed, 5 Jun 2024 17:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=88=9B=E5=BB=BA=E8=A7=86?=
 =?UTF-8?q?=E9=A2=91=E8=AE=B0=E5=BD=95=E7=9A=84=E5=88=A0=E9=99=A4=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=EF=BC=8C=E6=97=A0=E6=97=B6=E9=97=B4=E6=97=B6=E8=87=AA?=
 =?UTF-8?q?=E5=8A=A8=E6=89=A7=E8=A1=8C=E5=BB=B6=E8=BF=9F20=E5=A4=A9?=
 =?UTF-8?q?=E5=88=A0=E9=99=A4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dao/video.go            | 9 ++++++---
 handler/video.go        | 2 +-
 service/videoService.go | 4 ++--
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/dao/video.go b/dao/video.go
index 8c4fb72..fe3f3b8 100644
--- a/dao/video.go
+++ b/dao/video.go
@@ -21,16 +21,19 @@ type Video struct {
 
 func FindWillDelVideoList(id int) []Video {
 	var videos []Video
-	DB.Debug().Where("auth_id = ?", id).Where("delete_time<=now()").Find(&videos)
+	DB.Debug().Where("auth_id = ?", id).Where("delete_time<=now()").Where("isdelete=0").Find(&videos)
 	return videos
 }
 
-func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime string, fileSize int) uint {
-	video := Video{VideoPath: videoPath, VideoName: videoName, CameraID: cameraID, AuthId: authID, Human: human, IsDelete: isDelete, CreateTime: createTime, EndTime: endTime, FileSize: fileSize}
+func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime, deleteTime string, fileSize int) uint {
+	video := Video{VideoPath: videoPath, VideoName: videoName, CameraID: cameraID, AuthId: authID, Human: human, IsDelete: isDelete, CreateTime: createTime, EndTime: endTime, DeleteTime: deleteTime, FileSize: fileSize}
 	res := DB.Debug().Create(&video)
 	if res.Error != nil {
 		return 0
 	}
+	if deleteTime == "" {
+		DB.Debug().Exec("update videos set delete_time= DATE_ADD(NOW(), INTERVAL 20 DAY) where id=?", video.ID) //delete_time= DATE_ADD(NOW(), INTERVAL 20 DAY)
+	}
 	return video.ID
 }
 
diff --git a/handler/video.go b/handler/video.go
index 45cba1d..3fe327d 100644
--- a/handler/video.go
+++ b/handler/video.go
@@ -137,7 +137,7 @@ func CreateVideo(c *gin.Context) {
 	user_id, _ := c.Get("id")
 	if err := c.ShouldBind(&video_req); err == nil {
 		fmt.Println(video_req)
-		id := service.CreateVideo(video_req.VideoPath, video_req.VideoName, video_req.CameraID, int(user_id.(float64)), video_req.Human, video_req.IsDelete, video_req.CreateTime, video_req.EndTime, video_req.FileSize)
+		id := service.CreateVideo(video_req.VideoPath, video_req.VideoName, video_req.CameraID, int(user_id.(float64)), video_req.Human, video_req.IsDelete, video_req.CreateTime, video_req.EndTime, video_req.DeleteTime, video_req.FileSize)
 		if id == 0 {
 			c.JSON(http.StatusOK, gin.H{"error": "create video failed", "code": 1, "message": "failed"})
 			return
diff --git a/service/videoService.go b/service/videoService.go
index a115a22..df65a91 100644
--- a/service/videoService.go
+++ b/service/videoService.go
@@ -42,8 +42,8 @@ func DelayAllVideo(id, day int) int {
 	return dao.DelayAllVideo(id, day)
 }
 
-func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime string, fileSize int) uint {
-	return dao.CreateVideo(videoPath, videoName, cameraID, authID, human, isDelete, createTime, endTime, fileSize)
+func CreateVideo(videoPath, videoName string, cameraID, authID, human, isDelete int, createTime, endTime, deleteTime string, fileSize int) uint {
+	return dao.CreateVideo(videoPath, videoName, cameraID, authID, human, isDelete, createTime, endTime, deleteTime, fileSize)
 }
 
 func DeleteVideo(id, user int) int {