Hass/Message-Push-Nest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: adjust templata table name

Browse Source
This commit is contained in:
engigu
2025-12-06 12:37:36 +08:00
parent 148e67dc19
commit f4780c9c6c
6 changed files with 53 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
migrate/migrate.go
+1 -1
View File
@@ -68,7 +68,7 @@ func Setup() {
&models.CronMessages{},
&models.HostedMessage{},
&models.LoginLog{},
&models.MessageTemplate{},
&models.Template{},
}
for _, table := range tables {
models/message_template.go
+23 -23
View File
@@ -11,8 +11,8 @@ func GenerateTemplateUniqueID() string {
return fmt.Sprintf("TP%s", newUUID)
}
// MessageTemplate 消息模板
type MessageTemplate struct {
// Template 消息模板
type Template struct {
UUIDModel
Name string `json:"name" gorm:"type:varchar(200);not null;index" binding:"required"`
@@ -36,7 +36,7 @@ type MessageTemplate struct {
}
// Add 添加消息模板
func (t *MessageTemplate) Add() error {
func (t *Template) Add() error {
if err := db.Create(&t).Error; err != nil {
return err
}
@@ -44,23 +44,23 @@ func (t *MessageTemplate) Add() error {
}
// Update 更新消息模板
func (t *MessageTemplate) Update() error {
if err := db.Model(&MessageTemplate{}).Where("id = ?", t.ID).Updates(t).Error; err != nil {
func (t *Template) Update() error {
if err := db.Model(&Template{}).Where("id = ?", t.ID).Updates(t).Error; err != nil {
return err
}
return nil
}
// Delete 删除消息模板
func (t *MessageTemplate) Delete() error {
if err := db.Where("id = ?", t.ID).Delete(&MessageTemplate{}).Error; err != nil {
func (t *Template) Delete() error {
if err := db.Where("id = ?", t.ID).Delete(&Template{}).Error; err != nil {
return err
}
return nil
}
// MessageTemplateResult 消息模板查询结果
type MessageTemplateResult struct {
// TemplateResult 消息模板查询结果
type TemplateResult struct {
ID string `json:"id"`
Name string `json:"name"`
Description string `json:"description"`
@@ -78,10 +78,10 @@ type MessageTemplateResult struct {
ModifiedOn util.Time `json:"modified_on"`
}
// GetMessageTemplates 获取消息模板列表
func GetMessageTemplates(pageNum int, pageSize int, text string, maps map[string]interface{}) ([]MessageTemplateResult, error) {
var datas []MessageTemplateResult
templateT := GetSchema(MessageTemplate{})
// GetTemplates 获取消息模板列表
func GetTemplates(pageNum int, pageSize int, text string, maps map[string]interface{}) ([]TemplateResult, error) {
var datas []TemplateResult
templateT := GetSchema(Template{})
query := db.Table(templateT)
query = query.Where(maps)
@@ -102,10 +102,10 @@ func GetMessageTemplates(pageNum int, pageSize int, text string, maps map[string
return datas, nil
}
// GetMessageTemplatesTotal 获取消息模板总数
func GetMessageTemplatesTotal(text string, maps map[string]interface{}) (int64, error) {
// GetTemplatesTotal 获取消息模板总数
func GetTemplatesTotal(text string, maps map[string]interface{}) (int64, error) {
var total int64
templateT := GetSchema(MessageTemplate{})
templateT := GetSchema(Template{})
query := db.Table(templateT)
query = query.Where(maps)
@@ -120,10 +120,10 @@ func GetMessageTemplatesTotal(text string, maps map[string]interface{}) (int64,
return total, nil
}
// GetMessageTemplateByID 根据ID获取消息模板
func GetMessageTemplateByID(id string) (*MessageTemplateResult, error) {
var data MessageTemplateResult
templateT := GetSchema(MessageTemplate{})
// GetTemplateByID 根据ID获取消息模板
func GetTemplateByID(id string) (*TemplateResult, error) {
var data TemplateResult
templateT := GetSchema(Template{})
err := db.Table(templateT).Where("id = ?", id).First(&data).Error
if err != nil {
@@ -133,9 +133,9 @@ func GetMessageTemplateByID(id string) (*MessageTemplateResult, error) {
return &data, nil
}
// ExistMessageTemplateByID 检查模板是否存在
func ExistMessageTemplateByID(id string) (bool, error) {
var template MessageTemplate
// ExistTemplateByID 检查模板是否存在
func ExistTemplateByID(id string) (bool, error) {
var template Template
err := db.Select("id").Where("id = ?", id).First(&template).Error
if err != nil {
return false, err
routers/api/v1/message_template.go
+7 -7
View File
@@ -19,7 +19,7 @@ func GetMessageTemplateList(c *gin.Context) {
status := c.Query("status")
offset, limit := util.GetPageSize(c)
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
Text: text,
Status: status,
PageNum: offset,
@@ -49,7 +49,7 @@ func GetMessageTemplate(c *gin.Context) {
appG := app.Gin{C: c}
id := c.Query("id")
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
ID: id,
}
@@ -104,7 +104,7 @@ func AddMessageTemplate(c *gin.Context) {
req.Status = "enabled"
}
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
Name: req.Name,
Description: req.Description,
TextTemplate: req.TextTemplate,
@@ -153,7 +153,7 @@ func EditMessageTemplate(c *gin.Context) {
return
}
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
ID: req.ID,
}
@@ -200,7 +200,7 @@ func DeleteMessageTemplate(c *gin.Context) {
return
}
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
ID: req.ID,
}
@@ -237,7 +237,7 @@ func PreviewMessageTemplate(c *gin.Context) {
return
}
templateService := message_template_service.MessageTemplateService{
templateService := message_template_service.TemplateService{
ID: req.ID,
}
@@ -272,7 +272,7 @@ func GetTemplateWithIns(c *gin.Context) {
}
// 获取模板信息
template, err := models.GetMessageTemplateByID(id)
template, err := models.GetTemplateByID(id)
if err != nil {
appG.CResponse(http.StatusBadRequest, "获取模板信息失败！", nil)
return
routers/api/v2/send_message.go
+1 -1
View File
@@ -41,7 +41,7 @@ func DoSendMessageByTemplate(c *gin.Context) {
}
// 获取模板
template, err := models.GetMessageTemplateByID(templateID)
template, err := models.GetTemplateByID(templateID)
if err != nil {
appG.CResponse(http.StatusBadRequest, fmt.Sprintf("模板不存在：%s", err), nil)
return
service/message_template_service/message_template.go
+19 -19
View File
@@ -7,7 +7,7 @@ import (
"strings"
)
type MessageTemplateService struct {
type TemplateService struct {
ID string
Name string
Description string
@@ -33,13 +33,13 @@ type Placeholder struct {
}
// Add 添加消息模板
func (s *MessageTemplateService) Add() error {
func (s *TemplateService) Add() error {
if err := s.validatePlaceholders(); err != nil {
return err
}
newUUID := models.GenerateTemplateUniqueID()
model := models.MessageTemplate{
model := models.Template{
UUIDModel: models.UUIDModel{
ID: newUUID,
},
@@ -59,12 +59,12 @@ func (s *MessageTemplateService) Add() error {
}
// Update 更新消息模板
func (s *MessageTemplateService) Update() error {
func (s *TemplateService) Update() error {
if err := s.validatePlaceholders(); err != nil {
return err
}
model := models.MessageTemplate{
model := models.Template{
UUIDModel: models.UUIDModel{
ID: s.ID,
},
@@ -84,8 +84,8 @@ func (s *MessageTemplateService) Update() error {
}
// Delete 删除消息模板
func (s *MessageTemplateService) Delete() error {
model := models.MessageTemplate{
func (s *TemplateService) Delete() error {
model := models.Template{
UUIDModel: models.UUIDModel{
ID: s.ID,
},
@@ -94,13 +94,13 @@ func (s *MessageTemplateService) Delete() error {
}
// Get 获取单个消息模板
func (s *MessageTemplateService) Get() (*models.MessageTemplateResult, error) {
return models.GetMessageTemplateByID(s.ID)
func (s *TemplateService) Get() (*models.TemplateResult, error) {
return models.GetTemplateByID(s.ID)
}
// GetAll 获取消息模板列表
func (s *MessageTemplateService) GetAll() ([]models.MessageTemplateResult, error) {
templates, err := models.GetMessageTemplates(s.PageNum, s.PageSize, s.Text, s.getMaps())
func (s *TemplateService) GetAll() ([]models.TemplateResult, error) {
templates, err := models.GetTemplates(s.PageNum, s.PageSize, s.Text, s.getMaps())
if err != nil {
return nil, err
}
@@ -108,17 +108,17 @@ func (s *MessageTemplateService) GetAll() ([]models.MessageTemplateResult, error
}
// Count 获取消息模板总数
func (s *MessageTemplateService) Count() (int64, error) {
return models.GetMessageTemplatesTotal(s.Text, s.getMaps())
func (s *TemplateService) Count() (int64, error) {
return models.GetTemplatesTotal(s.Text, s.getMaps())
}
// ExistByID 检查模板是否存在
func (s *MessageTemplateService) ExistByID() (bool, error) {
return models.ExistMessageTemplateByID(s.ID)
func (s *TemplateService) ExistByID() (bool, error) {
return models.ExistTemplateByID(s.ID)
}
// RenderTemplate 渲染模板（替换占位符）
func (s *MessageTemplateService) RenderTemplate(templateContent string, params map[string]string) string {
func (s *TemplateService) RenderTemplate(templateContent string, params map[string]string) string {
result := templateContent
for key, value := range params {
@@ -130,7 +130,7 @@ func (s *MessageTemplateService) RenderTemplate(templateContent string, params m
}
// PreviewTemplate 预览模板效果
func (s *MessageTemplateService) PreviewTemplate(params map[string]string) (map[string]string, error) {
func (s *TemplateService) PreviewTemplate(params map[string]string) (map[string]string, error) {
template, err := s.Get()
if err != nil {
return nil, err
@@ -154,7 +154,7 @@ func (s *MessageTemplateService) PreviewTemplate(params map[string]string) (map[
}
// validatePlaceholders 验证占位符格式
func (s *MessageTemplateService) validatePlaceholders() error {
func (s *TemplateService) validatePlaceholders() error {
if s.Placeholders == "" {
return nil
}
@@ -174,7 +174,7 @@ func (s *MessageTemplateService) validatePlaceholders() error {
}
// getMaps 获取查询条件
func (s *MessageTemplateService) getMaps() map[string]interface{} {
func (s *TemplateService) getMaps() map[string]interface{} {
maps := make(map[string]interface{})
if s.Status != "" {
service/send_message_service/send_message.go
+1 -1
View File
@@ -256,7 +256,7 @@ func (sm *SendMessageService) Send(task models.TaskIns) (string, error) {
// 使用 SendUnified 方法（自动格式转换和@功能支持）
res, errMsg := channel.SendUnified(msgObj, ins.SendTasksIns, unifiedContent)
if res != "" {
sm.LogsAndStatusMark(fmt.Sprintf("返回内容：%s", res), sm.Status)
sm.LogsAndStatusMark(fmt.Sprintf("返回内容：%s\n", res), sm.Status)
} else {
sm.LogsAndStatusMark(sm.TransError(errMsg), errStrIsSuccess(errMsg))
}