admin/bl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

```
All checks were successful
ci/woodpecker/push/my-first-workflow Pipeline was successful
Details

Browse Source 
feat(fight): 使用专用函数构建战斗结束数据包

为战斗结束消息创建专用的构建函数，
统一处理战斗结束信息的数据包构建逻辑，
提高代码的一致性和可维护性。

fix(config): 优化数据库查询语句以提高性能

将数组包含操作（@>）替换为 ANY 操作符，
在 Egg、MapPit、PetFusion 等服务中使用更高效
的查询方式
This commit is contained in:
昔念
2026-04-12 13:27:39 +08:00
parent 174830731c
commit f9543a5156
9 changed files with 65 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
modules/player/service/done.go
View File

@@ -3,9 +3,10 @@ package service
import (
"blazing/cool"
"blazing/modules/player/model"
"fmt"
"strings"
"github.com/gogf/gf/v2/frame/g"
"github.com/gogf/gf/v2/util/gconv"
)
type DoneService struct {
@@ -68,10 +69,10 @@ func (s *DoneService) update(ptye model.EnumMilestone, args []uint32, results []
return
}
ar := gconv.String(args)
if t, _ := s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
whereArgs, whereParams := buildJSONBArrayAnyCondition("args", args)
if t, _ := s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(whereArgs, whereParams...).
Wheref(`jsonb_typeof(args) = ?`, "array").Exist(); t {
s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, ar).
s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(whereArgs, whereParams...).
Wheref(`jsonb_typeof(args) = ?`, "array").Data(
g.Map{
"results": results,
@@ -94,12 +95,31 @@ func (s *DoneService) update(ptye model.EnumMilestone, args []uint32, results []
func (s *DoneService) get(ptye model.EnumMilestone, args []uint32) *model.Milestone {
var Barges *model.Milestone
s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(`args @> ?::jsonb`, args).
whereArgs, whereParams := buildJSONBArrayAnyCondition("args", args)
s.dbm_fix(s.Model).Where("done_type", ptye).Wheref(whereArgs, whereParams...).
Wheref(`jsonb_typeof(args) = ?`, "array").Scan(&Barges)
return Barges
}
func buildJSONBArrayAnyCondition(column string, values []uint32) (string, []any) {
if len(values) == 0 {
return "FALSE", nil
}
clauses := make([]string, 0, len(values)+1)
params := make([]any, 0, len(values)+1)
for _, value := range values {
clauses = append(clauses, fmt.Sprintf(`CAST(? AS text) = ANY(ARRAY(SELECT jsonb_array_elements_text(%s)))`, column))
params = append(params, value)
}
clauses = append(clauses, fmt.Sprintf(`jsonb_array_length(%s) = ?`, column))
params = append(params, len(values))
return strings.Join(clauses, " AND "), params
}
func (s *DoneService) PetBarge(start, end uint32) []model.Milestone {
var Barges []model.Milestone

2
modules/player/service/title.go
View File

@@ -28,7 +28,7 @@ func (s *TitleService) Get() []uint32 {
func (s *TitleService) Can(id uint32) bool {
m1 := s.dbm(s.Model)
ok, _ := m1.Wheref(`available_title @> ?::jsonb`, id).Exist()
ok, _ := m1.Wheref(`CAST(? AS text) = ANY(ARRAY(SELECT jsonb_array_elements_text(available_title)))`, id).Exist()
return ok
}