feat: 养护模板/社区运营/体重趋势/计划日历 + 雪花ID重构 + 文件表与图片上传
后端
- 主键改雪花字符串 ID(pkg/idgen + Base.BeforeCreate),全表外键/JWT/中间件随之调整
- 新增 files 表:/api/upload 按 MD5 去重,返回 {id,url,md5},服务端只收图片
- 头像/记录附图/帖子图改 file_id 关联,读取解析为 URL
- 养护模板(物种×阶段)后台可配 + AI 生成草稿;建档按模板生成任务/计划/提醒
- 社区 AI 运营:虚拟账号池 + 每日定时/手动生成,帖子带 AI 标
- 计划路线图节点带真实日期;首页周历与计划日历同源;新增 day-plan 当日安排
- 体重趋势接口带备注;记录列表分页
小程序
- 公共图片上传 utils/upload.js(仅图片);记录拍照/我的头像/社区发图三处接入
- 首页日历点选查当日任务;记录页体重趋势可点看备注 + 时间轴分页折叠
- 计划页日历点选查当日计划;自定义 tabBar 高度调整
后台(React)
- 新增「养护模板」「社区运营」页;用户管理加机器人筛选
Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
@@ -12,7 +12,7 @@ import (
|
||||
)
|
||||
|
||||
// TogglePlanTask 切换计划明细完成状态(校验归属)
|
||||
func (s *Service) TogglePlanTask(userID, taskID uint) error {
|
||||
func (s *Service) TogglePlanTask(userID, taskID string) error {
|
||||
var pt model.PlanTask
|
||||
if err := s.db.First(&pt, taskID).Error; err != nil {
|
||||
return ErrNotFound
|
||||
@@ -25,7 +25,7 @@ func (s *Service) TogglePlanTask(userID, taskID uint) error {
|
||||
}
|
||||
|
||||
// GetPlan 取宠物的 30 天计划(含明细)
|
||||
func (s *Service) GetPlan(userID, petID uint) (*model.Plan, error) {
|
||||
func (s *Service) GetPlan(userID, petID string) (*model.Plan, error) {
|
||||
if _, err := s.ownedPet(userID, petID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -51,9 +51,34 @@ func (s *Service) GetPlan(userID, petID uint) (*model.Plan, error) {
|
||||
} else {
|
||||
plan.CompletionPct = 0
|
||||
}
|
||||
// 计算每个路线图节点的真实日期(开始日 + Day),供前端展示并与日历对齐
|
||||
if plan.StartDate != nil {
|
||||
for i := range plan.Tasks {
|
||||
plan.Tasks[i].Date = plan.StartDate.AddDate(0, 0, plan.Tasks[i].Day).Format("2006-01-02")
|
||||
}
|
||||
}
|
||||
return &plan, nil
|
||||
}
|
||||
|
||||
// planNodeDates 30 天计划路线图节点在 [start,end) 内的真实日期(开始日 + Day)
|
||||
func (s *Service) planNodeDates(petID string, start, end time.Time) []time.Time {
|
||||
var plan model.Plan
|
||||
if err := s.db.Preload("Tasks").
|
||||
Where("pet_id = ? AND kind = ?", petID, model.PlanThirtyDay).
|
||||
Order("id desc").First(&plan).Error; err != nil || plan.StartDate == nil {
|
||||
return nil
|
||||
}
|
||||
var out []time.Time
|
||||
for _, t := range plan.Tasks {
|
||||
d := plan.StartDate.AddDate(0, 0, t.Day)
|
||||
dd := time.Date(d.Year(), d.Month(), d.Day(), 0, 0, 0, 0, d.Location())
|
||||
if !dd.Before(start) && dd.Before(end) {
|
||||
out = append(out, dd)
|
||||
}
|
||||
}
|
||||
return out
|
||||
}
|
||||
|
||||
// CalendarResult 日历视图
|
||||
type CalendarResult struct {
|
||||
Year int `json:"year"`
|
||||
@@ -63,7 +88,7 @@ type CalendarResult struct {
|
||||
}
|
||||
|
||||
// Calendar 某月有任务/提醒的日期
|
||||
func (s *Service) Calendar(userID, petID uint, year, month int) (*CalendarResult, error) {
|
||||
func (s *Service) Calendar(userID, petID string, year, month int) (*CalendarResult, error) {
|
||||
if _, err := s.ownedPet(userID, petID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
@@ -71,29 +96,15 @@ func (s *Service) Calendar(userID, petID uint, year, month int) (*CalendarResult
|
||||
start := time.Date(year, time.Month(month), 1, 0, 0, 0, 0, loc)
|
||||
end := start.AddDate(0, 1, 0)
|
||||
|
||||
daySet := map[int]struct{}{}
|
||||
|
||||
var taskDates []time.Time
|
||||
s.db.Model(&model.DailyTask{}).
|
||||
Where("pet_id = ? AND task_date >= ? AND task_date < ?", petID, start, end).
|
||||
Pluck("task_date", &taskDates)
|
||||
for _, t := range taskDates {
|
||||
daySet[t.Day()] = struct{}{}
|
||||
}
|
||||
|
||||
var reminders []model.Reminder
|
||||
s.db.Where("pet_id = ? AND next_due_date >= ? AND next_due_date < ?", petID, start, end).Find(&reminders)
|
||||
for _, r := range reminders {
|
||||
if r.NextDueDate != nil {
|
||||
daySet[r.NextDueDate.Day()] = struct{}{}
|
||||
// 与首页周历同源:任务/记录/提醒/计划路线图节点
|
||||
set := s.datesWithActivity(petID, start, end)
|
||||
days := make([]int, 0, len(set))
|
||||
for k := range set {
|
||||
if t, err := time.Parse("2006-01-02", k); err == nil {
|
||||
days = append(days, t.Day())
|
||||
}
|
||||
}
|
||||
|
||||
days := make([]int, 0, len(daySet))
|
||||
for d := range daySet {
|
||||
days = append(days, d)
|
||||
}
|
||||
|
||||
today := 0
|
||||
now := time.Now()
|
||||
if now.Year() == year && int(now.Month()) == month {
|
||||
@@ -102,8 +113,47 @@ func (s *Service) Calendar(userID, petID uint, year, month int) (*CalendarResult
|
||||
return &CalendarResult{Year: year, Month: month, TaskedDays: days, Today: today}, nil
|
||||
}
|
||||
|
||||
// DayPlan 某一天的安排:计划路线图节点 + 今日任务 + 到期提醒
|
||||
func (s *Service) DayPlan(userID, petID, dateStr string) (map[string]any, error) {
|
||||
if _, err := s.ownedPet(userID, petID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
day, err := time.ParseInLocation("2006-01-02", dateStr, time.Now().Location())
|
||||
if err != nil {
|
||||
return nil, ErrNotFound
|
||||
}
|
||||
next := day.AddDate(0, 0, 1)
|
||||
|
||||
nodes := []model.PlanTask{}
|
||||
var plan model.Plan
|
||||
if e := s.db.Preload("Tasks").
|
||||
Where("pet_id = ? AND kind = ?", petID, model.PlanThirtyDay).
|
||||
Order("id desc").First(&plan).Error; e == nil && plan.StartDate != nil {
|
||||
for _, t := range plan.Tasks {
|
||||
d := plan.StartDate.AddDate(0, 0, t.Day)
|
||||
if d.Year() == day.Year() && d.YearDay() == day.YearDay() {
|
||||
t.Date = d.Format("2006-01-02")
|
||||
nodes = append(nodes, t)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var tasks []model.DailyTask
|
||||
s.db.Where("pet_id = ? AND task_date >= ? AND task_date < ?", petID, day, next).Find(&tasks)
|
||||
|
||||
var reminders []model.Reminder
|
||||
s.db.Where("pet_id = ? AND next_due_date >= ? AND next_due_date < ?", petID, day, next).Find(&reminders)
|
||||
|
||||
return map[string]any{
|
||||
"date": dateStr,
|
||||
"plan_nodes": nodes,
|
||||
"tasks": tasks,
|
||||
"reminders": reminders,
|
||||
}, nil
|
||||
}
|
||||
|
||||
// CreateAIPlan 基于用户描述做规则化提取,生成待确认的 AI 计划
|
||||
func (s *Service) CreateAIPlan(userID, petID uint, input string) (*model.Plan, error) {
|
||||
func (s *Service) CreateAIPlan(userID, petID string, input string) (*model.Plan, error) {
|
||||
pet, err := s.ownedPet(userID, petID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
@@ -140,7 +190,7 @@ func (s *Service) CreateAIPlan(userID, petID uint, input string) (*model.Plan, e
|
||||
}
|
||||
|
||||
// ApplyAIPlan 确认并应用 AI 计划
|
||||
func (s *Service) ApplyAIPlan(userID, planID uint) (*model.Plan, error) {
|
||||
func (s *Service) ApplyAIPlan(userID, planID string) (*model.Plan, error) {
|
||||
var plan model.Plan
|
||||
if err := s.db.Where("id = ? AND user_id = ?", planID, userID).First(&plan).Error; err != nil {
|
||||
if err == gorm.ErrRecordNotFound {
|
||||
|
||||
Reference in New Issue
Block a user