From 07d8e6c4898654652753b65cdb3d8a6ae02b3ec0 Mon Sep 17 00:00:00 2001 From: junleea <354425203@qq.com> Date: Sat, 6 Jul 2024 20:45:22 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E4=B8=8E=E9=A1=B9=E7=9B=AE=E4=B8=8D=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dao/cid.go | 5 +++++ handler/cid.go | 15 ++++++++++++--- 2 files changed, 17 insertions(+), 3 deletions(-) diff --git a/dao/cid.go b/dao/cid.go index ef30c12..a14a7b2 100644 --- a/dao/cid.go +++ b/dao/cid.go @@ -95,6 +95,11 @@ func FindRunLogByID(auth_id, cid_id int) CIDRunLog { DB.Debug().Where("cid_id = ? and auth_id = ?", cid_id, auth_id).First(&cidRunLog) return cidRunLog } +func FindRunLogByCIDLogID(id, auth_id int) []CIDRunLog { + var cidRunLogs []CIDRunLog + DB.Debug().Where("id = ? and auth_id = ?", id, auth_id).Order("created_at desc").Find(&cidRunLogs) + return cidRunLogs +} func FindCIDByIDAndToken(id int, token string) CID { var cid CID diff --git a/handler/cid.go b/handler/cid.go index 16a272b..2707f2e 100644 --- a/handler/cid.go +++ b/handler/cid.go @@ -25,6 +25,10 @@ type CIDRunReq struct { ID int `json:"id" form:"id"` } +type CIDLogReq struct { + ID int `json:"id" form:"id"` +} + type CIDUpdateReq struct { ID int `json:"id" form:"id"` Name string `json:"name" form:"name"` @@ -163,7 +167,7 @@ func GetCIDLog(c *gin.Context) { // 获取用户ID id, _ := c.Get("id") authID := int(id.(float64)) - cidLogs := dao.FindRunLogByID(req.ID, authID) + cidLogs := dao.FindRunLogByCIDLogID(req.ID, authID) c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": cidLogs}) } else { c.JSON(200, gin.H{"error": err.Error(), "code": proto.ParameterError, "message": "failed"}) @@ -174,8 +178,13 @@ func GetCIDLogList(c *gin.Context) { // 获取用户ID id, _ := c.Get("id") authID := int(id.(float64)) - cidLogs := dao.FindRunLogByAuthID(authID) - c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": cidLogs}) + var req CIDLogReq + if err := c.ShouldBind(&req); err == nil { + cidLogs := dao.FindRunLogByID(authID, req.ID) + c.JSON(200, gin.H{"code": proto.SuccessCode, "message": "success", "data": cidLogs}) + } else { + c.JSON(200, gin.H{"error": err.Error(), "code": proto.ParameterError, "message": "failed"}) + } } func CIDCallback(c *gin.Context) {