Merge branch 'ETA_1.2.6' into debug

controllers/report_approval.go

@@ -0,0 +1,242 @@
+package controllers
+
+import (
+	"encoding/json"
+	"eta/eta_hub/models"
+	"eta/eta_hub/utils"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"html"
+	"strconv"
+	"strings"
+	"time"
+)
+
+// ReportController 报告
+type ReportController struct {
+	BaseAuthController
+}
+
+// ListReport
+// @Title 获取报告列表接口
+// @Description 获取报告列表
+// @Param   PageSize   query   int  true       "每页数据条数"
+// @Param   CurrentIndex   query   int  true       "当前页页码，从1开始"
+// @Param   TimeType     query string true  "筛选的时间类别：publish_time(发布时间)，modify_time（更新时间）"
+// @Param   StartDate   query   string  true       "开始时间"
+// @Param   EndDate   query   string  true       "结束时间"
+// @Param   Frequency   query   string  true       "频度"
+// @Param   ClassifyNameFirst   query   string  true       "一级分类名称"
+// @Param   ClassifyNameSecond   query   string  true       "二级分类名称"
+// @Param   State   query   int  true       "状态"
+// @Param   KeyWord   query   string  true       "搜索关键词"
+// @Param   PublishSort   query   string  true       "desc:降序，asc 升序（预留）"
+// @Param   CompanyType   query   string  false       "产品类型，枚举值：'ficc','权益';不传默认返回全部"
+// @Success 200 {object} models.ReportListResp
+// @router /list [get]
+func (this *ReportController) ListReport() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	pageSize, _ := this.GetInt("PageSize")
+	currentIndex, _ := this.GetInt("CurrentIndex")
+
+	//timeType := this.GetString("TimeType")
+	//startDate := this.GetString("StartDate")
+	//endDate := this.GetString("EndDate")
+	//frequency := this.GetString("Frequency")
+	//classifyNameFirst := this.GetString("ClassifyNameFirst")
+	//classifyNameSecond := this.GetString("ClassifyNameSecond")
+	//state, _ := this.GetInt("State")
+	//keyWord := this.GetString("KeyWord")
+	//companyType := this.GetString("CompanyType")
+
+	var startSize int
+	if pageSize <= 0 {
+		pageSize = utils.PageSize20
+	}
+	if currentIndex <= 0 {
+		currentIndex = 1
+	}
+	startSize = utils.StartIndex(currentIndex, pageSize)
+
+	//if timeType == "" {
+	//	timeType = "publish_time"
+	//}
+	//if timeType != "publish_time" && timeType != "modify_time" {
+	//	br.Msg = "请选择正确的时间"
+	//	br.ErrMsg = "请选择正确的时间"
+	//	return
+	//}
+
+	var condition string
+	var pars []interface{}
+
+	//if keyWord != "" {
+	//	condition += ` AND (title LIKE ? OR admin_real_name LIKE ? ) `
+	//	pars = utils.GetLikeKeywordPars(pars, keyWord, 2)
+	//}
+	//if startDate != "" {
+	//	condition += ` AND ` + timeType + ` >= ? `
+	//	pars = append(pars, startDate)
+	//}
+	//if endDate != "" {
+	//	condition += ` AND ` + timeType + ` <= ? `
+	//	pars = append(pars, endDate)
+	//}
+	//if frequency != "" {
+	//	condition += ` AND frequency = ? `
+	//	pars = append(pars, frequency)
+	//}
+	//if classifyNameFirst != "" {
+	//	condition += ` AND classify_name_first = ? `
+	//	pars = append(pars, classifyNameFirst)
+	//}
+	//
+	//if classifyNameSecond != "" {
+	//	condition += ` AND classify_name_second = ? `
+	//	pars = append(pars, classifyNameSecond)
+	//}
+	//if state > 0 {
+	//	condition += ` AND state = ? `
+	//	pars = append(pars, state)
+	//}
+	condition += ` AND state = 2 `
+
+	total, err := models.GetReportListCount(condition, pars, "")
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	list, err := models.GetReportList(condition, pars, "", startSize, pageSize)
+	if err != nil {
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+
+	listLen := len(list)
+	if listLen > 0 {
+		for i := 0; i < listLen; i++ {
+			list[i].Content = html.UnescapeString(list[i].Content)
+			list[i].ContentSub = html.UnescapeString(list[i].ContentSub)
+		}
+	}
+
+	page := paging.GetPaging(currentIndex, pageSize, total)
+	resp := new(models.ReportListResp)
+	resp.Paging = page
+	resp.List = list
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = resp
+}
+
+// PublishReport
+// @Title 审核报告接口
+// @Description 发布报告
+// @Param	request	body models.PublishReq true "type json string"
+// @Success 200 Ret=200 发布成功
+// @router /publish [post]
+func (this *ReportController) PublishReport() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+	var req models.PublishReq
+	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
+	if err != nil {
+		br.Msg = "参数解析异常！"
+		br.ErrMsg = "参数解析失败，Err:" + err.Error()
+		return
+	}
+	reportIds := req.ReportIds
+	if reportIds == "" {
+		br.Msg = "参数错误"
+		br.ErrMsg = "参数错误，报告id不可为空"
+		return
+	}
+
+	reportArr := strings.Split(reportIds, ",")
+	for _, v := range reportArr {
+		vint, err := strconv.Atoi(v)
+		if err != nil {
+			br.Msg = "参数错误"
+			br.ErrMsg = "参数错误,Err:" + err.Error()
+			return
+		}
+		report, err := models.GetReportById(vint)
+		if err != nil {
+			br.Msg = "获取报告信息失败"
+			br.ErrMsg = "获取报告信息失败,Err:" + err.Error()
+			return
+		}
+		if report == nil {
+			br.Msg = "报告不存在"
+			return
+		}
+
+		publishTime := time.Now()
+		var tmpErr error
+		if report.Content == "" {
+			br.Msg = "报告内容为空"
+			br.ErrMsg = "报告内容为空,report_id:" + strconv.Itoa(report.Id)
+			return
+		}
+		if tmpErr = models.PublishReportById(report.Id, req.State, publishTime); tmpErr != nil {
+			br.Msg = "报告审核失败"
+			br.ErrMsg = "报告审核失败, Err:" + tmpErr.Error() + ", report_id:" + strconv.Itoa(report.Id)
+			return
+		}
+	}
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "审批成功"
+}
+
+// Detail
+// @Title 获取报告详情接口
+// @Description 获取报告详情
+// @Param	request	body models.ReportDetailReq true "type json string"
+// @Success 200 {object} models.Report
+// @router /detail [get]
+func (this *ReportController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	reportId, err := this.GetInt("ReportId")
+	if err != nil {
+		br.Msg = "获取参数失败！"
+		br.ErrMsg = "获取参数失败，Err:" + err.Error()
+		return
+	}
+	if reportId <= 0 {
+		br.Msg = "参数错误"
+		return
+	}
+	item, err := models.GetReportById(reportId)
+	if err != nil {
+		if err.Error() == utils.ErrNoRow() {
+			br.Msg = "报告已被删除"
+			return
+		}
+		br.Msg = "获取失败"
+		br.ErrMsg = "获取失败，Err:" + err.Error()
+		return
+	}
+	item.Content = html.UnescapeString(item.Content)
+	item.ContentSub = html.UnescapeString(item.ContentSub)
+
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+	br.Data = item
+}

