|
@@ -308,10 +308,10 @@ func GetArticleListByApi(cont context.Context) (err error) {
|
|
|
go utils.SendEmail(utils.APPNAME+"【"+utils.RunMode+"】"+"失败提醒", "GetArticleListByApi ErrMsg:"+err.Error(), utils.EmailSendToUsers)
|
|
|
}
|
|
|
}()
|
|
|
- url := "https://vmp.hzinsights.com/v2api/articles/mp?take=100&skip=0&publish_status=2,4&order=publish_date&sort=DESC"
|
|
|
+ requestUrl := "https://vmp.hzinsights.com/v2api/articles/mp?take=100&skip=0&publish_status=2,4&order=publish_date&sort=DESC"
|
|
|
method := "GET"
|
|
|
client := &nhttp.Client{}
|
|
|
- req, err := nhttp.NewRequest(method, url, nil)
|
|
|
+ req, err := nhttp.NewRequest(method, requestUrl, nil)
|
|
|
if err != nil {
|
|
|
fmt.Println("GetListApi Err:", err.Error())
|
|
|
return err
|
|
@@ -343,6 +343,12 @@ func GetArticleListByApi(cont context.Context) (err error) {
|
|
|
fmt.Println("GetlistMap Err:", err.Error())
|
|
|
return err
|
|
|
}
|
|
|
+ openIdList, err := models.GetUserRecordListByMobile(4, utils.ArticleTaskClassMobile)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println(err)
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ fmt.Println(openIdList)
|
|
|
//新旧分类 反向隐射,是否归类,是否是报告,是否是纪要库
|
|
|
for _, v := range listMap {
|
|
|
exitMap[v.Id] = v.OldId
|
|
@@ -580,11 +586,78 @@ func GetArticleListByApi(cont context.Context) (err error) {
|
|
|
item.MatchTypeName = matchTypeName
|
|
|
item.Stock = v.Stock
|
|
|
item.FieldName = v.FieldName
|
|
|
- _, err = models.AddCygxArticles(item)
|
|
|
+ newId, err := models.AddCygxArticles(item)
|
|
|
if err != nil {
|
|
|
fmt.Println("AddCygxArticle Err:", err.Error())
|
|
|
return err
|
|
|
}
|
|
|
+ if v.ReportType == 2 {
|
|
|
+ var subjectStr string
|
|
|
+ var industrialManagementIdStr string
|
|
|
+ var industrialSubjectIdStr string
|
|
|
+ var keyword1 string
|
|
|
+ var keyword2 string
|
|
|
+ var keyword3 string
|
|
|
+ var keyword4 string
|
|
|
+ sliceSubjects := strings.Split(v.Stock, "/")
|
|
|
+ mapManagementForSubject := make(map[string]string)
|
|
|
+ if len(sliceSubjects) > 0 {
|
|
|
+ for _, vSubject := range sliceSubjects {
|
|
|
+ sliceKuohao := strings.Split(vSubject, "(") //过滤括号
|
|
|
+ sliceXiahuaxian := strings.Split(sliceKuohao[0], "-") //过滤下划线
|
|
|
+ subject := sliceXiahuaxian[0]
|
|
|
+ subjectStr += "'" + subject + "',"
|
|
|
+ }
|
|
|
+ subjectStr = strings.TrimRight(subjectStr, ",")
|
|
|
+ if subjectStr != "" {
|
|
|
+ listIndustrial, err := models.GetIndustrialManagementForSubjecName(subjectStr)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("AddCygxArticle Err:", err.Error())
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ subjectStr = strings.Replace(subjectStr, "','", "】【", -1)
|
|
|
+ subjectStr = strings.Replace(subjectStr, "'", "", -1)
|
|
|
+ subjectStr = "【" + subjectStr + "】"
|
|
|
+ if len(listIndustrial) > 0 {
|
|
|
+ for _, vIndustrial := range listIndustrial {
|
|
|
+ industrialManagementIdStr += strconv.Itoa(vIndustrial.IndustrialManagementId) + ","
|
|
|
+ industrialSubjectIdStr += strconv.Itoa(vIndustrial.IndustrialSubjectId) + ","
|
|
|
+ mapManagementForSubject[vIndustrial.IndustryName] += vIndustrial.SubjectName + "/"
|
|
|
+ }
|
|
|
+ industrialManagementIdStr = strings.TrimRight(industrialManagementIdStr, ",")
|
|
|
+ industrialSubjectIdStr = strings.TrimRight(industrialSubjectIdStr, ",")
|
|
|
+ if industrialManagementIdStr != "" {
|
|
|
+ err = models.ReportArticleClassificationEditNew(int(newId), industrialManagementIdStr, v.ArticleId, industrialSubjectIdStr)
|
|
|
+ if err != nil {
|
|
|
+ fmt.Println("ReportArticleClassificationEditNew Err:", err.Error())
|
|
|
+ //keyword1 = "新报告产业标签:【" + v.FieldName + "】,个股标签:" + subjectStr
|
|
|
+ //keyword2 = "归类失败"
|
|
|
+ //keyword3 = v.Title
|
|
|
+ //keyword4 = v.PublishDate.Format(utils.FormatDateTime)
|
|
|
+ //SendWxMsgWithArticleClassToAdmin(keyword1, keyword2, keyword3, keyword4, openIdList, articleIdInt)
|
|
|
+ return err
|
|
|
+ }
|
|
|
+ }
|
|
|
+
|
|
|
+ var peoductName string
|
|
|
+ for mk, mv := range mapManagementForSubject {
|
|
|
+ peoductName += "【" + mk + "--" + strings.TrimRight(mv, "/") + "】"
|
|
|
+ }
|
|
|
+ keyword1 = "新报告产业标签:【" + v.FieldName + "】,个股标签:" + subjectStr
|
|
|
+ keyword2 = "已自动关联至以下产业和标的:" + peoductName
|
|
|
+ keyword3 = v.Title
|
|
|
+ keyword4 = v.PublishDate.Format(utils.FormatDateTime)
|
|
|
+ SendWxMsgWithArticleClassToAdmin(keyword1, keyword2, keyword3, keyword4, openIdList, articleIdInt)
|
|
|
+ } else {
|
|
|
+ keyword1 = "新报告产业标签:【" + v.FieldName + "】,个股标签:" + subjectStr
|
|
|
+ keyword2 = "未归类"
|
|
|
+ keyword3 = v.Title
|
|
|
+ keyword4 = v.PublishDate.Format(utils.FormatDateTime)
|
|
|
+ SendWxMsgWithArticleClassToAdmin(keyword1, keyword2, keyword3, keyword4, openIdList, articleIdInt)
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
return
|