Procházet zdrojové kódy

关闭模板消息

kobe6258 před 6 měsíci
rodič
revize
98fcdfe88d
5 změnil soubory, kde provedl 70 přidání a 71 odebrání
  1. 4 4
      controllers/audio.go
  2. 1 2
      controllers/message.go
  3. 3 3
      controllers/video.go
  4. 38 38
      models/media.go
  5. 24 24
      models/report.go

+ 4 - 4
controllers/audio.go

@@ -170,10 +170,10 @@ func (this *AudioController) AddAudio() {
 		SourceType:            "mp3",
 		MediaPlayMilliseconds: req.DurationMillisecond,
 		PermissionIds:         req.PermissionIds,
-		//SendStatus:            models.UNSEND,
-		PublishedTime: time.Now(),
-		Deleted:       0,
-		CreatedTime:   time.Now(),
+		SendStatus:            models.UNSEND,
+		PublishedTime:         time.Now(),
+		Deleted:               0,
+		CreatedTime:           time.Now(),
 	}
 
 	err = models.InsertMedia(audioInsert)

+ 1 - 2
controllers/message.go

@@ -366,7 +366,6 @@ func (this *MessageController) VideoList() {
 			resp := new(response.MessageMediaListResp)
 			resp.List = []*models.MessageMedia{}
 			resp.Paging = page
-			br.Data = resp
 			br.Msg = "获取成功"
 			return
 		}