controllers/resource.go

@@ -1,58 +0,0 @@
-package controllers
-
-import (
-	"eta/eta_hub/models"
-	"os"
-)
-type ResourceController struct {
-	BaseAuthController
-}
-
-// ResourceUpload 上传文件
-// @Title 上传文件
-// @Description 上传文件
-// @Param   MenuId  query  int  true  "目录ID"
-// @Param   File	query  file  true  "文件"
-// @Success 200 Ret=200 操作成功
-// @router /resource/upload [post]
-func (this *ResourceController) ResourceUpload() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	f, h, e := this.GetFile("file")
-	if e != nil {
-		br.Msg = "获取资源信息失败"
-		br.ErrMsg = "获取资源信息失败, Err:" + e.Error()
-		return
-	}
-	defer func() {
-		_ = f.Close()
-	}()
-
-
-	uploadDir :=  "./static/"
-	//uploadDir :=  "/Users/xi/Desktop/file"
-	if e = os.MkdirAll(uploadDir, 766); e != nil {
-		br.Msg = "存储目录创建失败"
-		br.ErrMsg = "存储目录创建失败, Err:" + e.Error()
-		return
-	}
-	//ossFileName := utils.GetRandStringNoSpecialChar(28) + ext
-	filePath := uploadDir + "/" + h.Filename
-	if e = this.SaveToFile("file", filePath); e != nil {
-		br.Msg = "文件保存失败"
-		br.ErrMsg = "文件保存失败, Err:" + e.Error()
-		return
-	}
-	//defer func() {
-	//	_ = os.Remove(filePath)
-	//}()
-
-
-	br.Msg = "上传成功"
-	br.Ret = 200
-	br.Success = true
-}

