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

refactor(service): 重构物品、宠物和任务服务，统一使用EX模型和回调函数处理数据操作

Browse Source
This commit is contained in:
1
2025-09-23 15:01:52 +00:00
parent 1ee43e1319
commit 9c5cfa151a
12 changed files with 100 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files

74
modules/blazing/service/item.go
View File

@@ -3,47 +3,17 @@ package service
import (
"blazing/cool"
"blazing/modules/blazing/model"
"encoding/json"
)
func (s *UserService) ItemExec(t func([]model.SingleItemInfo) []model.SingleItemInfo) {
//todo待测试
var player model.Item
m1 := cool.DBM(s.info.Model).Where("player_id", s.userid)
m1.Scan(&player)
var tt []model.SingleItemInfo
json.Unmarshal([]byte(player.Data), &tt)
t(tt)
tmep, _ := json.Marshal(tt)
player.Data = string(tmep)
m1.Save(player)
}
func (s *UserService) ItemCheak() map[uint32]model.SingleItemInfo {
func (s *UserService) Item(t func(map[uint32]model.SingleItemInfo) bool) {
//todo待测试
var player model.Item
var player model.ItemEX
m1 := cool.DBM(s.item.Model).Where("player_id", s.userid)
var rer map[uint32]model.SingleItemInfo
m1.Scan(&player)
json.Unmarshal([]byte(player.Data), &rer)
//return gjson.Parse(player.Data)
return rer
}
func (s *UserService) ItemAdd(t []model.SingleItemInfo) {
//todo待测试
var player model.Item
m1 := cool.DBM(s.item.Model).Where("player_id", s.userid)
var rer map[uint32]model.SingleItemInfo
rer = make(map[uint32]model.SingleItemInfo)
m1.Scan(&player)
json.Unmarshal([]byte(player.Data), &rer)
player.PlayerID = uint64(s.userid)
if len(rer) == 0 {
fff, _ := json.Marshal(rer)
player.Data = string(fff)
err := m1.Scan(&player)
if err != nil {
player.Data = make(map[uint32]model.SingleItemInfo)
_, err := m1.Insert(player)
if err != nil {
panic(err)
@@ -51,24 +21,28 @@ func (s *UserService) ItemAdd(t []model.SingleItemInfo) {
}
for _, v := range t {
tt, ok := rer[v.ItemId]
if ok {
tt.ItemCnt += v.ItemCnt
rer[v.ItemId] = tt
} else {
rer[v.ItemId] = v
}
if !t(player.Data) {
return
}
fff, _ := json.Marshal(rer)
player.Data = string(fff)
_, err := m1.Update(player)
_, err = m1.Update(player)
if err != nil {
panic(err)
}
//return gjson.Parse(player.Data)
}
func (s *UserService) ItemAdd(t []model.SingleItemInfo) {
s.Item(func(rer map[uint32]model.SingleItemInfo) bool {
for _, v := range t {
tt, ok := rer[v.ItemId]
if ok {
tt.ItemCnt += v.ItemCnt
rer[v.ItemId] = tt
} else {
rer[v.ItemId] = v
}
}
return true
})
}

65
modules/blazing/service/pet.go
View File

@@ -3,73 +3,42 @@ package service
import (
"blazing/cool"
"blazing/modules/blazing/model"
"encoding/json"
)
// 获取精灵信息 0是仓库,1是背包,2是放生
func (s *UserService) GetPetList(flag int) (ret []model.PetInfo) {
ret = make([]model.PetInfo, 0)
m := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("in_bag", flag)
var tt []model.Pet
m.Scan(&tt)
for _, v := range tt {
var ret11 model.PetInfo
json.Unmarshal([]byte(v.Data), &ret11)
ret = append(ret, ret11)
func (s *UserService) PetInfo(flag int) []model.PetEX {
var tt []model.PetEX
err := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("in_bag", flag).Scan(&tt)
if err != nil {
return []model.PetEX{}
}
return
return tt
}
func (s *UserService) GetPetInfo(cachetime uint32) (ret model.PetInfo) {
func (s *UserService) PetInfo_One_exec(cachetime uint32, t func(*model.PetEX)) {
m := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("catch_time", cachetime)
var tt model.Pet
var tt model.PetEX
m.Scan(&tt)
json.Unmarshal([]byte(tt.Data), &ret)
return
t(&tt)
m.Update(tt)
}
func (s *UserService) PetExec(ctime uint32, t func(uint32, model.PetInfo) model.PetInfo) {
//todo待测试
var player model.Pet
m1 := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("catch_time", ctime)
m1.Scan(&player)
var tt model.PetInfo
json.Unmarshal([]byte(player.Data), &tt)
t(player.CatchTime, tt)
tmep, _ := json.Marshal(tt)
player.Data = string(tmep)
m1.Save(player)
func (s *UserService) PetInfo_One(cachetime uint32) model.PetEX {
m := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("catch_time", cachetime)
var tt model.PetEX
m.Scan(&tt)
return tt
}
func (s *UserService) PetAdd(y model.PetInfo) {
m1 := cool.DBM(s.pet.Model).Where("player_id", s.userid)
var player model.Pet
var player model.PetEX
player.PlayerID = s.userid
player.CatchTime = y.CatchTime
player.InBag = 0
tmp, _ := json.Marshal(y)
player.Data = string(tmp)
m1.Insert(player)
}
func (s *UserService) PetM(ctime, type1 int) model.PetInfo {
m1 := cool.DBM(s.pet.Model).Where("player_id", s.userid).Where("catch_time", ctime)
var player model.Pet
m1.Scan(&player)
player.InBag = type1
var tt model.PetInfo
json.Unmarshal([]byte(player.Data), &tt)
m1.Update(player)
return tt
}

150
modules/blazing/service/task.go
View File

@@ -35,108 +35,24 @@ func Exec[T cool.UserModel, F any](userid uint32, s *cool.Service, processFunc f
return false
}
// func (s *UserService) InitTask() {
// tt := model.NewTask()
// tt.PlayerID = uint64(s.userid)
// var ggg []model.TaskInfo
// for i := 0; i < 500; i++ {
// ggg = append(ggg, model.TaskInfo{
// //TaskID: (uint32(i)),
// TaskIinnfo: make([]uint32, 0),
// })
// }
// ffgg, _ := json.Marshal(ggg)
// tt.Data = string(ffgg)
// _, err := cool.DBM(s.task.Model).Data(tt).FieldsEx("id").Insert()
// if err != nil {
// panic(err)
// }
// //panic(err)
// }
// 获取任务信息
func (s *UserService) TaskInfo(id uint32) (ret model.TaskInfo, ok bool) {
var gg model.Task
func (s *UserService) Task(id uint32, t func(*model.TaskEX) bool) {
var gg model.TaskEX
m1 := cool.DBM(s.task.Model).
Where("player_id", s.userid).
Where("task_id", id)
m1.Scan(&gg)
if gg.TaskID == 0 {
return ret, false
err := m1.Scan(&gg)
tre := t(&gg)
if !tre { //不需要更新
return
}
json.Unmarshal([]byte(gg.Data), &ret)
return ret, true
}
func (s *UserService) TaskSet(id uint32, ret model.TaskInfo) {
var gg model.Task
tt, _ := json.Marshal(&ret)
gg.Data = string(tt)
//gg.TaskID = id
cool.DBM(s.task.Model).Where("player_id", s.userid).Where("task_id", id).Update(gg)
}
func (s *UserService) TaskReset() {
var gg model.Task
tt, _ := json.Marshal(&model.TaskInfo{})
gg.Data = string(tt)
//gg.TaskID = id
cool.DBM(s.task.Model).Where("player_id", s.userid).Update(gg)
}
func (s *UserService) TaskADD(id uint32, ret model.TaskInfo) {
var gg model.Task
tt, _ := json.Marshal(&ret)
gg.Data = string(tt)
gg.TaskID = id
gg.PlayerID = uint64(s.userid)
_, err := cool.DBM(s.task.Model).Data(gg).Where("player_id", s.userid).Insert()
if err != nil {
panic(err)
m1.Insert(gg)
} else {
m1.Update(gg)
}
}
func (s *UserService) TaskExec(t func([]model.TaskInfo) []model.TaskInfo) (ret bool) {
//待实现检测是否为每日任务
// if isdaliy {
// Exec[*model.Task](s.userid, s.task, func(tt []model.TaskInfo) []model.TaskInfo {
// var ttt = make([]model.TaskInfo, 500)
// //先重置每日
// for k, v := range tt {
// if k > 400 && !IsToday(v.LastResetTime) { //判断是每日任务
// v.Status = 0 //重置+自动接受每日任务
// v.LastResetTime = time.Now()
// }
// ttt = append(ttt, v)
// }
// return ttt
// })
// }
return Exec[*model.Task](s.userid, s.task, t)
// m := cool.DBM(s.task.Model).Where("player_id", s.userid)
// var tt model.Task
// m.Scan(&tt)
// var ttt map[uint32]model.TaskInfo
// json.Unmarshal([]byte(tt.Data), &ttt)
// ret = t(ttt)
// t1, _ := json.Marshal(&ttt)
// tt.Data = string(t1)
// m.Save(&tt) //退出时保存
// return
}
// IsToday 判断给定时间是否是今天
func IsToday(t time.Time) bool {
@@ -148,51 +64,3 @@ func IsToday(t time.Time) bool {
t.Month() == now.Month() &&
t.Day() == now.Day()
}
// /**
// * 完成任务
// */
// func (s *TaskService) CompleteTask(task uint32) bool {
// return s.Exec(func(ttt map[uint32]model.TaskInfo) bool {
// if conditions, ok := ttt[task]; ok {
// conditions.Status = 3
// ttt[task] = conditions
// }
// return false
// })
// }
// /**
// * 校验任务是否已经完成
// */
// func (s *TaskService) CheckTaskCompleted(task uint32) bool {
// return s.Exec(func(ttt map[uint32]model.TaskInfo) bool {
// if conditions, ok := ttt[task]; ok {
// return conditions.Status == 3
// }
// return false
// })
// }
// func (s *UserService) GenTask() [500]byte {
// ret := [500]byte{}
// Exec[*model.Task](s.userid, s.task, func(tt []model.TaskInfo) []model.TaskInfo {
// //先重置每日
// for _, v := range tt {
// ret[v.TaskID] = v.Status
// }
// return tt
// })
// return ret
// }