Refactor video handling and integrate new services

- Removed legacy video handling code and models to streamline the codebase. - Updated main.go to include new services for removing watermarks and smoke logging. - Enhanced route registration to accommodate new handlers for watermark removal and smoke logging. - Improved database migration to include new models for watermark processing.
2025-12-31 02:51:38 +00:00
parent d23b253609
commit bbc2f5f1d5
11 changed files with 571 additions and 28 deletions
@@ -0,0 +1,231 @@
+package handler
+
+import (
+	"errors"
+	"net/http"
+	"strconv"
+	"time"
+
+	"github.com/gin-gonic/gin"
+
+	"wx_service/internal/middleware"
+	"wx_service/internal/model"
+	smokeservice "wx_service/internal/smoke/service"
+)
+
+type SmokeHandler struct {
+	smokeLogService *smokeservice.SmokeLogService
+}
+
+func NewSmokeHandler(smokeLogService *smokeservice.SmokeLogService) *SmokeHandler {
+	return &SmokeHandler{smokeLogService: smokeLogService}
+}
+
+// dateLayout 用于解析前端传入的日期字符串（例如：2025-12-31）
+const dateLayout = "2006-01-02"
+
+type createSmokeLogRequest struct {
+	// 只记录“日期”即可；如果不传，后端会按当天处理
+	SmokeTime string `json:"smoke_time"`
+	Remark    string `json:"remark"`
+	Level     int64  `json:"level"`
+	Num       int    `json:"num"`
+}
+
+func (h *SmokeHandler) Create(c *gin.Context) {
+	user, ok := middleware.CurrentUser(c)
+	if !ok {
+		c.JSON(http.StatusUnauthorized, model.Error(http.StatusUnauthorized, "未登录或登录已过期"))
+		return
+	}
+
+	var req createSmokeLogRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "请求参数错误"))
+		return
+	}
+
+	var smokeTime *time.Time
+	if req.SmokeTime != "" {
+		parsed, err := time.ParseInLocation(dateLayout, req.SmokeTime, time.Local)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "smoke_time 格式错误，应为 YYYY-MM-DD"))
+			return
+		}
+		smokeTime = &parsed
+	}
+
+	record, err := h.smokeLogService.Create(c.Request.Context(), int(user.ID), smokeservice.CreateSmokeLogRequest{
+		SmokeTime: smokeTime,
+		Remark:    req.Remark,
+		Level:     req.Level,
+		Num:       req.Num,
+	})
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, model.Error(http.StatusInternalServerError, "创建记录失败，请稍后重试"))
+		return
+	}
+
+	c.JSON(http.StatusOK, model.Success(record))
+}
+
+func (h *SmokeHandler) Get(c *gin.Context) {
+	user, ok := middleware.CurrentUser(c)
+	if !ok {
+		c.JSON(http.StatusUnauthorized, model.Error(http.StatusUnauthorized, "未登录或登录已过期"))
+		return
+	}
+
+	id, err := strconv.Atoi(c.Param("id"))
+	if err != nil || id <= 0 {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "id 参数错误"))
+		return
+	}
+
+	record, err := h.smokeLogService.GetByID(c.Request.Context(), int(user.ID), id)
+	if err != nil {
+		if errors.Is(err, smokeservice.ErrSmokeLogNotFound) {
+			c.JSON(http.StatusNotFound, model.Error(http.StatusNotFound, "记录不存在"))
+			return
+		}
+		c.JSON(http.StatusInternalServerError, model.Error(http.StatusInternalServerError, "查询失败，请稍后重试"))
+		return
+	}
+
+	c.JSON(http.StatusOK, model.Success(record))
+}
+
+func (h *SmokeHandler) List(c *gin.Context) {
+	user, ok := middleware.CurrentUser(c)
+	if !ok {
+		c.JSON(http.StatusUnauthorized, model.Error(http.StatusUnauthorized, "未登录或登录已过期"))
+		return
+	}
+
+	page, _ := strconv.Atoi(c.DefaultQuery("page", "1"))
+	pageSize, _ := strconv.Atoi(c.DefaultQuery("page_size", "20"))
+
+	var start *time.Time
+	if v := c.Query("start"); v != "" {
+		parsed, err := time.ParseInLocation(dateLayout, v, time.Local)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "start 格式错误，应为 YYYY-MM-DD"))
+			return
+		}
+		start = &parsed
+	}
+	var end *time.Time
+	if v := c.Query("end"); v != "" {
+		parsed, err := time.ParseInLocation(dateLayout, v, time.Local)
+		if err != nil {
+			c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "end 格式错误，应为 YYYY-MM-DD"))
+			return
+		}
+		end = &parsed
+	}
+
+	result, err := h.smokeLogService.List(c.Request.Context(), int(user.ID), smokeservice.ListSmokeLogsRequest{
+		Page:     page,
+		PageSize: pageSize,
+		Start:    start,
+		End:      end,
+	})
+	if err != nil {
+		c.JSON(http.StatusInternalServerError, model.Error(http.StatusInternalServerError, "查询列表失败，请稍后重试"))
+		return
+	}
+
+	c.JSON(http.StatusOK, model.Success(gin.H{
+		"items":     result.Items,
+		"total":     result.Total,
+		"page":      result.Page,
+		"page_size": result.PageSize,
+	}))
+}
+
+type updateSmokeLogRequest struct {
+	SmokeTime *string `json:"smoke_time"`
+	Remark    *string `json:"remark"`
+	Level     *int64  `json:"level"`
+	Num       *int    `json:"num"`
+}
+
+func (h *SmokeHandler) Update(c *gin.Context) {
+	user, ok := middleware.CurrentUser(c)
+	if !ok {
+		c.JSON(http.StatusUnauthorized, model.Error(http.StatusUnauthorized, "未登录或登录已过期"))
+		return
+	}
+
+	id, err := strconv.Atoi(c.Param("id"))
+	if err != nil || id <= 0 {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "id 参数错误"))
+		return
+	}
+
+	var req updateSmokeLogRequest
+	if err := c.ShouldBindJSON(&req); err != nil {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "请求参数错误"))
+		return
+	}
+
+	smokeTimeProvided := req.SmokeTime != nil
+	var smokeTime *time.Time
+	if req.SmokeTime != nil {
+		if *req.SmokeTime == "" {
+			smokeTime = nil
+		} else {
+			parsed, err := time.ParseInLocation(dateLayout, *req.SmokeTime, time.Local)
+			if err != nil {
+				c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "smoke_time 格式错误，应为 YYYY-MM-DD"))
+				return
+			}
+			smokeTime = &parsed
+		}
+	}
+
+	record, err := h.smokeLogService.Update(c.Request.Context(), int(user.ID), id, smokeservice.UpdateSmokeLogRequest{
+		SmokeTimeProvided: smokeTimeProvided,
+		SmokeTime:         smokeTime,
+		Remark:            req.Remark,
+		Level:             req.Level,
+		Num:               req.Num,
+	})
+	if err != nil {
+		if errors.Is(err, smokeservice.ErrSmokeLogNotFound) {
+			c.JSON(http.StatusNotFound, model.Error(http.StatusNotFound, "记录不存在"))
+			return
+		}
+		c.JSON(http.StatusInternalServerError, model.Error(http.StatusInternalServerError, "更新失败，请稍后重试"))
+		return
+	}
+
+	c.JSON(http.StatusOK, model.Success(record))
+}
+
+func (h *SmokeHandler) Delete(c *gin.Context) {
+	user, ok := middleware.CurrentUser(c)
+	if !ok {
+		c.JSON(http.StatusUnauthorized, model.Error(http.StatusUnauthorized, "未登录或登录已过期"))
+		return
+	}
+
+	id, err := strconv.Atoi(c.Param("id"))
+	if err != nil || id <= 0 {
+		c.JSON(http.StatusBadRequest, model.Error(http.StatusBadRequest, "id 参数错误"))
+		return
+	}
+
+	if err := h.smokeLogService.Delete(c.Request.Context(), int(user.ID), id); err != nil {
+		if errors.Is(err, smokeservice.ErrSmokeLogNotFound) {
+			c.JSON(http.StatusNotFound, model.Error(http.StatusNotFound, "记录不存在"))
+			return
+		}
+		c.JSON(http.StatusInternalServerError, model.Error(http.StatusInternalServerError, "删除失败，请稍后重试"))
+		return
+	}
+
+	c.JSON(http.StatusOK, model.Success(gin.H{
+		"deleted": true,
+	}))
+}
@@ -0,0 +1,30 @@
+package model
+
+import "time"
+
+// SmokeLog 对应数据库表 fa_smoke_log（戒烟/抽烟记录）。
+//
+// 注意：这个表的字段命名来自旧系统（createtime/updatetime/deletetime 为秒级时间戳），
+// 因此这里不使用 gorm.Model 的 created_at/updated_at/deleted_at。
+type SmokeLog struct {
+	// 复合主键（id, uid），其中 id 自增。
+	ID  int `gorm:"column:id;primaryKey;autoIncrement" json:"id"`
+	UID int `gorm:"column:uid;primaryKey" json:"-"`
+
+	// smoke_time 在库里是 date 类型（只包含日期，不包含时分秒）。
+	SmokeTime *time.Time `gorm:"column:smoke_time;type:date" json:"smoke_time,omitempty"`
+
+	Remark string `gorm:"column:remark;type:text" json:"remark,omitempty"`
+
+	// createtime/updatetime/deletetime：秒级 Unix 时间戳（与 gorm 默认字段不同）
+	CreateTime *int64 `gorm:"column:createtime" json:"createtime,omitempty"`
+	UpdateTime *int64 `gorm:"column:updatetime" json:"updatetime,omitempty"`
+	DeleteTime *int64 `gorm:"column:deletetime" json:"deletetime,omitempty"`
+
+	Level int64 `gorm:"column:level;default:1" json:"level"`
+	Num   int   `gorm:"column:num;default:1" json:"num"`
+}
+
+func (SmokeLog) TableName() string {
+	return "fa_smoke_log"
+}
@@ -0,0 +1,217 @@
+package service
+
+import (
+	"context"
+	"errors"
+	"fmt"
+	"time"
+
+	"gorm.io/gorm"
+
+	smokemodel "wx_service/internal/smoke/model"
+)
+
+var (
+	ErrSmokeLogNotFound = errors.New("smoke log not found")
+)
+
+type SmokeLogService struct {
+	db *gorm.DB
+}
+
+func NewSmokeLogService(db *gorm.DB) *SmokeLogService {
+	return &SmokeLogService{db: db}
+}
+
+type CreateSmokeLogRequest struct {
+	SmokeTime *time.Time
+	Remark    string
+	Level     int64
+	Num       int
+}
+
+func (s *SmokeLogService) Create(ctx context.Context, uid int, req CreateSmokeLogRequest) (*smokemodel.SmokeLog, error) {
+	now := time.Now().Unix()
+	createTime := now
+	updateTime := now
+
+	level := req.Level
+	if level <= 0 {
+		level = 1
+	}
+	num := req.Num
+	if num <= 0 {
+		num = 1
+	}
+
+	smokeTime := req.SmokeTime
+	if smokeTime == nil {
+		today := time.Now()
+		startOfDay := time.Date(today.Year(), today.Month(), today.Day(), 0, 0, 0, 0, today.Location())
+		smokeTime = &startOfDay
+	}
+
+	record := smokemodel.SmokeLog{
+		UID:        uid,
+		SmokeTime:  smokeTime,
+		Remark:     req.Remark,
+		CreateTime: &createTime,
+		UpdateTime: &updateTime,
+		Level:      level,
+		Num:        num,
+	}
+
+	if err := s.db.WithContext(ctx).Create(&record).Error; err != nil {
+		return nil, fmt.Errorf("create smoke log: %w", err)
+	}
+	return &record, nil
+}
+
+func (s *SmokeLogService) GetByID(ctx context.Context, uid int, id int) (*smokemodel.SmokeLog, error) {
+	var record smokemodel.SmokeLog
+	err := s.db.WithContext(ctx).
+		Where("id = ? AND uid = ? AND (deletetime IS NULL OR deletetime = 0)", id, uid).
+		First(&record).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			return nil, ErrSmokeLogNotFound
+		}
+		return nil, fmt.Errorf("load smoke log: %w", err)
+	}
+	return &record, nil
+}
+
+type ListSmokeLogsRequest struct {
+	Page     int
+	PageSize int
+	Start    *time.Time
+	End      *time.Time
+}
+
+type ListSmokeLogsResult struct {
+	Items    []smokemodel.SmokeLog
+	Total    int64
+	Page     int
+	PageSize int
+}
+
+func (s *SmokeLogService) List(ctx context.Context, uid int, req ListSmokeLogsRequest) (ListSmokeLogsResult, error) {
+	page := req.Page
+	if page <= 0 {
+		page = 1
+	}
+	pageSize := req.PageSize
+	if pageSize <= 0 {
+		pageSize = 20
+	}
+	if pageSize > 200 {
+		pageSize = 200
+	}
+
+	tx := s.db.WithContext(ctx).Model(&smokemodel.SmokeLog{}).
+		Where("uid = ? AND (deletetime IS NULL OR deletetime = 0)", uid)
+
+	if req.Start != nil {
+		tx = tx.Where("smoke_time >= ?", req.Start.Format("2006-01-02"))
+	}
+	if req.End != nil {
+		tx = tx.Where("smoke_time <= ?", req.End.Format("2006-01-02"))
+	}
+
+	var total int64
+	if err := tx.Count(&total).Error; err != nil {
+		return ListSmokeLogsResult{}, fmt.Errorf("count smoke logs: %w", err)
+	}
+
+	var items []smokemodel.SmokeLog
+	offset := (page - 1) * pageSize
+	if err := tx.
+		Order("smoke_time DESC").
+		Order("id DESC").
+		Limit(pageSize).
+		Offset(offset).
+		Find(&items).Error; err != nil {
+		return ListSmokeLogsResult{}, fmt.Errorf("list smoke logs: %w", err)
+	}
+
+	return ListSmokeLogsResult{
+		Items:    items,
+		Total:    total,
+		Page:     page,
+		PageSize: pageSize,
+	}, nil
+}
+
+type UpdateSmokeLogRequest struct {
+	// SmokeTimeProvided 用于区分：
+	// - false：前端没传 smoke_time（不修改）
+	// - true：前端传了 smoke_time（可以设置为具体日期，也可以清空为 NULL）
+	SmokeTimeProvided bool
+	SmokeTime         *time.Time
+	Remark            *string
+	Level             *int64
+	Num               *int
+}
+
+func (s *SmokeLogService) Update(ctx context.Context, uid int, id int, req UpdateSmokeLogRequest) (*smokemodel.SmokeLog, error) {
+	record, err := s.GetByID(ctx, uid, id)
+	if err != nil {
+		return nil, err
+	}
+
+	updates := map[string]interface{}{}
+	if req.SmokeTimeProvided {
+		updates["smoke_time"] = req.SmokeTime
+	}
+	if req.Remark != nil {
+		updates["remark"] = *req.Remark
+	}
+	if req.Level != nil {
+		if *req.Level <= 0 {
+			updates["level"] = int64(1)
+		} else {
+			updates["level"] = *req.Level
+		}
+	}
+	if req.Num != nil {
+		if *req.Num <= 0 {
+			updates["num"] = 1
+		} else {
+			updates["num"] = *req.Num
+		}
+	}
+
+	now := time.Now().Unix()
+	updates["updatetime"] = now
+
+	if len(updates) == 1 {
+		return record, nil
+	}
+
+	if err := s.db.WithContext(ctx).
+		Model(&smokemodel.SmokeLog{}).
+		Where("id = ? AND uid = ?", id, uid).
+		Updates(updates).Error; err != nil {
+		return nil, fmt.Errorf("update smoke log: %w", err)
+	}
+
+	return s.GetByID(ctx, uid, id)
+}
+
+func (s *SmokeLogService) Delete(ctx context.Context, uid int, id int) error {
+	now := time.Now().Unix()
+	result := s.db.WithContext(ctx).
+		Model(&smokemodel.SmokeLog{}).
+		Where("id = ? AND uid = ? AND (deletetime IS NULL OR deletetime = 0)", id, uid).
+		Updates(map[string]interface{}{
+			"deletetime": now,
+			"updatetime": now,
+		})
+	if result.Error != nil {
+		return fmt.Errorf("delete smoke log: %w", result.Error)
+	}
+	if result.RowsAffected == 0 {
+		return ErrSmokeLogNotFound
+	}
+	return nil
+}