ygxbnet/dypid
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactor(data): 优化数据读取和删除逻辑
Some checks failed
构建上传工具 / build-tool (push) Failing after 2s
Details
部署开发环境 / deploy-dev (push) Failing after 2s
Details

Browse Source
This commit is contained in:
YGXB_net
2025-09-16 12:49:32 +08:00
parent 69d4c5d038
commit 795a9186a9
2 changed files with 16 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
controller/dataController.go
View File

@@ -12,6 +12,7 @@ import (
) )
func ReadDataHandler(c *gin.Context) { func ReadDataHandler(c *gin.Context) {
//解析输入数据
input := struct { input := struct {
Token string `form:"token" binding:"required"` Token string `form:"token" binding:"required"`
}{} }{}
@@ -20,12 +21,11 @@ func ReadDataHandler(c *gin.Context) {
return return
} }
lLen := global.RDB.LLen(global.RCtx, fmt.Sprintf("list:%s", input.Token)) retData := global.RDB.LPop(global.RCtx, fmt.Sprintf("list:%s", input.Token)).Val()
if lLen.Val() == 0 { if retData == "null" {
c.JSON(http.StatusOK, gin.H{"result": "数据库没有数据"}) c.JSON(http.StatusOK, gin.H{"result": "数据库没有数据"})
return return
} }
retData := global.RDB.BLPop(global.RCtx, 0, fmt.Sprintf("list:%s", input.Token)).Val()[1]
c.String(http.StatusOK, retData) c.String(http.StatusOK, retData)
} }

22
controller/tokenController.go
View File

@@ -132,7 +132,6 @@ func DeleteTokenInfoHandler(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"error": "Token不存在" + err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": "Token不存在" + err.Error()})
return return
} }
dedupObject, err := db.GetDedupObject(input.Token) dedupObject, err := db.GetDedupObject(input.Token)
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
@@ -145,13 +144,14 @@ func DeleteTokenInfoHandler(c *gin.Context) {
case "all": case "all":
keys := global.RDB.Keys(global.RCtx, "dedup:"+input.Token+":*").Val() keys := global.RDB.Keys(global.RCtx, "dedup:"+input.Token+":*").Val()
global.RDB.Del(global.RCtx, keys...) global.RDB.Del(global.RCtx, keys...)
global.RDB.Del(global.RCtx, "delete-list:"+input.Token)
default: default:
i, err := strconv.Atoi(input.DedupBF) i, err := strconv.Atoi(input.DedupBF)
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "dedup_bf设置错误 " + err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": "dedup_bf设置错误 " + err.Error()})
return return
} }
result := global.RDB.LRange(global.RCtx, "delete-list:"+input.Token, 1, int64(i)).Val() result := global.RDB.LRange(global.RCtx, "delete-list:"+input.Token, int64(-i), -1).Val()
_, err = global.RDB.TxPipelined(global.RCtx, func(pipe redis.Pipeliner) error { _, err = global.RDB.TxPipelined(global.RCtx, func(pipe redis.Pipeliner) error {
for _, s := range result { for _, s := range result {
pipe.CFDel(global.RCtx, "dedup:"+input.Token+":"+dedupObject, s) pipe.CFDel(global.RCtx, "dedup:"+input.Token+":"+dedupObject, s)
@@ -162,22 +162,25 @@ func DeleteTokenInfoHandler(c *gin.Context) {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return return
} }
global.RDB.LTrim(global.RCtx, "delete-list:"+input.Token, int64(i), -1) global.RDB.LTrim(global.RCtx, "delete-list:"+input.Token, 0, int64(-i-1))
} }
//删除原始数据
switch input.CacheList { switch input.CacheList {
case "": case "":
case "all": case "all":
global.RDB.Del(global.RCtx, "list:"+input.Token) global.RDB.Del(global.RCtx, "list:"+input.Token)
global.RDB.Del(global.RCtx, "delete-list:"+input.Token)
default: default:
i, err := strconv.Atoi(input.CacheList) i, err := strconv.Atoi(input.CacheList)
if err != nil { if err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": "cache_list设置错误 " + err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": "cache_list设置错误 " + err.Error()})
return return
} }
global.RDB.LTrim(global.RCtx, "list:"+input.Token, 1, int64(-i))
global.RDB.LTrim(global.RCtx, "list:"+input.Token, 0, int64(-i-1))
} }
//TODO
//删除去重参考值和原始数据
switch input.BothNumber { switch input.BothNumber {
case "": case "":
default: default:
@@ -186,19 +189,20 @@ func DeleteTokenInfoHandler(c *gin.Context) {
c.JSON(http.StatusBadRequest, gin.H{"error": "both_number设置错误 " + err.Error()}) c.JSON(http.StatusBadRequest, gin.H{"error": "both_number设置错误 " + err.Error()})
return return
} }
result := global.RDB.LRange(global.RCtx, "delete-list:"+input.Token, 1, int64(i)).Val()
result := global.RDB.LRange(global.RCtx, "delete-list:"+input.Token, int64(-i), -1).Val()
_, err = global.RDB.TxPipelined(global.RCtx, func(pipe redis.Pipeliner) error { _, err = global.RDB.TxPipelined(global.RCtx, func(pipe redis.Pipeliner) error {
for _, s := range result { for _, s := range result {
pipe.CFDel(global.RCtx, "dedup:"+input.Token+":"+dedupObject, s) pipe.CFDel(global.RCtx, "dedup:"+input.Token+":"+dedupObject, s)
} }
pipe.LTrim(global.RCtx, "delete-list:"+input.Token, 0, int64(-i-1))
pipe.LTrim(global.RCtx, "list:"+input.Token, 0, int64(-i-1))
return nil return nil
}) })
if err != nil { if err != nil {
c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()}) c.JSON(http.StatusInternalServerError, gin.H{"error": err.Error()})
return return
} }
global.RDB.LTrim(global.RCtx, "delete-list:"+input.Token, int64(i), -1)
global.RDB.LTrim(global.RCtx, "list:"+input.Token, int64(i), -1)
} }
//输出信息 //输出信息