models/db.go

@@ -18,11 +18,11 @@ func init() {
 	db, _ := orm.GetDB("default")
 	db.SetConnMaxLifetime(10 * time.Minute)
 
-	_ = orm.RegisterDataBase("data", "mysql", utils.MYSQL_URL_DATA)
-	orm.SetMaxIdleConns("data", 50)
-	orm.SetMaxOpenConns("data", 100)
+	_ = orm.RegisterDataBase("rddp", "mysql", utils.MYSQL_URL_RDDP)
+	orm.SetMaxIdleConns("rddp", 50)
+	orm.SetMaxOpenConns("rddp", 100)
 
-	data_db, _ := orm.GetDB("data")
+	data_db, _ := orm.GetDB("rddp")
 	data_db.SetConnMaxLifetime(10 * time.Minute)
 
 	orm.Debug = true
@@ -30,5 +30,6 @@ func init() {
 
 	//注册对象
 	orm.RegisterModel(
+		new(Report),
 	)
 }

models/report.go

@@ -0,0 +1,397 @@
+package models
+
+import (
+	"eta/eta_hub/utils"
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"strings"
+	"time"
+)
+
+type Report struct {
+	Id                 int       `orm:"column(id)" description:"报告Id"`
+	AddType            int       `description:"新增方式：1:新增报告，2:继承报告"`
+	ClassifyIdFirst    int       `description:"一级分类id"`
+	ClassifyNameFirst  string    `description:"一级分类名称"`
+	ClassifyIdSecond   int       `description:"二级分类id"`
+	ClassifyNameSecond string    `description:"二级分类名称"`
+	Title              string    `description:"标题"`
+	Abstract           string    `description:"摘要"`
+	Author             string    `description:"作者"`
+	Frequency          string    `description:"频度"`
+	CreateTime         string    `description:"创建时间"`
+	ModifyTime         time.Time `description:"修改时间"`
+	State              int       `description:"1:未发布，2:已发布"`
+	PublishTime        time.Time `description:"发布时间"`
+	Stage              int       `description:"期数"`
+	MsgIsSend          int       `description:"消息是否已发送，0:否，1:是"`
+	ThsMsgIsSend       int       `description:"客户群消息是否已发送，0:否，1:是"`
+	Content            string    `description:"内容"`
+	VideoUrl           string    `description:"音频文件URL"`
+	VideoName          string    `description:"音频文件名称"`
+	VideoPlaySeconds   string    `description:"音频播放时长"`
+	VideoSize          string    `description:"音频文件大小，单位M"`
+	ContentSub         string    `description:"内容前两个章节"`
+	ReportCode         string    `description:"报告唯一编码"`
+	ReportVersion      int       `description:"1:旧版,2:新版"`
+	HasChapter         int       `description:"是否有章节 0-否 1-是"`
+	ChapterType        string    `description:"章节类型 day-晨报 week-周报"`
+	OldReportId        int       `description:"research_report表ID, 大于0则表示该报告为老后台同步过来的"`
+	MsgSendTime        time.Time `description:"模版消息发送时间"`
+	AdminId            int       `description:"创建者账号"`
+	AdminRealName      string    `description:"创建者姓名"`
+}
+
+type ReportListResp struct {
+	List   []*Report
+	Paging *paging.PagingItem `description:"分页数据"`
+}
+
+func GetReportListCount(condition string, pars []interface{}, companyType string) (count int, err error) {
+	//产品权限
+	companyTypeSqlStr := ``
+	if companyType == "ficc" {
+		companyTypeSqlStr = " AND classify_id_first != 40 "
+	} else if companyType == "权益" {
+		companyTypeSqlStr = " AND classify_id_first = 40 "
+	}
+
+	oRddp := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT COUNT(1) AS count  FROM report WHERE 1=1 ` + companyTypeSqlStr
+	if condition != "" {
+		sql += condition
+	}
+	err = oRddp.Raw(sql, pars).QueryRow(&count)
+	return
+}
+
+func GetReportList(condition string, pars []interface{}, companyType string, startSize, pageSize int) (items []*Report, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	//产品权限
+	companyTypeSqlStr := ``
+	if companyType == "ficc" {
+		companyTypeSqlStr = " AND classify_id_first != 40 "
+	} else if companyType == "权益" {
+		companyTypeSqlStr = " AND classify_id_first = 40 "
+	}
+
+	sql := `SELECT * FROM report WHERE 1=1  ` + companyTypeSqlStr
+	if condition != "" {
+		sql += condition
+	}
+	sql += `ORDER BY state ASC, modify_time DESC LIMIT ?,?`
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+// PublishReport 发布报告
+func PublishReport(reportIds []int) (err error) {
+	if len(reportIds) == 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET state=2,publish_time=now(),modify_time=NOW() WHERE id IN (` + utils.GetOrmInReplace(len(reportIds)) + `)`
+	_, err = o.Raw(sql).Exec()
+	return
+}
+
+// PublishCancleReport 取消发布报告
+func PublishCancleReport(reportIds int, publishTimeNullFlag bool) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	var sql string
+	if publishTimeNullFlag {
+		sql = ` UPDATE report SET state=1, publish_time=null, pre_publish_time=null, pre_msg_send=0 WHERE id =?`
+	} else {
+		sql = ` UPDATE report SET state=1, pre_publish_time=null, pre_msg_send=0 WHERE id =?`
+	}
+	_, err = o.Raw(sql, reportIds).Exec()
+	return
+}
+
+// 删除报告
+func DeleteReport(reportIds int) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` DELETE FROM report WHERE id =? `
+	_, err = o.Raw(sql, reportIds).Exec()
+	return
+}
+
+type ReportDetail struct {
+	Id                 int    `orm:"column(id)" description:"报告Id"`
+	AddType            int    `description:"新增方式：1:新增报告，2:继承报告"`
+	ClassifyIdFirst    int    `description:"一级分类id"`
+	ClassifyNameFirst  string `description:"一级分类名称"`
+	ClassifyIdSecond   int    `description:"二级分类id"`
+	ClassifyNameSecond string `description:"二级分类名称"`
+	Title              string `description:"标题"`
+	Abstract           string `description:"摘要"`
+	Author             string `description:"作者"`
+	Frequency          string `description:"频度"`
+	CreateTime         string `description:"创建时间"`
+	ModifyTime         string `description:"修改时间"`
+	State              int    `description:"1:未发布，2:已发布"`
+	PublishTime        string `description:"发布时间"`
+	PrePublishTime     string `description:"预发布时间"`
+	Stage              int    `description:"期数"`
+	MsgIsSend          int    `description:"消息是否已发送，0:否，1:是"`
+	PreMsgSend         int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
+	Content            string `description:"内容"`
+	VideoUrl           string `description:"音频文件URL"`
+	VideoName          string `description:"音频文件名称"`
+	VideoPlaySeconds   string `description:"音频播放时长"`
+	ContentSub         string `description:"内容前两个章节"`
+	ThsMsgIsSend       int    `description:"客户群消息是否已发送，0:否，1:是"`
+	HasChapter         int    `description:"是否有章节 0-否 1-是"`
+	ChapterType        string `description:"章节类型 day-晨报 week-周报"`
+}
+
+func GetReportById(reportId int) (item *ReportDetail, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM report WHERE id=?`
+	err = o.Raw(sql, reportId).QueryRow(&item)
+	return
+}
+
+func GetReportStage(classifyIdFirst, classifyIdSecond int) (count int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ``
+	if classifyIdSecond > 0 {
+		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_second=? "
+		o.Raw(sql, classifyIdSecond).QueryRow(&count)
+	} else {
+		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_first=? "
+		o.Raw(sql, classifyIdFirst).QueryRow(&count)
+	}
+	return
+}
+
+func GetReportStageEdit(classifyIdFirst, classifyIdSecond, reportId int) (count int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ``
+	if classifyIdSecond > 0 {
+		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_second=? AND id<>? "
+		o.Raw(sql, classifyIdSecond, reportId).QueryRow(&count)
+	} else {
+		sql = "SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_first=? AND id<>? "
+		o.Raw(sql, classifyIdFirst, reportId).QueryRow(&count)
+	}
+	return
+}
+
+type PublishReq struct {
+	ReportIds string `description:"报告id,多个用英文逗号隔开"`
+	State     int    `description:"状态：3:驳回，4:审批通过"`
+}
+
+type PublishCancelReq struct {
+	ReportIds int `description:"报告id"`
+}
+
+type DeleteReq struct {
+	ReportIds int `description:"报告id"`
+}
+
+type AddReq struct {
+	AddType            int    `description:"新增方式：1:新增报告，2:继承报告"`
+	ClassifyIdFirst    int    `description:"一级分类id"`
+	ClassifyNameFirst  string `description:"一级分类名称"`
+	ClassifyIdSecond   int    `description:"二级分类id"`
+	ClassifyNameSecond string `description:"二级分类名称"`
+	Title              string `description:"标题"`
+	Abstract           string `description:"摘要"`
+	Author             string `description:"作者"`
+	Frequency          string `description:"频度"`
+	State              int    `description:"状态：1:未发布，2:已发布"`
+	Content            string `description:"内容"`
+	CreateTime         string `description:"创建时间"`
+	ReportVersion      int    `description:"1:旧版,2:新版"`
+}
+
+type PrePublishReq struct {
+	ReportId       int    `description:"报告id"`
+	PrePublishTime string `description:"预发布时间"`
+	PreMsgSend     int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
+}
+
+type AddResp struct {
+	ReportId   int64  `description:"报告id"`
+	ReportCode string `description:"报告code"`
+}
+
+func AddReport(item *Report) (lastId int64, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	lastId, err = o.Insert(item)
+	return
+}
+
+type EditReq struct {
+	ReportId           int64  `description:"报告id"`
+	ClassifyIdFirst    int    `description:"一级分类id"`
+	ClassifyNameFirst  string `description:"一级分类名称"`
+	ClassifyIdSecond   int    `description:"二级分类id"`
+	ClassifyNameSecond string `description:"二级分类名称"`
+	Title              string `description:"标题"`
+	Abstract           string `description:"摘要"`
+	Author             string `description:"作者"`
+	Frequency          string `description:"频度"`
+	State              int    `description:"状态：1:未发布，2:已发布"`
+	Content            string `description:"内容"`
+	CreateTime         string `description:"创建时间"`
+}
+
+type EditResp struct {
+	ReportId   int64  `description:"报告id"`
+	ReportCode string `description:"报告code"`
+}
+
+func EditReport(item *Report, reportId int64) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report
+			SET
+			  classify_id_first =?,
+			  classify_name_first = ?,
+			  classify_id_second = ?,
+			  classify_name_second = ?,
+			  title = ?,
+			  abstract = ?,
+			  author = ?,
+			  frequency = ?,
+			  state = ?,
+			  content = ?,
+			  content_sub = ?,
+			  stage =?,
+			  create_time = ?,
+			  modify_time = ?
+			WHERE id = ? `
+	_, err = o.Raw(sql, item.ClassifyIdFirst, item.ClassifyNameFirst, item.ClassifyIdSecond, item.ClassifyNameSecond, item.Title,
+		item.Abstract, item.Author, item.Frequency, item.State, item.Content, item.ContentSub, item.Stage, item.CreateTime, time.Now(), reportId).Exec()
+	return
+}
+
+type ReportDetailReq struct {
+	ReportId int `description:"报告id"`
+}
+
+type ClassifyIdDetailReq struct {
+	ClassifyIdFirst  int `description:"报告一级分类id"`
+	ClassifyIdSecond int `description:"报告二级分类id"`
+}
+
+type SendTemplateMsgReq struct {
+	ReportId int `description:"报告id"`
+}
+
+func ModifyReportVideo(reportId int, videoUrl, videoName, videoSize string, playSeconds float64) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET video_url=?,video_name=?,video_play_seconds=?,video_size=? WHERE id=? `
+	_, err = o.Raw(sql, videoUrl, videoName, playSeconds, videoSize, reportId).Exec()
+	return
+}
+
+func EditReportContent(reportId int, content, contentSub string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` UPDATE report SET content=?,content_sub=?,modify_time=NOW() WHERE id=? `
+	_, err = o.Raw(sql, content, contentSub, reportId).Exec()
+	return
+}
+
+func AddReportSaveLog(reportId, adminId int, content, contentSub, adminName string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := ` INSERT INTO report_save_log(report_id, content,content_sub,admin_id,admin_name) VALUES (?,?,?,?,?) `
+	_, err = o.Raw(sql, reportId, content, contentSub, adminId, adminName).Exec()
+	return
+}
+
+type SaveReportContentResp struct {
+	ReportId int `description:"报告id"`
+}
+
+func ModifyReportCode(reportId int64, reportCode string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET report_code=? WHERE id=? `
+	_, err = o.Raw(sql, reportCode, reportId).Exec()
+	return
+}
+
+func ModifyReportThsMsgIsSend(item *ReportDetail) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	if item.ThsMsgIsSend == 0 {
+		sql := `UPDATE report SET ths_msg_is_send = 1 WHERE id = ? `
+		_, err = o.Raw(sql, item.Id).Exec()
+	}
+	return
+}
+
+// GetDayWeekReportStage 获取晨报周报期数
+func GetDayWeekReportStage(classifyIdFirst int, yearStart time.Time) (count int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := " SELECT MAX(stage) AS max_stage FROM report WHERE classify_id_first = ? AND create_time > ? "
+	o.Raw(sql, classifyIdFirst, yearStart).QueryRow(&count)
+
+	return
+}
+
+// GetReportByReportId 主键获取报告
+func GetReportByReportId(reportId int) (item *Report, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM report WHERE id = ?`
+	err = o.Raw(sql, reportId).QueryRow(&item)
+	return
+}
+
+// 发布报告
+func PublishReportById(reportId, state int, publishTime time.Time) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET state = ?, publish_time = ?, pre_publish_time=null, pre_msg_send=0, modify_time = NOW() WHERE id = ? `
+	_, err = o.Raw(sql, state,publishTime, reportId).Exec()
+	return
+}
+
+func UpdateReportPublishTime(reportId int, videoNameDate string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql1 := ` UPDATE report SET publish_time = NOW() WHERE id = ?  `
+	_, err = o.Raw(sql1, reportId).Exec()
+	if err != nil {
+		return
+	}
+	//修改音频标题
+	sql2 := ` UPDATE report SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE id = ? and (video_name !="" and video_name is not null)`
+	_, err = o.Raw(sql2, reportId).Exec()
+	return
+}
+
+func UpdateReportChapterPublishTime(reportId int, videoNameDate string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql1 := ` UPDATE report_chapter SET publish_time = NOW() WHERE report_id = ? `
+	_, err = o.Raw(sql1, reportId).Exec()
+	if err != nil {
+		return
+	}
+	//修改音频标题
+	sql2 := ` UPDATE report_chapter SET video_name=CONCAT(SUBSTRING_INDEX(video_name,"(",1),"` + videoNameDate + `") WHERE report_id = ? and (video_name !="" and video_name is not null)`
+	_, err = o.Raw(sql2, reportId).Exec()
+	return
+}
+
+// GetReportByCondition 获取报告
+func GetReportByCondition(condition string, pars []interface{}, fieldArr []string, orderRule string, isPage bool, startSize, pageSize int) (items []*Report, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	fields := `*`
+	if len(fieldArr) > 0 {
+		fields = strings.Join(fieldArr, ",")
+	}
+	sql := `SELECT ` + fields + ` FROM report WHERE 1=1 `
+	sql += condition
+	order := ` ORDER BY modify_time DESC`
+	if orderRule != `` {
+		order = orderRule
+	}
+	sql += order
+	if isPage {
+		sql += ` LIMIT ?,?`
+		_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	} else {
+		_, err = o.Raw(sql, pars).QueryRows(&items)
+	}
+	return
+}

models/report_author.go

@@ -0,0 +1,109 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"github.com/rdlucklib/rdluck_tools/paging"
+	"time"
+)
+
+type ReportAuthor struct {
+	Id           int       `orm:"column(id)" description:"报告作者ID"`
+	ReportAuthor string    `description:"报告作者名称"`
+	AuthorType   int       `description:"类型，1：中文；2：英文"`
+	Enable       int       `description:"是否启用，0：禁用，1：启用"`
+	IsDelete     int       `description:"是否删除，0：未删除，1：已删除"`
+	CreateTime   time.Time `description:"创建时间"`
+	ModifyTime   time.Time `description:"更新时间"`
+}
+
+// GetReportAuthorList 获取报告作者列表
+func GetReportAuthorList(condition string, pars []interface{}, startSize, pageSize int) (total int, items []*ReportAuthor, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	baseSql := `  report_author WHERE is_delete=0 `
+	if condition != "" {
+		baseSql += condition
+	}
+
+	totalSql := ` SELECT count(1) total FROM ` + baseSql
+	err = o.Raw(totalSql, pars).QueryRow(&total)
+	if err != nil {
+		return
+	}
+
+	sql := ` SELECT * FROM ` + baseSql + ` ORDER BY id desc LIMIT ?,? `
+	_, err = o.Raw(sql, pars, startSize, pageSize).QueryRows(&items)
+	return
+}
+
+// GetReportAuthorCount 获取报告作者列表数
+func GetReportAuthorCount(condition string, pars []interface{}) (total int, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+
+	totalSql := ` SELECT count(1) total FROM report_author WHERE 1=1 `
+	if condition != "" {
+		totalSql += condition
+	}
+	err = o.Raw(totalSql, pars).QueryRow(&total)
+	return
+}
+
+type ReportAuthorResp struct {
+	List   []*ReportAuthor
+	Paging *paging.PagingItem `description:"分页数据"`
+}
+
+// AddReportAuthorReq 新增报告作者请求体
+type AddReportAuthorReq struct {
+	Id         int    `description:"作者id"`
+	AuthorType int    `description:"类型，1：中文；2：英文"`
+	Author     string `description:"报告作者名称"`
+}
+
+// GetReportAuthorById 根据作者id获取数据
+func GetReportAuthorById(authorId int) (item *ReportAuthor, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM report_author WHERE is_delete=0 AND id = ? `
+	err = o.Raw(sql, authorId).QueryRow(&item)
+	return
+}
+
+// GetReportAuthorByAuthor 根据作者名称获取数据
+func GetReportAuthorByAuthor(title string, authorType int) (item *ReportAuthor, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? `
+	err = o.Raw(sql, title, authorType).QueryRow(&item)
+	return
+}
+
+// GetReportAuthorByAuthorAndId 根据作者名称和作者id获取数据
+func GetReportAuthorByAuthorAndId(title string, authorType, authorId int) (item *ReportAuthor, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `SELECT * FROM report_author WHERE is_delete=0 AND report_author=? AND author_type = ? AND id != ? `
+	err = o.Raw(sql, title, authorType, authorId).QueryRow(&item)
+	return
+}
+
+// AddReportAuthor 新增作者
+func AddReportAuthor(item *ReportAuthor) (lastId int64, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	lastId, err = o.Insert(item)
+	return
+}
+
+// Update 更新作者基础信息
+func (item *ReportAuthor) Update(cols []string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	_, err = o.Update(item, cols...)
+	return
+}
+
+// EnableReportAuthorReq 启用/禁用报告作者请求体
+type EnableReportAuthorReq struct {
+	Id         int `description:"作者id"`
+	EnableType int `description:"是否启用，0：禁用，1：启用"`
+}
+
+// DeleteReportAuthorReq 删除报告作者请求体
+type DeleteReportAuthorReq struct {
+	Id int `description:"作者id"`
+}

