3232
This commit is contained in:
parent
f88977c98f
commit
d23a7fa6f9
|
|
@ -12,17 +12,18 @@ const TableNameCollect = "collect"
|
|||
|
||||
// Collect mapped from table <collect>
|
||||
type Collect struct {
|
||||
ID int64 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"`
|
||||
CollectCode string `gorm:"column:collect_code;not null" json:"collect_code"`
|
||||
ProductID int32 `gorm:"column:product_id;not null" json:"product_id"`
|
||||
Keywords string `gorm:"column:keywords;not null" json:"keywords"`
|
||||
Platform string `gorm:"column:platform;not null" json:"platform"`
|
||||
Question string `gorm:"column:question;not null" json:"question"`
|
||||
Progress int32 `gorm:"column:progress;not null" json:"progress"`
|
||||
EndFile string `gorm:"column:end_file;not null" json:"end_file"`
|
||||
CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP" json:"updated_at"`
|
||||
Status int32 `gorm:"column:status;not null;comment:1:生成中,2:生成完毕" json:"status"` // 1:生成中,2:生成完毕
|
||||
ID int64 `gorm:"column:id;primaryKey;autoIncrement:true" json:"id"`
|
||||
CollectCode string `gorm:"column:collect_code;not null" json:"collect_code"`
|
||||
ProductID int32 `gorm:"column:product_id;not null" json:"product_id"`
|
||||
Keywords string `gorm:"column:keywords;not null" json:"keywords"`
|
||||
Platform string `gorm:"column:platform;not null" json:"platform"`
|
||||
Question string `gorm:"column:question;not null" json:"question"`
|
||||
Progress int32 `gorm:"column:progress;not null" json:"progress"`
|
||||
ReportStatus int32 `gorm:"column:report_status;not null" json:"report_status"`
|
||||
EndFile string `gorm:"column:end_file;not null" json:"end_file"`
|
||||
CreatedAt time.Time `gorm:"column:created_at;not null;default:CURRENT_TIMESTAMP" json:"created_at"`
|
||||
UpdatedAt time.Time `gorm:"column:updated_at;not null;default:CURRENT_TIMESTAMP" json:"updated_at"`
|
||||
Status int32 `gorm:"column:status;not null;comment:1:生成中,2:生成完毕" json:"status"` // 1:生成中,2:生成完毕
|
||||
}
|
||||
|
||||
// TableName Collect's table name
|
||||
|
|
|
|||
|
|
@ -283,6 +283,7 @@ func (c *CollectService) CollectAan(ctx *fiber.Ctx, req *entitys.CollectAnaReque
|
|||
if collectInfo.ID == 0 {
|
||||
return errcode.NotFound("为找到收录计划")
|
||||
}
|
||||
err = c.collect.UpdateByKey(ctx.UserContext(), c.collect.PrimaryKey(), req.CollectId, map[string]interface{}{"report_status": 2})
|
||||
var tasks []model.CollectTask
|
||||
taskCond := builder.NewCond().And(builder.In("collect_code", collectInfo.CollectCode))
|
||||
_, err = c.collectTask.GetListToStruct(ctx.UserContext(), &taskCond, nil, &tasks, "created_at ASC")
|
||||
|
|
@ -310,12 +311,13 @@ func (c *CollectService) CollectAan(ctx *fiber.Ctx, req *entitys.CollectAnaReque
|
|||
}
|
||||
|
||||
docxPath, err := pkg.Md2wordFix(mdAbs, c.cfg.Sys.MdDir, nil)
|
||||
defer os.Remove(docxPath)
|
||||
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
docxName := fmt.Sprintf("%s.docx", fileBaseName)
|
||||
docxAbs := filepath.Join(docxPath, docxName)
|
||||
defer os.Remove(docxAbs)
|
||||
fileByte, err := pkg.ReadDocxToBytes(docxAbs)
|
||||
if err != nil {
|
||||
return err
|
||||
|
|
@ -325,7 +327,7 @@ func (c *CollectService) CollectAan(ctx *fiber.Ctx, req *entitys.CollectAnaReque
|
|||
if err != nil {
|
||||
return fmt.Errorf("上传文件失败: %w", err)
|
||||
}
|
||||
err = c.collect.UpdateByKey(ctx.UserContext(), c.collect.PrimaryKey(), req.CollectId, map[string]interface{}{"end_file": url})
|
||||
err = c.collect.UpdateByKey(ctx.UserContext(), c.collect.PrimaryKey(), req.CollectId, map[string]interface{}{"end_file": url, "report_status": 3})
|
||||
if err != nil {
|
||||
return err
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue