修复同步报告逻辑

domian/report/report_service.go

@@ -88,12 +88,12 @@ func GetGetReportById(reportId int) (ReportDTO ReportDTO, err error) {
 	if err != nil {
 		return
 	}
-	orgId := report.OrgID
-	names, _ := reportDao.GetAuthorByOrgId(orgId, string(report.Source))
-	if names != nil && len(names) > 1 {
-		names = stringUtils.UniqueItems(names)
-		report.Author = strings.Join(names, ",")
-	}
+	//orgId := report.OrgID
+	//names, _ := reportDao.GetAuthorByOrgId(orgId, string(report.Source))
+	//if names != nil && len(names) > 1 {
+	//	names = stringUtils.UniqueItems(names)
+	//	report.Author = strings.Join(names, ",")
+	//}
 	//report.PublishedTime = report.PublishedTime
 	ReportDTO = convertReportDTO(report, true)
 	return
@@ -269,37 +269,37 @@ func InitETAReportList(list []eta.ETAReport) (err error) {
 	logger.Info("同步研报数量%d", len(list))
 	var reports []reportDao.Report
 	for _, etaRp := range list {
-		authorNames := strings.Split(etaRp.Author, ",")
-		authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
-		for _, authorName := range authorNamesWithOutEmpty {
-			var coverSrc int
-			var permissions []etaDao.ChartPermission
-			permissions, err = etaDao.GetSecondPermissionsByClassifyID(etaRp.ClassifyID)
-			if err != nil || len(permissions) == 0 {
-				logger.Error("获取研报二级品种信息失败:%v", err)
+		//authorNames := strings.Split(etaRp.Author, ",")
+		//authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
+		//for _, authorName := range authorNamesWithOutEmpty {
+		var coverSrc int
+		var permissions []etaDao.ChartPermission
+		permissions, err = etaDao.GetSecondPermissionsByClassifyID(etaRp.ClassifyID)
+		if err != nil || len(permissions) == 0 {
+			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 {
-				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]
-				}
+				src := rand.NewSource(time.Now().UnixNano())
+				r := rand.New(src)
+				// 从切片中随机选择一个元素
+				randomIndex := r.Intn(len(ids))
+				coverSrc = ids[randomIndex]
 			}
-			destRp := convertEtaReport(etaRp)
-			destRp.Author = authorName
-			destRp.CoverSrc = coverSrc
-			reports = append(reports, destRp)
 		}
+		destRp := convertEtaReport(etaRp)
+		//destRp.Author = authorName
+		destRp.CoverSrc = coverSrc
+		reports = append(reports, destRp)
+		//}
 	}
 	err = reportDao.BatchInsertReport(&reports)
 	if err != nil {
@@ -314,14 +314,14 @@ func SyncETAReportList(list []eta.ETAReport) (err error) {
 	logger.Info("同步研报数量%d", len(list))
 	var reports []reportDao.Report
 	for _, etaRp := range list {
-		authorNames := strings.Split(etaRp.Author, ",")
-		authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
-		for _, authorName := range authorNamesWithOutEmpty {
-			destRp := convertEtaReport(etaRp)
-			destRp.Author = authorName
-			reports = append(reports, destRp)
-		}
-	}
+		//authorNames := strings.Split(etaRp.Author, ",")
+		//authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
+		//for _, authorName := range authorNamesWithOutEmpty {
+		destRp := convertEtaReport(etaRp)
+		//destRp.Author = authorName
+		reports = append(reports, destRp)
+	}
+	//}
 	var ids []int
 	ids, err = reportDao.InsertOrUpdateReport(&reports, SourceETA)
 	if err != nil {
@@ -417,36 +417,36 @@ func InitHTReportList(list []ht.HTReport) (noRecord bool, err error) {
 				if permission.AuthorNames != "" {
 					htRp.PublishUserName = permission.AuthorNames
 				}
-				authorNames := strings.Split(htRp.PublishUserName, ",")
-				authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
-				for _, authorName := range authorNamesWithOutEmpty {
-					destRp := convertHTReport(htRp)
-					destRp.Author = authorName
-					var coverSrc int
-					permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
-					if err != nil {
-						logger.Error("HT获取eta品种id失败:%v", err)
-						coverSrc = 0
-					}
-					ids, err := mediaDao.GetIdsByPermissionId(permissionId)
-					if err != nil {
-						logger.Error("获取图片资源失败:%v", err)
-						coverSrc = 0
-					}
-					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]
-					}
-					destRp.CoverSrc = coverSrc
-					destRp.PlateName = htRp.PermissionName
-					reports = append(reports, destRp)
+				//authorNames := strings.Split(htRp.PublishUserName, ",")
+				//authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
+				//for _, authorName := range authorNamesWithOutEmpty {
+				destRp := convertHTReport(htRp)
+				//destRp.Author = authorName
+				var coverSrc int
+				permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
+				if err != nil {
+					logger.Error("HT获取eta品种id失败:%v", err)
+					coverSrc = 0
+				}
+				ids, err := mediaDao.GetIdsByPermissionId(permissionId)
+				if err != nil {
+					logger.Error("获取图片资源失败:%v", err)
+					coverSrc = 0
 				}
+				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]
+				}
+				destRp.CoverSrc = coverSrc
+				destRp.PlateName = htRp.PermissionName
+				reports = append(reports, destRp)
 			}
+			//}
 		}
 	}
 	if len(reports) == 0 {
@@ -474,36 +474,36 @@ func SyncHTReportList(list []ht.HTReport) (noRecord bool, err error) {
 				if permission.AuthorNames != "" {
 					htRp.PublishUserName = permission.AuthorNames
 				}
-				authorNames := strings.Split(htRp.PublishUserName, ",")
-				authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
-				for _, authorName := range authorNamesWithOutEmpty {
-					destRp := convertHTReport(htRp)
-					destRp.Author = authorName
-					var coverSrc int
-					permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
-					if err != nil {
-						logger.Error("HT获取eta品种id失败:%v", err)
-						coverSrc = 0
-					}
-					ids, err := mediaDao.GetIdsByPermissionId(permissionId)
-					if err != nil {
-						logger.Error("获取图片资源失败:%v", err)
-						coverSrc = 0
-					}
-					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]
-					}
-					destRp.CoverSrc = coverSrc
-					destRp.PlateName = htRp.PermissionName
-					reports = append(reports, destRp)
+				//authorNames := strings.Split(htRp.PublishUserName, ",")
+				//authorNamesWithOutEmpty := stringUtils.RemoveEmptyStrings(authorNames)
+				//for _, authorName := range authorNamesWithOutEmpty {
+				destRp := convertHTReport(htRp)
+				//destRp.Author = authorName
+				var coverSrc int
+				permissionId, err := etaDao.GetPermissionIdByName(htRp.PermissionName)
+				if err != nil {
+					logger.Error("HT获取eta品种id失败:%v", err)
+					coverSrc = 0
+				}
+				ids, err := mediaDao.GetIdsByPermissionId(permissionId)
+				if err != nil {
+					logger.Error("获取图片资源失败:%v", err)
+					coverSrc = 0
+				}
+				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]
 				}
+				destRp.CoverSrc = coverSrc
+				destRp.PlateName = htRp.PermissionName
+				reports = append(reports, destRp)
 			}
+			//}
 		}
 	}
 	if len(reports) == 0 {

models/eta/eta_report.go

@@ -66,8 +66,9 @@ func GetETAReports(id int) (reports []ETAReport, err error) {
 			date, err = time.Parse(time.DateTime, reports[i].PublishTime)
 			if err != nil {
 				logger.Error("时间转换错误:%v", err)
+			} else {
+				reports[i].PublishedTime = date
 			}
-			reports[i].PublishedTime = date
 			setClassifyIdValue(&reports[i])
 		}
 	}
@@ -87,8 +88,9 @@ func GetUpdateETAReports() (reports []ETAReport, err error) {
 			date, err = time.Parse(time.DateTime, reports[i].PublishTime)
 			if err != nil {
 				logger.Error("时间转换错误:%v", err)
+			} else {
+				reports[i].PublishedTime = date
 			}
-			reports[i].PublishedTime = date
 			setClassifyIdValue(&reports[i])
 		}
 	}