|
@@ -280,20 +280,24 @@ func InitETAReportList(list []eta.ETAReport) (err error) {
|
|
|
logger.Error("获取研报二级品种信息失败:%v", err)
|
|
|
coverSrc = 0
|
|
|
} else {
|
|
|
- permissionsId := permissions[0].ChartPermissionID
|
|
|
- var ids []int
|
|
|
- ids, err = mediaDao.GetIdsByPermissionId(permissionsId)
|
|
|
- if err != nil {
|
|
|
- logger.Error("获取图片资源失败:%v", err)
|
|
|
- }
|
|
|
- if ids == nil || len(ids) == 0 {
|
|
|
- coverSrc = 0
|
|
|
- } else {
|
|
|
+ coverSrc = 0
|
|
|
+ for _, permission := range permissions {
|
|
|
+ permissionsId := permission.ChartPermissionID
|
|
|
+ var ids []int
|
|
|
+ ids, err = mediaDao.GetIdsByPermissionId(permissionsId)
|
|
|
+ if err != nil {
|
|
|
+ logger.Error("获取图片资源失败:%v", err)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if ids == nil || len(ids) == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
src := rand.NewSource(time.Now().UnixNano())
|
|
|
r := rand.New(src)
|
|
|
// 从切片中随机选择一个元素
|
|
|
randomIndex := r.Intn(len(ids))
|
|
|
coverSrc = ids[randomIndex]
|
|
|
+ break
|
|
|
}
|
|
|
}
|
|
|
destRp := convertEtaReport(etaRp, reportDao.StatusPublish)
|
|
@@ -329,21 +333,40 @@ func SyncETAReportList(list []eta.ETAReport) (err error) {
|
|
|
logger.Error("获取研报二级品种信息失败:%v", err)
|
|
|
coverSrc = 0
|
|
|
} else {
|
|
|
- permissionsId := permissions[0].ChartPermissionID
|
|
|
- var ids []int
|
|
|
- ids, err = mediaDao.GetIdsByPermissionId(permissionsId)
|
|
|
- if err != nil {
|
|
|
- logger.Error("获取图片资源失败:%v", err)
|
|
|
- }
|
|
|
- if ids == nil || len(ids) == 0 {
|
|
|
- coverSrc = 0
|
|
|
- } else {
|
|
|
+ coverSrc = 0
|
|
|
+ for _, permission := range permissions {
|
|
|
+ permissionsId := permission.ChartPermissionID
|
|
|
+ var ids []int
|
|
|
+ ids, err = mediaDao.GetIdsByPermissionId(permissionsId)
|
|
|
+ if err != nil {
|
|
|
+ logger.Error("获取图片资源失败:%v", err)
|
|
|
+ continue
|
|
|
+ }
|
|
|
+ if ids == nil || len(ids) == 0 {
|
|
|
+ continue
|
|
|
+ }
|
|
|
src := rand.NewSource(time.Now().UnixNano())
|
|
|
r := rand.New(src)
|
|
|
// 从切片中随机选择一个元素
|
|
|
randomIndex := r.Intn(len(ids))
|
|
|
coverSrc = ids[randomIndex]
|
|
|
+ break
|
|
|
}
|
|
|
+ //permissionsId := permissions[0].ChartPermissionID
|
|
|
+ //var ids []int
|
|
|
+ //ids, err = mediaDao.GetIdsByPermissionId(permissionsId)
|
|
|
+ //if err != nil {
|
|
|
+ // logger.Error("获取图片资源失败:%v", err)
|
|
|
+ //}
|
|
|
+ //if ids == nil || len(ids) == 0 {
|
|
|
+ // coverSrc = 0
|
|
|
+ //} else {
|
|
|
+ // src := rand.NewSource(time.Now().UnixNano())
|
|
|
+ // r := rand.New(src)
|
|
|
+ // // 从切片中随机选择一个元素
|
|
|
+ // randomIndex := r.Intn(len(ids))
|
|
|
+ // coverSrc = ids[randomIndex]
|
|
|
+ //}
|
|
|
}
|
|
|
//authorNames := strings.Split(etaRp.Author, ",")
|
|
|
//authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
|
|
@@ -500,12 +523,14 @@ func InitHTReportList(list []ht.HTReport) (noRecord bool, err error) {
|
|
|
destRp := convertHTReport(htRp, reportDao.StatusPublish)
|
|
|
//destRp.Author = authorName
|
|
|
var coverSrc int
|
|
|
- permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
|
|
|
+ var permissionId int
|
|
|
+ permissionId, err = etaDao.GetPermissionIdByName(htRp.PermissionName)
|
|
|
if err != nil {
|
|
|
logger.Error("HT获取eta品种id失败:%v", err)
|
|
|
coverSrc = 0
|
|
|
}
|
|
|
- ids, err := mediaDao.GetIdsByPermissionId(permissionId)
|
|
|
+ var ids []int
|
|
|
+ ids, err = mediaDao.GetIdsByPermissionId(permissionId)
|
|
|
if err != nil {
|
|
|
logger.Error("获取图片资源失败:%v", err)
|
|
|
coverSrc = 0
|
|
@@ -565,7 +590,8 @@ func SyncHTReportList(list []ht.HTReport) (noRecord bool, err error) {
|
|
|
destRp := convertHTReport(htRp, status)
|
|
|
//destRp.Author = authorName
|
|
|
var coverSrc int
|
|
|
- permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
|
|
|
+ var permissionId int
|
|
|
+ permissionId, err = etaDao.GetPermissionIdByName(htRp.PermissionName)
|
|
|
if err != nil {
|
|
|
logger.Error("HT获取eta品种id失败:%v", err)
|
|
|
coverSrc = 0
|