Merge branch 'feature/fix_report_log' into debug

controllers/report.go

@@ -1880,6 +1880,9 @@ func (this *ReportController) AddDayWeekReport() {
 		go models.ModifyReportCode(reportId, reportCode)
 	}
 
+	// 备份关键数据
+	go services.SaveReportLogs(item, chapterList, sysUser.AdminId, sysUser.RealName)
+
 	resp := new(models.AddResp)
 	resp.ReportId = reportId
 	resp.ReportCode = reportCode
@@ -2303,6 +2306,11 @@ func (this *ReportController) EditDayWeekChapter() {
 		return
 	}
 
+	// 备份关键数据
+	chapters := make([]*models.ReportChapter, 0)
+	chapters = append(chapters, reportChapterInfo)
+	go services.SaveReportLogs(nil, chapters, sysUser.AdminId, sysUser.RealName)
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "保存成功"

models/report.go

@@ -425,6 +425,24 @@ func AddReportSaveLog(reportId, adminId int, content, contentSub, adminName stri
 	return
 }
 
+func MultiAddReportChaptersSaveLog(items []*ReportChapter, adminId int, adminRealName string) (err error) {
+	o := orm.NewOrm()
+	p, err := o.Raw(`INSERT INTO report_save_log(report_id, report_chapter_id, content, content_sub, admin_id, admin_name) VALUES (?,?,?,?,?,?)`).Prepare()
+	if err != nil {
+		return
+	}
+	defer func() {
+		_ = p.Close()
+	}()
+	for _, v := range items {
+		_, err = p.Exec(v.ReportId, v.ReportChapterId, v.Content, v.ContentSub, adminId, adminRealName)
+		if err != nil {
+			return
+		}
+	}
+	return
+}
+
 type SaveReportContentResp struct {
 	ReportId int `description:"报告id"`
 }

services/report.go

@@ -259,6 +259,9 @@ func PublishDayWeekReport(reportId int) (tips string, err error) {
 	go func() {
 		_ = UpdateReportEs(report.Id, 2)
 	}()
+
+	// 发布时备份内容
+	go SaveReportLogs(report, chapters, report.AdminId, report.AdminRealName)
 	return
 }
 
@@ -1223,3 +1226,33 @@ func HandleVideoDecibel(chapterInfo *models.ReportChapter) {
 
 	return
 }
+
+// SaveReportLogs 记录报告日志
+func SaveReportLogs(item *models.Report, chapters []*models.ReportChapter, adminId int, adminRealName string) {
+	if item == nil && len(chapters) == 0 {
+		return
+	}
+	var err error
+	defer func() {
+		if err != nil {
+			tips := fmt.Sprintf("报告日志记录, SaveReportLogs error: %s", err.Error())
+			go alarm_msg.SendAlarmMsg(tips, 2)
+		}
+	}()
+
+	if item != nil {
+		e := models.AddReportSaveLog(item.Id, item.AdminId, item.Content, item.ContentSub, item.AdminRealName)
+		if e != nil {
+			err = fmt.Errorf("AddReportSaveLog: %s", e.Error())
+			return
+		}
+	}
+	if len(chapters) > 0 {
+		e := models.MultiAddReportChaptersSaveLog(chapters, adminId, adminRealName)
+		if e != nil {
+			err = fmt.Errorf("MultiAddReportChaptersSaveLog: %s", e.Error())
+			return
+		}
+	}
+	return
+}