models/report_ppt_img.go

@@ -0,0 +1,43 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+// ReportPptImg Ppt转报告的图片记录表
+type ReportPptImg struct {
+	ReportPptImgId  int       `orm:"column(report_ppt_img_id);pk;auto" description:"自增id"`
+	PptId           int       `description:"ppt的id"`
+	ReportId        int       `description:"关联的报告ID"`
+	ReportChapterId int       `description:"关联的报告章节ID"`
+	ImgUrl          string    `description:"ppt图片地址"`
+	CreateTime      time.Time `description:"创建时间"`
+}
+
+// AddAndEditMultiReportPptImg 批量添加Ppt转报告的图片记录
+func AddAndEditMultiReportPptImg(pptId int, reportPptImgList []*ReportPptImg) (err error) {
+	if len(reportPptImgList) < 0 {
+		return
+	}
+	o := orm.NewOrmUsingDB("rddp")
+
+	to, err := o.Begin()
+	if err != nil {
+		return
+	}
+	defer func() {
+		if err != nil {
+			_ = to.Rollback()
+		} else {
+			_ = to.Commit()
+		}
+	}()
+	sql := ` DELETE FROM report_ppt_img WHERE ppt_id = ?`
+	_, err = to.Raw(sql, pptId).Exec()
+	if err != nil {
+		return
+	}
+	_, err = to.InsertMulti(len(reportPptImgList), reportPptImgList)
+	return
+}