@@ -434,7 +433,7 @@ const (
 // @Param   KeyWord   query   string  true       "报告标题/创建人"
 // @Param   SortType   query   string  true       "排序方式"
 // @Success 200 {object} models.ReportAuthorResp
-// //@router /sendTemplateMsg [post]
+// @router /sendTemplateMsg [post]
 func (this *MessageController) SendTemplateMsg() {
 	br := new(models.BaseResponse).Init()
 	defer func() {

+ 3 - 3
controllers/video.go

@@ -173,9 +173,9 @@ func (this *VideoController) AddVideo() {
 		MediaPlayMilliseconds: req.DurationMillisecond,
 		PermissionIds:         req.PermissionIds,
 		PublishedTime:         time.Now(),
-		//SendStatus:            models.UNSEND,
-		Deleted:     0,
-		CreatedTime: time.Now(),
+		SendStatus:            models.UNSEND,
+		Deleted:               0,
+		CreatedTime:           time.Now(),
 	}
 
 	err = models.InsertMedia(audioInsert)

+ 38 - 38
models/media.go

@@ -100,15 +100,15 @@ func (m *Media) ToMediaView() (message *MediaView) {
 }
 func (m *Media) ToMessageView() (message *MessageMedia) {
 	message = &MessageMedia{
-		MediaId:    m.Id,
-		AuthorId:   m.AuthorId,
-		AuthorName: m.AuthorName,
-		MediaType:  m.MediaType,
-		Src:        m.Src,
-		CoverSrc:   m.CoverSrc,
-		MediaName:  m.MediaName,
-		SourceType: m.SourceType,
-		//SendStatus:            m.SendStatus,
+		MediaId:               m.Id,
+		AuthorId:              m.AuthorId,
+		AuthorName:            m.AuthorName,
+		MediaType:             m.MediaType,
+		Src:                   m.Src,
+		CoverSrc:              m.CoverSrc,
+		MediaName:             m.MediaName,
+		SourceType:            m.SourceType,
+		SendStatus:            m.SendStatus,
 		MediaPlayMilliseconds: m.MediaPlayMilliseconds,
 		PermissionIds:         m.PermissionIds,
 		PublishedTime:         m.PublishedTime.Format(time.DateTime),
@@ -141,36 +141,36 @@ func (m *Media) ToMessageView() (message *MessageMedia) {
 }
 
 type MessageMedia struct {
-	MediaId    int       `json:"mediaId"`
-	AuthorId   int       `json:"authorId"`
-	AuthorName string    `json:"authorName"`
-	CoverSrc   string    `json:"coverSrc"`
-	MediaType  MediaType `json:"mediaType"`
-	Src        string    `json:"src"`
-	MediaName  string    `json:"mediaName"`
-	SourceType string    `json:"sourceType"`
-	//SendStatus            SendStatus `json:"sendStatus"`
-	MediaPlayMilliseconds int    `json:"mediaPlayMilliseconds"`
-	PermissionIds         string `json:"permissionIds"`
-	PermissionNames       string `description:"permission_names"`
-	PublishedTime         string `json:"publishedTime"`
+	MediaId               int        `json:"mediaId"`
+	AuthorId              int        `json:"authorId"`
+	AuthorName            string     `json:"authorName"`
+	CoverSrc              string     `json:"coverSrc"`
+	MediaType             MediaType  `json:"mediaType"`
+	Src                   string     `json:"src"`
+	MediaName             string     `json:"mediaName"`
+	SourceType            string     `json:"sourceType"`
+	SendStatus            SendStatus `json:"sendStatus"`
+	MediaPlayMilliseconds int        `json:"mediaPlayMilliseconds"`
+	PermissionIds         string     `json:"permissionIds"`
+	PermissionNames       string     `description:"permission_names"`
+	PublishedTime         string     `json:"publishedTime"`
 }
 type Media struct {
-	Id                    int       `orm:"pk;auto" description:"id"`
-	AuthorId              int       `description:"author_id"`
-	AuthorName            string    `description:"author_name"`
-	CoverSrc              string    `description:"cover_src"`
-	MediaType             MediaType `description:"media_type"`
-	Src                   string    `description:"src"`
-	MediaName             string    `description:"media_name"`
-	SourceType            string    `description:"source_type"`
-	MediaPlayMilliseconds int       `description:"media_play_milliseconds"`
-	PermissionIds         string    `description:"permission_ids"`
-	PublishedTime         time.Time `description:"published_time"`
-	//SendStatus            SendStatus `json:"sendStatus"`
-	Deleted     int       `description:"deleted"`
-	CreatedTime time.Time `description:"created_time"`
-	UpdatedTime time.Time `description:"updated_time"`
+	Id                    int        `orm:"pk;auto" description:"id"`
+	AuthorId              int        `description:"author_id"`
+	AuthorName            string     `description:"author_name"`
+	CoverSrc              string     `description:"cover_src"`
+	MediaType             MediaType  `description:"media_type"`
+	Src                   string     `description:"src"`
+	MediaName             string     `description:"media_name"`
+	SourceType            string     `description:"source_type"`
+	MediaPlayMilliseconds int        `description:"media_play_milliseconds"`
+	PermissionIds         string     `description:"permission_ids"`
+	PublishedTime         time.Time  `description:"published_time"`
+	SendStatus            SendStatus `json:"sendStatus"`
+	Deleted               int        `description:"deleted"`
+	CreatedTime           time.Time  `description:"created_time"`
+	UpdatedTime           time.Time  `description:"updated_time"`
 }
 
 func GetMediaCountByCondition(media MediaType, condition string, pars []interface{}) (count int, err error) {
@@ -184,7 +184,7 @@ func GetMediaCountByCondition(media MediaType, condition string, pars []interfac
 }
 func (m *Media) UpdateSendStatus(statusType SendStatus) (err error) {
 	o := orm.NewOrm()
-	//m.SendStatus = statusType
+	m.SendStatus = statusType
 	_, err = o.Update(m, "send_status")
 	return
 }

+ 24 - 24
models/report.go

@@ -21,19 +21,19 @@ const (
 )
 
 type Report struct {
-	Id        int          `description:"id"`
-	OrgId     int          `description:"组织id"`
-	Source    ReportSource `description:"来源"`
-	Title     string       `description:"标题"`
-	Abstract  string       `description:"摘要"`
-	Author    string       `description:"作者"`
-	CoverSrc  int          `description:"封面"`
-	PlateName string       `description:"板块名称"`
-	Status    ReportStatus `description:"状态"`
-	//SendStatus    SendStatus   `description:"发送状态"`
-	PublishedTime string    `description:"发布时间"`
-	CreatedTime   time.Time `description:"创建时间"`
-	UpdatedTime   time.Time `description:"更新时间"`
+	Id            int          `description:"id"`
+	OrgId         int          `description:"组织id"`
+	Source        ReportSource `description:"来源"`
+	Title         string       `description:"标题"`
+	Abstract      string       `description:"摘要"`
+	Author        string       `description:"作者"`
+	CoverSrc      int          `description:"封面"`
+	PlateName     string       `description:"板块名称"`
+	Status        ReportStatus `description:"状态"`
+	SendStatus    SendStatus   `description:"发送状态"`
+	PublishedTime string       `description:"发布时间"`
+	CreatedTime   time.Time    `description:"创建时间"`
+	UpdatedTime   time.Time    `description:"更新时间"`
 }
 
 type ReportView struct {
@@ -46,20 +46,20 @@ type ReportView struct {
 	CoverSrc        string
 	PlateName       string
 	PermissionNames string
-	//SendStatus      SendStatus
-	PublishedTime string
+	SendStatus      SendStatus
+	PublishedTime   string
 }
 
 func (r *Report) ToView() (item *ReportView) {
 	item = &ReportView{
-		Id:        r.Id,
-		OrgId:     r.OrgId,
-		Source:    r.Source,
-		Title:     r.Title,
-		Abstract:  r.Abstract,
-		Author:    r.Author,
-		PlateName: r.PlateName,
-		//SendStatus:    r.SendStatus,
+		Id:            r.Id,
+		OrgId:         r.OrgId,
+		Source:        r.Source,
+		Title:         r.Title,
+		Abstract:      r.Abstract,
+		Author:        r.Author,
+		PlateName:     r.PlateName,
+		SendStatus:    r.SendStatus,
 		PublishedTime: r.PublishedTime,
 	}
 	return
@@ -70,7 +70,7 @@ func (r *Report) TableName() string {
 }
 func (r *Report) UpdateSendStatus(status SendStatus) (err error) {
 	o := orm.NewOrm()
-	//r.SendStatus = status
+	r.SendStatus = status
 	_, err = o.Update(r, "send_status")
 	return
 }