Merge remote-tracking branch 'origin/debug' into debug

controllers/english_report/report.go

@@ -512,7 +512,7 @@ func (this *EnglishReportController) ListReport() {
 		fieldArr := []string{
 			"id", "add_type", "classify_id_first", "classify_name_first", "classify_id_second", "classify_name_second", "title", "abstract", "author",
 			"frequency", "create_time", "modify_time", "state", "publish_time", "pre_publish_time", "stage", "msg_is_send", "report_code", "pv", "share_url",
-			"pv_email", "email_state", "from_report_id", "key_takeaways", "admin_id", "admin_real_name", "approve_time",
+			"pv_email", "email_state", "from_report_id", "key_takeaways", "admin_id", "admin_real_name", "approve_time","detail_img_url","detail_pdf_url",
 		}
 		items, e := models.GetEnglishReportList(condition, pars, companyType, startSize, pageSize, fieldArr)
 		if e != nil {
@@ -753,6 +753,11 @@ func (this *EnglishReportController) PublishReport() {
 			go func() {
 				_ = services.UpdateEnglishReportEs(report.Id, 2)
 			}()
+
+			// 生成报告pdf和长图
+			if req.ReportUrl != "" {
+				go services.Report2pdfAndJpeg(req.ReportUrl, report.Id, 2)
+			}
 		} else {
 			// 从无审批切换为有审批, 状态重置
 			if e = models.ResetEnglishReportById(report.Id, state); tmpErr != nil {
@@ -852,6 +857,11 @@ func (this *EnglishReportController) PrePublishReport() {
 		return
 	}
 
+	// 生成报告pdf和长图
+	if req.ReportUrl != "" {
+		go services.Report2pdfAndJpeg(req.ReportUrl, report.Id, 2)
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "定时发布成功"

controllers/report.go

@@ -364,6 +364,11 @@ func (this *ReportController) PublishReport() {
 			go func() {
 				_, _ = models.AddReportStateRecord(recordItem)
 			}()
+
+			// 生成报告pdf和长图
+			if req.ReportUrl != "" {
+				go services.Report2pdfAndJpeg(req.ReportUrl, report.Id, 1)
+			}
 		}
 	}
 	// 发布晨周报部分章节未发布的提示
@@ -3458,6 +3463,11 @@ func (this *ReportController) PrePublishReport() {
 		return
 	}
 
+	// 生成报告pdf和长图
+	if report.HasChapter != 1 && report.ChapterType != utils.REPORT_TYPE_DAY && report.ChapterType != utils.REPORT_TYPE_WEEK && req.ReportUrl != "" {
+		go services.Report2pdfAndJpeg(req.ReportUrl, report.Id, 1)
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "定时发布成功"

controllers/smart_report/smart_report.go

@@ -108,6 +108,9 @@ func (this *SmartReportController) Add() {
 	item.HeadImg = req.HeadImg
 	item.EndImg = req.EndImg
 	item.CanvasColor = req.CanvasColor
+	item.HeadResourceId = req.HeadResourceId
+	item.EndResourceId = req.EndResourceId
+	item.NeedSplice = 1
 
 	// 继承报告
 	if req.AddType == 2 {
@@ -244,7 +247,7 @@ func (this *SmartReportController) Edit() {
 		contentModify = true
 	}
 	cols := []string{"ClassifyIdFirst", "ClassifyNameFirst", "ClassifyIdSecond", "ClassifyNameSecond", "Title", "Abstract", "Author",
-		"Frequency", "Content", "ContentSub", "ContentStruct", "ModifyTime", "HeadImg", "EndImg", "CanvasColor"}
+		"Frequency", "Content", "ContentSub", "ContentStruct", "ModifyTime", "HeadImg", "EndImg", "CanvasColor","HeadResourceId", "EndResourceId"}
 	item.ClassifyIdFirst = req.ClassifyIdFirst
 	item.ClassifyNameFirst = req.ClassifyNameFirst
 	item.ClassifyIdSecond = req.ClassifyIdSecond
@@ -260,6 +263,8 @@ func (this *SmartReportController) Edit() {
 	item.HeadImg = req.HeadImg
 	item.EndImg = req.EndImg
 	item.CanvasColor = req.CanvasColor
+	item.HeadResourceId = req.HeadResourceId
+	item.EndResourceId = req.EndResourceId
 	if contentModify {
 		item.LastModifyAdminId = sysUser.AdminId
 		item.LastModifyAdminName = sysUser.RealName
@@ -272,6 +277,27 @@ func (this *SmartReportController) Edit() {
 		return
 	}
 	resp := smart_report.FormatSmartReport2Item(item)
+	if resp.HeadResourceId > 0 {
+		headResource, err := smart_report.GetResourceItemById(resp.HeadResourceId)
+		if err != nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取资源库版头失败, Err: " + e.Error()
+			return
+		}
+		resp.HeadImg = headResource.ImgUrl
+		resp.HeadStyle = headResource.Style
+	}
+
+	if resp.EndResourceId > 0 {
+		endResource, err := smart_report.GetResourceItemById(resp.EndResourceId)
+		if err != nil {
+			br.Msg = "操作失败"
+			br.ErrMsg = "获取资源库版头失败, Err: " + e.Error()
+			return
+		}
+		resp.EndImg = endResource.ImgUrl
+		resp.EndStyle = endResource.Style
+	}
 
 	br.Ret = 200
 	br.Success = true
@@ -496,10 +522,10 @@ func (this *SmartReportController) Publish() {
 		item.PrePublishTime = time.Time{}
 
 		// 写入队列
-		var queue smart_report.Report2ImgQueueReq
-		queue.ReportType = 2
-		queue.ReportCode = item.ReportCode
-		_ = utils.Rc.LPush(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, queue)
+		//var queue smart_report.Report2ImgQueueReq
+		//queue.ReportType = 2
+		//queue.ReportCode = item.ReportCode
+		//_ = utils.Rc.LPush(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, queue)
 	}
 
 	// 取消发布时同时清除掉Img和PDF的文件地址, 发布时间以及预发布时间
@@ -538,6 +564,11 @@ func (this *SmartReportController) Publish() {
 		go func() {
 			_ = services.SmartReportElasticUpsert(item.SmartReportId, models.ReportStatePublished)
 		}()
+
+		// 生成报告pdf和长图
+		if req.ReportUrl != "" {
+			go services.Report2pdfAndJpeg(req.ReportUrl, item.SmartReportId, 3)
+		}
 	}
 	if state == smart_report.SmartReportStateWaitPublish {
 		// ES更新报告
@@ -651,6 +682,11 @@ func (this *SmartReportController) PrePublish() {
 		return
 	}
 
+	// 生成报告pdf和长图
+	if req.ReportUrl != "" {
+		go services.Report2pdfAndJpeg(req.ReportUrl, item.SmartReportId, 3)
+	}
+
 	br.Ret = 200
 	br.Success = true
 	br.Msg = "操作成功"
@@ -834,7 +870,9 @@ func (this *SmartReportController) SaveContent() {
 		item.HeadImg = req.HeadImg
 		item.EndImg = req.EndImg
 		item.CanvasColor = req.CanvasColor
-		cols := []string{"Content", "ContentSub", "ContentStruct", "ContentModifyTime", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime", "HeadImg", "EndImg", "CanvasColor"}
+		item.HeadResourceId = req.HeadResourceId
+		item.EndResourceId = req.EndResourceId
+		cols := []string{"Content", "ContentSub", "ContentStruct", "ContentModifyTime", "LastModifyAdminId", "LastModifyAdminName", "ModifyTime", "HeadImg", "EndImg", "CanvasColor","HeadResourceId", "EndResourceId"}
 		if e = item.Update(cols); e != nil {
 			br.Msg = "操作失败"
 			br.ErrMsg = "更新报告内容失败"
@@ -1148,7 +1186,7 @@ func (this *SmartReportController) DetailImg() {
 	var queue smart_report.Report2ImgQueueReq
 	queue.ReportType = 2
 	queue.ReportCode = item.ReportCode
-	_ = utils.Rc.LPush(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, queue)
+	//_ = utils.Rc.LPush(utils.CACHE_CREATE_REPORT_IMGPDF_QUEUE, queue)
 
 	br.Msg = "图片正在生成中, 请稍后下载"
 	return
@@ -1527,107 +1565,4 @@ func (this *SmartReportController) CancelApprove() {
 	br.Msg = "操作成功"
 }
 
-// GetReportPdfUrl
-// @Title 研报生成pdf和图片
-// @Description 研报生成pdf和图片接口
-// @Success 200 {object} smart_report.SmartReportListResp
-// @router /get_pdf_url [post]
-func (this *SmartReportController) GetReportPdfUrl() {
-	br := new(models.BaseResponse).Init()
-	defer func() {
-		if br.ErrMsg == "" {
-			br.IsSendEmail = false
-		}
-		this.Data["json"] = br
-		this.ServeJSON()
-	}()
-
-	sysUser := this.SysUser
-	if sysUser == nil {
-		br.Msg = "请登录"
-		br.ErrMsg = "请登录，SysUser Is Empty"
-		return
-	}
-
-	var req models.GetReportPdfUrlReq
-	if e := json.Unmarshal(this.Ctx.Input.RequestBody, &req); e != nil {
-		br.Msg = "参数有误"
-		br.ErrMsg = "参数解析失败, Err: " + e.Error()
-		return
-	}
-	if req.ReportUrl == "" {
-		br.Msg = "参数有误"
-		br.ErrMsg = "报告链接有误"
-		return
-	}
-
-	if req.Type != 1 && req.Type != 2 {
-		br.Msg = "参数有误"
-		br.ErrMsg = "获取资源类型有误"
-		return
-	}
 
-	filePath := `./static/` + req.ReportCode
-	var err error
-	if req.Type == 1 {
-		filePath += ".pdf"
-		err = services.ReportToPdf(req.ReportUrl, filePath)
-		if err != nil {
-			br.Msg = "转换失败"
-			br.ErrMsg = "报告转PDF失败,Err:" + err.Error()
-			return
-		}
-	} else {
-		filePath += ".jpeg"
-		err = services.ReportToJpeg(req.ReportUrl, filePath)
-		if err != nil {
-			br.Msg = "转换失败"
-			br.ErrMsg = "报告转图片失败,Err:" + err.Error()
-			return
-		}
-	}
-
-	file, err := os.Open(filePath)
-	if err != nil {
-		fmt.Println("Error:", err)
-		return
-	}
-
-
-	ext := path.Ext(file.Name())
-	//dateDir := time.Now().Format("20060102")
-	//uploadDir := utils.STATIC_DIR + "hongze/" + dateDir
-	//err = os.MkdirAll(uploadDir, utils.DIR_MOD)
-	//if err != nil {
-	//	br.Msg = "存储目录创建失败"
-	//	br.ErrMsg = "存储目录创建失败,Err:" + err.Error()
-	//	return
-	//}
-	randStr := utils.GetRandStringNoSpecialChar(28)
-	fileName := randStr + ext
-	//fpath := utils.STATIC_DIR + "/" + fileName
-	defer file.Close() //关闭上传文件
-
-	resourceUrl := ``
-	ossClient := services.NewOssClient()
-	if ossClient == nil {
-		br.Msg = "上传失败"
-		br.ErrMsg = "初始化OSS服务失败"
-		return
-	}
-	resourceUrl, err = ossClient.UploadFile(fileName, filePath, "")
-	if err != nil {
-		br.Msg = "文件上传失败"
-		br.ErrMsg = "文件上传失败，Err:" + err.Error()
-		return
-	}
-	defer func() {
-		_ = os.Remove(filePath)
-	}()
-
-
-	br.Ret = 200
-	br.Success = true
-	br.Data = resourceUrl
-	br.Msg = "操作成功"
-}

controllers/smart_report/smart_resource.go

@@ -102,7 +102,7 @@ func (this *SmartReportResourceController) List() {
 	startSize = utils.StartIndex(params.CurrentIndex, params.PageSize)
 
 	fields := []string{
-		"resource_id", "create_time", "img_name", "img_url", "type",
+		"resource_id", "create_time", "img_name", "img_url", "type","style",
 	}
 	list, e := reportOB.GetPageItemsByCondition(condition, pars, fields, startSize, params.PageSize)
 	if e != nil {
@@ -120,13 +120,13 @@ func (this *SmartReportResourceController) List() {
 	br.Data = resp
 }
 
-// Rename
-// @Title 重命名
-// @Description 重命名
+// Edit
+// @Title 编辑
+// @Description 编辑
 // @Param	request	body smart_report.SmartReportPublishReq true "type json string"
 // @Success 200 string "操作成功"
-// @router /resource/rename [post]
-func (this *SmartReportResourceController) Rename() {
+// @router /resource/edit [post]
+func (this *SmartReportResourceController) Edit() {
 	br := new(models.BaseResponse).Init()
 	defer func() {
 		if br.ErrMsg == "" {
@@ -142,7 +142,7 @@ func (this *SmartReportResourceController) Rename() {
 		br.Ret = 408
 		return
 	}
-	var req smart_report.SmartReportRenameReq
+	var req smart_report.SmartReportResourceEditReq
 	err := json.Unmarshal(this.Ctx.Input.RequestBody, &req)
 	if err != nil {
 		br.Msg = "参数解析异常！"
@@ -167,8 +167,10 @@ func (this *SmartReportResourceController) Rename() {
 		return
 	}
 
-	cols := []string{"ImgName"}
+	cols := []string{"ImgName","Style"}
 	item.ImgName = req.ImgName
+	item.Style = req.Style
+
 
 	if e = item.Update(cols); e != nil {
 		br.Msg = "操作失败"
@@ -294,6 +296,7 @@ func (this *SmartReportResourceController) Add() {
 	item.ImgName = req.ImgName
 	item.ImgUrl = req.ImgUrl
 	item.CreateTime = time.Now().Local()
+	item.Style = req.Style
 
 	if e := item.Create(); e != nil {
 		br.Msg = "操作失败"

controllers/sys_admin.go

@@ -122,3 +122,22 @@ func (this *SysAdminController) ConfigLanguage() {
 	br.Success = true
 	br.Msg = "获取成功"
 }
+
+// Detail
+// @Title 用户详情信息
+// @Description 用户详情信息
+// @Param	request	body system.SysuserAddReq true "type json string"
+// @Success 200 新增成功
+// @router /sysuser/detail [get]
+func (this *SysAdminController) Detail() {
+	br := new(models.BaseResponse).Init()
+	defer func() {
+		this.Data["json"] = br
+		this.ServeJSON()
+	}()
+
+	br.Data = this.SysUser
+	br.Ret = 200
+	br.Success = true
+	br.Msg = "获取成功"
+}

models/english_report.go

@@ -267,6 +267,8 @@ type EnglishReportList struct {
 	ClassifyIdRoot     int       `description:"顶级分类id"`
 	ClassifyNameRoot   string    `description:"顶级分类名称"`
 	ApproveTime        string    `description:"审批时间"`
+	DetailImgUrl       string    `description:"报告详情长图地址"`
+	DetailPdfUrl       string    `description:"报告详情PDF地址"`
 }
 
 type EnglishReportListResp struct {
@@ -913,3 +915,17 @@ func (classifyInfo *EnglishClassify) SetEnabled(id, enabled int) (err error) {
 	}
 	return
 }
+
+func ModifyEnglishReportPdfUrl(reportId int, detailPdfUrl string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE english_report SET detail_pdf_url=? WHERE id=? `
+	_, err = o.Raw(sql, detailPdfUrl, reportId).Exec()
+	return
+}
+
+func ModifyEnglishReportImgUrl(reportId int, detailImgUrl string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE english_report SET detail_img_url=? WHERE id=? `
+	_, err = o.Raw(sql, detailImgUrl, reportId).Exec()
+	return
+}

models/report.go

@@ -104,6 +104,8 @@ type ReportList struct {
 	AdminId            int                       `description:"创建者账号"`
 	AdminRealName      string                    `description:"创建者姓名"`
 	ApproveTime        string                    `description:"审批时间"`
+	DetailImgUrl       string                    `description:"报告详情长图地址"`
+	DetailPdfUrl       string                    `description:"报告详情PDF地址"`
 }
 
 type ReportListResp struct {
@@ -224,6 +226,7 @@ type ReportDetail struct {
 	ThsMsgIsSend       int    `description:"客户群消息是否已发送，0:否，1:是"`
 	HasChapter         int    `description:"是否有章节 0-否 1-是"`
 	ChapterType        string `description:"章节类型 day-晨报 week-周报"`
+	ReportCode         string `description:"报告code"`
 }
 
 func GetReportById(reportId int) (item *ReportDetail, err error) {
@@ -279,6 +282,7 @@ func GetReportStageEdit(classifyIdFirst, classifyIdSecond, reportId int) (count
 
 type PublishReq struct {
 	ReportIds string `description:"报告id,多个用英文逗号隔开"`
+	ReportUrl string `description:"报告Url"`
 }
 
 type PublishCancelReq struct {
@@ -309,6 +313,7 @@ type PrePublishReq struct {
 	ReportId       int    `description:"报告id"`
 	PrePublishTime string `description:"预发布时间"`
 	PreMsgSend     int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
+	ReportUrl      string `description:"报告Url"`
 }
 
 type AddResp struct {
@@ -1155,10 +1160,16 @@ func UpdateReportsStateBySecondIds(oldState, newState int, secondIds []int) (err
 	return
 }
 
-
-// GetReportPdfUrlReq 获取报告pdf地址请求体
-type GetReportPdfUrlReq struct {
-	ReportUrl  string `description:"报告Url"`
-	ReportCode string `description:"报告Code"`
-	Type       int    `description:"类型 1-pdf 2-图片"`
+func ModifyReportPdfUrl(reportId int, detailPdfUrl string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET detail_pdf_url=? WHERE id=? `
+	_, err = o.Raw(sql, detailPdfUrl, reportId).Exec()
+	return
 }
+
+func ModifyReportImgUrl(reportId int, detailImgUrl string) (err error) {
+	o := orm.NewOrmUsingDB("rddp")
+	sql := `UPDATE report SET detail_img_url=? WHERE id=? `
+	_, err = o.Raw(sql, detailImgUrl, reportId).Exec()
+	return
+}

models/smart_report/smart_report.go

@@ -58,11 +58,9 @@ type SmartReport struct {
 	CanvasColor         string    `description:"画布颜色"`
 	ApproveTime         time.Time `description:"审批时间"`
 	ApproveId           int       `description:"审批ID"`
-	NeedSplice          int     `description:"0-不需要 1-需要"`
-	HeadResourceId      int     `description:"版头资源ID"`
-	EndResourceId       int     `description:"版尾资源ID"`
-	HeadStyle           string  `description:"版头样式"`
-	EndStyle            string  `description:"版尾样式"`
+	NeedSplice          int       `description:"0-不需要 1-需要"`
+	HeadResourceId      int       `description:"版头资源ID"`
+	EndResourceId       int       `description:"版尾资源ID"`
 }
 
 func (m *SmartReport) TableName() string {
@@ -293,17 +291,21 @@ type SmartReportAddReq struct {
 	HeadImg            string `description:"报告头图地址"`
 	EndImg             string `description:"报告尾图地址"`
 	CanvasColor        string `description:"画布颜色"`
+	HeadResourceId     int    `description:"版头资源ID"`
+	EndResourceId      int    `description:"版尾资源ID"`
 }
 
 // SmartReportEditReq 编辑智能研报请求体
 type SmartReportEditReq struct {
 	SmartReportAddReq
-	SmartReportId int    `description:"智能研报ID"`
-	Content       string `description:"内容"`
-	ContentStruct string `description:"内容结构"`
-	HeadImg       string `description:"报告头图地址"`
-	EndImg        string `description:"报告尾图地址"`
-	CanvasColor   string `description:"画布颜色"`
+	SmartReportId  int    `description:"智能研报ID"`
+	Content        string `description:"内容"`
+	ContentStruct  string `description:"内容结构"`
+	HeadImg        string `description:"报告头图地址"`
+	EndImg         string `description:"报告尾图地址"`
+	CanvasColor    string `description:"画布颜色"`
+	HeadResourceId int    `description:"版头资源ID"`
+	EndResourceId  int    `description:"版尾资源ID"`
 }
 
 // SmartReportRemoveReq 删除智能研报请求体
@@ -313,8 +315,9 @@ type SmartReportRemoveReq struct {
 
 // SmartReportPublishReq 发布智能研报请求体
 type SmartReportPublishReq struct {
-	SmartReportId int `description:"智能研报ID"`
-	PublishState  int `description:"1-取消发布; 2-发布"`
+	SmartReportId int    `description:"智能研报ID"`
+	PublishState  int    `description:"1-取消发布; 2-发布"`
+	ReportUrl     string `description:"报告Url"`
 }
 
 // SmartReportPrePublishReq 预发布智能研报请求体
@@ -322,17 +325,20 @@ type SmartReportPrePublishReq struct {
 	SmartReportId  int    `description:"智能研报ID"`
 	PrePublishTime string `description:"预发布时间"`
 	PreMsgSend     int    `description:"定时发布成功后是否立即推送模版消息：0否，1是"`
+	ReportUrl      string `description:"报告Url"`
 }
 
 // SmartReportSaveContentReq 保存草稿请求体
 type SmartReportSaveContentReq struct {
-	SmartReportId int    `description:"智能研报ID"`
-	Content       string `description:"内容"`
-	ContentStruct string `description:"内容结构"`
-	NoChange      int    `description:"内容是否未改变：1：内容未改变"`
-	HeadImg       string `description:"报告头图地址"`
-	EndImg        string `description:"报告尾图地址"`
-	CanvasColor   string `description:"画布颜色"`
+	SmartReportId  int    `description:"智能研报ID"`
+	Content        string `description:"内容"`
+	ContentStruct  string `description:"内容结构"`
+	NoChange       int    `description:"内容是否未改变：1：内容未改变"`
+	HeadImg        string `description:"报告头图地址"`
+	EndImg         string `description:"报告尾图地址"`
+	CanvasColor    string `description:"画布颜色"`
+	HeadResourceId int    `description:"版头资源ID"`
+	EndResourceId  int    `description:"版尾资源ID"`
 }
 
 // SmartReportSaveContentResp 保存草稿响应体

models/smart_report/smart_resource.go

@@ -52,6 +52,7 @@ type SmartReportResourceItem struct {
 	ResourceId int    `orm:"column(resource_id);pk" description:"智能研报资源ID"`
 	ImgUrl     string // 图片链接
 	ImgName    string // 图片名称
+	Style      string    // 版图样式
 	Type       int    // 类型 1-版头 2-版尾
 	CreateTime string // 创建时间
 }
@@ -82,10 +83,11 @@ func (m *SmartReportResource) GetPageItemsByCondition(condition string, pars []i
 	return
 }
 
-// SmartReportRenameReq 智能研报资源重命名请求体
-type SmartReportRenameReq struct {
+// SmartReportResourceEditReq 智能研报资源编辑请求体
+type SmartReportResourceEditReq struct {
 	ResourceId int    `description:"资源ID"`
 	ImgName    string `description:"图片名称"`
+	Style      string `description:"版图样式"`
 }
 
 func (m *SmartReportResource) GetItemById(id int) (item *SmartReportResource, err error) {
@@ -105,6 +107,7 @@ type SmartReportResourceAddReq struct {
 	Type    int    `description:"类型 1-版头 2-版尾"`
 	ImgUrl  string `description:"图片链接"`
 	ImgName string `description:"图片名称"`
+	Style   string `description:"版图样式"`
 }
 
 func GetResourceItemById(id int) (item *SmartReportResource, err error) {

routers/commentsRouter.go

@@ -3778,15 +3778,6 @@ func init() {
             Filters: nil,
             Params: nil})
 
-    beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportController"],
-        beego.ControllerComments{
-            Method: "GetReportPdfUrl",
-            Router: `/get_pdf_url`,
-            AllowHTTPMethods: []string{"post"},
-            MethodParams: param.Make(),
-            Filters: nil,
-            Params: nil})
-
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportController"],
         beego.ControllerComments{
             Method: "LastPublishedReport",
@@ -3879,26 +3870,26 @@ func init() {
 
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"],
         beego.ControllerComments{
-            Method: "List",
-            Router: `/resource/list`,
-            AllowHTTPMethods: []string{"get"},
+            Method: "Edit",
+            Router: `/resource/edit`,
+            AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})
 
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"],
         beego.ControllerComments{
-            Method: "Remove",
-            Router: `/resource/remove`,
-            AllowHTTPMethods: []string{"post"},
+            Method: "List",
+            Router: `/resource/list`,
+            AllowHTTPMethods: []string{"get"},
             MethodParams: param.Make(),
             Filters: nil,
             Params: nil})
 
     beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers/smart_report:SmartReportResourceController"],
         beego.ControllerComments{
-            Method: "Rename",
-            Router: `/resource/rename`,
+            Method: "Remove",
+            Router: `/resource/remove`,
             AllowHTTPMethods: []string{"post"},
             MethodParams: param.Make(),
             Filters: nil,
@@ -5443,6 +5434,15 @@ func init() {
             Filters: nil,
             Params: nil})
 
+    beego.GlobalControllerRouter["eta/eta_mobile/controllers:SysAdminController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:SysAdminController"],
+        beego.ControllerComments{
+            Method: "Detail",
+            Router: `/sysuser/detail`,
+            AllowHTTPMethods: []string{"get"},
+            MethodParams: param.Make(),
+            Filters: nil,
+            Params: nil})
+
     beego.GlobalControllerRouter["eta/eta_mobile/controllers:SysMenuController"] = append(beego.GlobalControllerRouter["eta/eta_mobile/controllers:SysMenuController"],
         beego.ControllerComments{
             Method: "SysMenuList",

services/smart_report.go

@@ -8,7 +8,9 @@ import (
 	"eta/eta_mobile/utils"
 	"fmt"
 	"html"
+	"os"
 	"os/exec"
+	"path"
 	"strconv"
 	"time"
 )
@@ -136,48 +138,55 @@ func ReportToPdf(reportUrl, filePath string) (err error) {
 import asyncio
 from pyppeteer import launch
 
-async def main():
-    
-    browser = await launch({
+@asyncio.coroutine
+def main():
+    # 异步代码
+    browser = yield from launch({
         'executablePath': '%s',
-        'headless': True
+        'headless': True,
+        'args': ['--disable-infobars', '--no-sandbox']
     })
-    page = await browser.newPage()
-    await page.setViewport({
+    page = yield from browser.newPage()
+    yield from page.setViewport({
         'width': 1920,
         'height': 1080,
     })
-	# 对于大的PDF生成，可能会时间很久，这里规定不会进行超时处理
-    # await page.setDefaultNavigationTimeout(0)
-	# 不再有网络连接时触发
-    await page.goto('%s',{
-        'waitUntil':'networkidle0'
+    yield from page.goto('%s', {
+        'waitUntil': 'networkidle0',
+        'timeout': 1000000  # 设置超时时间为 100 秒
     })
-    
-
-    await page.pdf({
+    yield from page.pdf({
         'path': "%s",
         'printBackground': True,
         'format': "A2",
-        'displayHeaderFooter':True,
-        # 'headerTemplate':'<div></div>',
-        # 'footerTemplate':"<div style='width:100%;text-align:center;font-size:16px'><span class='pageNumber''></span></div>",
         'margin': {
-            'top': 100,
-            'bottom': 100,
-            'left':0,
-            'right':0
+            'top': '10mm',
+            'bottom': '10mm',
+            'left': '10mm',
+            'right': '10mm'
         }
     })
-    await browser.close()
+    yield from browser.close()
 
-asyncio.run(main())
-`
+# 创建事件循环
+loop = asyncio.get_event_loop()
 
-	pyCode = fmt.Sprintf(pyCode, utils.ChromeDrivePath, reportUrl, filePath)
+# 使用事件循环运行main函数
+try:
+    loop.run_until_complete(main())
+finally:
+    # 关闭事件循环
+    loop.close()
+`
 
+	pyCode = fmt.Sprintf(pyCode, utils.ChromePath, reportUrl, filePath)
+	utils.FileLog.Info("pdf pyCode: \n" + pyCode)
 	cmd := exec.Command("python3", "-c", pyCode)
 	_, err = cmd.CombinedOutput()
+	if err != nil {
+		utils.FileLog.Info("ReportToPdf failed: , error: \n" + err.Error())
+		go alarm_msg.SendAlarmMsg("ReportToPdf failed："+err.Error(), 3)
+	}
 	defer func() {
 		cmd.Process.Kill()
 	}()
@@ -187,45 +196,204 @@ asyncio.run(main())
 func ReportToJpeg(reportUrl, filePath string) (err error) {
 	pyCode := `
 import asyncio
-from pyppeteer import launch
+from pyppeteer import launch, errors
 
 async def main():
-    
-    browser = await launch({
-        'executablePath': '%s',
-        'headless': True
-    })
-    page = await browser.newPage()
-    await page.setViewport({
-        'width': 1920,
-        'height': 1080,
-    })
-	# 对于大的PDF生成，可能会时间很久，这里规定不会进行超时处理
-    # await page.setDefaultNavigationTimeout(0)
-	# 不再有网络连接时触发    
-	await page.goto('%s',{
-        'waitUntil':'networkidle0'
-    })
-    # Customizing footer for page numbers starting from page 2
+    try:
+        # 启动浏览器
+        browser = await launch({
+            'executablePath': '%s',
+            'headless': True,
+            'args': ['--disable-infobars', '--no-sandbox']
+        })
+        
+        # 新建页面
+        page = await browser.newPage()
+        
+        # 设置视口大小
+        await page.setViewport({
+            'width': 1920,
+            'height': 1080
+        })
+        
+        # 导航到页面
+        await page.goto('%s', {
+            'waitUntil': 'networkidle0',
+            'timeout': 1000000  # 设置超时时间为 100 秒
+        })
+        
+        # 截取全页面的屏幕截图
+        await page.screenshot({
+            'path': "%s",
+            'fullPage': True,
+        })
+        
+    except errors.BrowserError as e:
+        print('Browser closed unexpectedly:', e)
+    except Exception as e:
+        print('An error occurred:', e)
+    finally:
+        # 确保浏览器关闭
+        if browser is not None:
+            await browser.close()
 
-    await page.screenshot({
-        'path': "%s",
-        'type': "jpeg",
-        'fullPage': True,
-    })
-    await browser.close()
+# 获取当前事件循环
+loop = asyncio.get_event_loop()
 
-asyncio.run(main())
+# 运行事件循环直到main协程完成
+try:
+    loop.run_until_complete(main())
+except Exception as e:
+    print('Error during event loop execution:', e)
+finally:
+    # 关闭事件循环
+    loop.close()
 `
 
-	pyCode = fmt.Sprintf(pyCode, utils.ChromeDrivePath, reportUrl, filePath)
-
+	pyCode = fmt.Sprintf(pyCode, utils.ChromePath, reportUrl, filePath)
+	utils.FileLog.Info("jpeg pyCode: \n" + pyCode)
 	cmd := exec.Command("python3", "-c", pyCode)
 
 	_, err = cmd.CombinedOutput()
+	if err != nil {
+		utils.FileLog.Info("ReportToJpeg failed: , error: \n" + err.Error())
+		go alarm_msg.SendAlarmMsg("ReportToJpeg failed："+err.Error(), 3)
+	}
 	defer func() {
 		cmd.Process.Kill()
 	}()
 	return
 }
 
+func Report2pdfAndJpeg(reportUrl string, reportId,reportType int) {
+	var err error
+
+	defer func() {
+		if err != nil {
+			go alarm_msg.SendAlarmMsg("Report2pdfAndJpeg failed："+err.Error(), 3)
+			utils.FileLog.Info("Report2pdfAndJpeg failed: , error: \n" + err.Error())
+		}
+	}()
+	reportCode := utils.MD5(strconv.Itoa(reportId))
+
+	pdfPath := `./static/` + reportCode + ".pdf"
+	jpegPath := `./static/` + reportCode + ".jpeg"
+
+	go func() {
+		err := ReportToPdf(reportUrl, pdfPath)
+		if err != nil {
+			utils.FileLog.Info("ReportToPdf failed: , error: \n" + err.Error())
+			go alarm_msg.SendAlarmMsg("ReportToPdf failed："+err.Error(), 3)
+		}
+
+		file, err := os.Open(pdfPath)
+		if err != nil {
+			utils.FileLog.Info("Open failed: , error: \n" + err.Error())
+			go alarm_msg.SendAlarmMsg("Open failed："+err.Error(), 3)
+			return
+		}
+
+		ext := path.Ext(file.Name())
+
+		randStr := utils.GetRandStringNoSpecialChar(28)
+		fileName := randStr + ext
+		defer file.Close() //关闭上传文件
+
+		resourceUrl := ``
+		ossClient := NewOssClient()
+		if ossClient == nil {
+			utils.FileLog.Info("初始化OSS服务失败")
+			return
+		}
+		resourceUrl, err = ossClient.UploadFile(fileName, pdfPath, "")
+		if err != nil {
+			utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
+			go alarm_msg.SendAlarmMsg("文件上传失败："+err.Error(), 3)
+			return
+		}
+		defer func() {
+			_ = os.Remove(pdfPath)
+		}()
+
+		if reportType == 3 {
+			// 更新pdf url
+			ob := new(smart_report.SmartReport)
+			ob.SmartReportId = reportId
+			ob.DetailPdfUrl = resourceUrl
+			if err = ob.Update([]string{"DetailPdfUrl"}); err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		} else if reportType == 2 {
+			err = models.ModifyEnglishReportPdfUrl(reportId, resourceUrl)
+			if err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		} else if reportType == 1 {
+			err = models.ModifyReportPdfUrl(reportId, resourceUrl)
+			if err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		}
+
+	}()
+
+	go func() {
+		err := ReportToJpeg(reportUrl, jpegPath)
+		if err != nil {
+			utils.FileLog.Info("ReportToJpeg failed: , error: \n" + err.Error())
+		}
+		file, err := os.Open(jpegPath)
+		if err != nil {
+			utils.FileLog.Info("open file failed: , error: \n" + err.Error())
+			return
+		}
+
+		ext := path.Ext(file.Name())
+
+		randStr := utils.GetRandStringNoSpecialChar(28)
+		fileName := randStr + ext
+		defer file.Close() //关闭上传文件
+
+		resourceUrl := ``
+		ossClient := NewOssClient()
+		if ossClient == nil {
+			utils.FileLog.Info("初始化OSS服务失败")
+			return
+		}
+		resourceUrl, err = ossClient.UploadFile(fileName, jpegPath, "")
+		if err != nil {
+			utils.FileLog.Info("文件上传失败， Err: \n" + err.Error())
+			return
+		}
+		defer func() {
+			_ = os.Remove(jpegPath)
+		}()
+
+		if reportType == 3 {
+			// 更新jpeg url
+			ob := new(smart_report.SmartReport)
+			ob.SmartReportId = reportId
+			ob.DetailImgUrl = resourceUrl
+			if err = ob.Update([]string{"DetailImgUrl"}); err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		} else if reportType == 2 {
+			err = models.ModifyEnglishReportImgUrl(reportId, resourceUrl)
+			if err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		} else if reportType == 1 {
+			err = models.ModifyReportImgUrl(reportId, resourceUrl)
+			if err != nil {
+				utils.FileLog.Info("更新研报失败， Err: \n" + err.Error())
+				return
+			}
+		}
+
+	}()
+}

utils/config.go

@@ -200,7 +200,7 @@ var (
 
 // chrome配置
 var (
-	ChromeDrivePath       string // chrome浏览器地址
+	ChromePath       string // chrome浏览器地址
 )
 
 func init() {
@@ -452,7 +452,7 @@ func init() {
 	BusinessCode = config["business_code"]
 
 	// chrome配置
-	ChromeDrivePath = config["chrome_drive_path"]
+	ChromePath = config["chrome_path"]
 
 	// 初始化ES
 	initEs()