models/report_view_record.go

@@ -0,0 +1,26 @@
+package models
+
+import (
+	"github.com/beego/beego/v2/client/orm"
+	"time"
+)
+
+type ReportViewRecord struct {
+	Id          int       `orm:"column(id);pk"`
+	UserId      int       `description:"用户id"`
+	ReportId    int       `description:"报告id"`
+	Mobile      string    `description:"手机号"`
+	Email       string    `description:"邮箱"`
+	RealName    string    `description:"用户实际姓名"`
+	CompanyName string    `description:"公司名称"`
+	CreateTime  time.Time `description:"创建时间"`
+}
+
+//获取需要修复的数据列表
+func GetViewListByReportId(reportId int) (total int64, list []*ReportViewRecord, err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `select * from report_view_record where report_id = ? order by id desc `
+
+	total, err = o.Raw(sql, reportId).QueryRows(&list)
+	return
+}

routers/commentsRouter.go

@@ -7,10 +7,28 @@ import (
 
 func init() {
 
-    beego.GlobalControllerRouter["eta/eta_hub/controllers:ResourceController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ResourceController"],
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"],
         beego.ControllerComments{
-            Method: "ResourceUpload",
-            Router: `/resource/upload`,
+            Method: "Detail",
+            Router: `/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "ListReport",
+            Router: `/list`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
+    beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"] = append(beego.GlobalControllerRouter["eta/eta_hub/controllers:ReportController"],
+        beego.ControllerComments{
+            Method: "PublishReport",
+            Router: `/publish`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,

routers/router.go

@@ -14,9 +14,9 @@ import (
 
 func init() {
 	var ns = web.NewNamespace("/v1",
-		web.NSNamespace("/test",
+		web.NSNamespace("/report",
 			web.NSInclude(
-				&controllers.ResourceController{},
+				&controllers.ReportController{},
 			),
 		),
 	)

utils/common.go

@@ -986,3 +986,23 @@ func GetLocalIP() (ip string, err error) {
 	}
 	return
 }
+
+// GetLikeKeywordPars
+//
+//	@Description: 获取sql查询中的参数切片
+//	@author: Roc
+//	@datetime2023-10-23 14:50:18
+//	@param pars []interface{}
+//	@param keyword string
+//	@param num int
+//	@return newPars []interface{}
+func GetLikeKeywordPars(pars []interface{}, keyword string, num int) (newPars []interface{}) {
+	newPars = pars
+	if newPars == nil {
+		newPars = make([]interface{}, 0)
+	}
+	for i := 1; i <= num; i++ {
+		newPars = append(newPars, `%`+keyword+`%`)
+	}
+	return
+}

utils/config.go

@@ -10,7 +10,7 @@ import (
 var (
 	RunMode        string //运行模式
 	MYSQL_URL      string //数据库连接
-	MYSQL_URL_DATA string
+	MYSQL_URL_RDDP string
 )
 
 // 日志配置
@@ -24,6 +24,9 @@ var (
 	LogMaxDays int //日志最大保留天数
 )
 
+// BusinessCode 商家编码
+var BusinessCode string
+
 func init() {
 	tmpRunMode, err := web.AppConfig.String("run_mode")
 	if err != nil {
@@ -51,7 +54,7 @@ func init() {
 	}
 	beeLogger.Log.Info(RunMode + " 模式")
 	MYSQL_URL = config["mysql_url"]
-	MYSQL_URL_DATA = config["mysql_url_data"]
+	MYSQL_URL_RDDP = config["mysql_url_rddp"]
 
 	if RunMode == "release" {
 
@@ -69,4 +72,7 @@ func init() {
 		logMaxDaysStr := config["log_max_day"]
 		LogMaxDays, _ = strconv.Atoi(logMaxDaysStr)
 	}
+
+	// 商家编码
+	BusinessCode = config["business_code"]
 }