查研观向6.3自动归类，添加相同产业或者标的时候，大的行业判断

models/industrial_management.go

@@ -382,13 +382,13 @@ func GetIndustrialManagementNewList(permissionName string) (items []*IndustrialM
 }
 
 //获取产业关联标的列表
-func GetIndustrialManagementForSubjecName(subjectName string) (items []*IndustrialSubject, err error) {
+func GetIndustrialManagementForSubjecName(subjectName string, chartPermissionId int) (items []*IndustrialSubject, err error) {
 	o := orm.NewOrm()
 	sql := `SELECT s.subject_name,s.industrial_subject_id,m.industrial_management_id,m.industry_name
 			FROM cygx_industrial_subject as s 
 			INNER JOIN cygx_industrial_management as m ON m.industrial_management_id = s.industrial_management_id
-			WHERE subject_name IN (` + subjectName + `)`
-	_, err = o.Raw(sql).QueryRows(&items)
+			WHERE subject_name IN (` + subjectName + `) AND m.chart_permission_id = ? `
+	_, err = o.Raw(sql, chartPermissionId).QueryRows(&items)
 	return
 }
 

models/report_mapping.go

@@ -9,6 +9,7 @@ type ReportMapping struct {
 	SubCategoryName     string `description:"主题"`
 	MatchTypeName       string `description:"分类名称"`
 	ChartPermissionName string `description:"行业名称"`
+	ChartPermissionId   int    `description:"行业ID"`
 	IsRed               bool   `description:"是否标红"`
 	PermissionType      int    `description:"1主观，2客观"`
 }

services/article.go

@@ -608,9 +608,15 @@ func GetArticleListByApi(cont context.Context) (err error) {
 						subject := sliceXiahuaxian[0]
 						subjectStr += "'" + subject + "',"
 					}
+					//获取该产业下所对应的行业图片
+					detailCategory, errCategory := models.GetdetailByCategoryIdOne(v.CategoryId)
+					if errCategory != nil {
+						fmt.Println("GetdetailByCategoryIdOne Err:", err.Error())
+						return err
+					}
 					subjectStr = strings.TrimRight(subjectStr, ",")
 					if subjectStr != "" {
-						listIndustrial, err := models.GetIndustrialManagementForSubjecName(subjectStr)
+						listIndustrial, err := models.GetIndustrialManagementForSubjecName(subjectStr, detailCategory.ChartPermissionId)
 						if err != nil {
 							fmt.Println("AddCygxArticle Err:", err.Error())
 							return err

utils/config.go

@@ -144,7 +144,7 @@ func init() {
 		WxMsgTemplateIdAskMsg = "PaoDanHGlt1kFw5q-4_ipJSwO3FyZpxSSNg4rwB7YCk"
 		WxMsgTemplateIdAskMsgMobile = ""
 		ActSendMsgMobile = "15618524605"
-		ArticleTaskClassMobile = "15557270714,18767183922"
+		ArticleTaskClassMobile = "15557270714,18767183922,15216736473,15000123056,18701809782"
 
 	} else {
 		WxAppId = "wxcc32b61f96720d2f"
@@ -173,7 +173,7 @@ func init() {
 		WxMsgTemplateIdAskMsg = "qfNuops-sKrfIkbA7U97A7gSrX03mUpoEpJksRUdloo"
 		WxMsgTemplateIdAskMsgMobile = "15557270714,17634786714,18767183922,17516315016"
 		ActSendMsgMobile = "17634786714"
-		ArticleTaskClassMobile = "15557270714,18767183922,13253777798"
+		ArticleTaskClassMobile = "15557270714,18767183922,17706316791"
 	}
 
 	//查研观向小助手