Merge remote-tracking branch 'origin/master' into debug

# Conflicts:
#	services/report_push.go

models/report_view.go

@@ -80,7 +80,8 @@ func GetRddpReportViewersDetail(startTime, endTime string) (items []*ResearchRep
 			WHERE uvh.create_time >?
             AND uvh.create_time <=?
 			AND c.company_id NOT IN (1)
-			AND r.classify_name_first not in ("周报","大宗商品","月报","数据点评","会议纪要","年报合集","需求报告")
+			AND r.classify_name_first not in ("周报","大宗商品","数据点评","会议纪要","年报合集","需求报告")
+			AND r.classify_id_second not in (113,114,127,134,141,149)
 			ORDER BY uvh.create_time DESC
 `
 	o := orm.NewOrm()
@@ -158,7 +159,7 @@ FROM
 			WHERE uvh.create_time >?
             AND uvh.create_time <=?
 			AND c.company_id NOT IN (1)
-			AND r.classify_name_first = "月报"
+			AND r.classify_id_second in (113,114,127,134,141,149)
 			ORDER BY uvh.create_time DESC
 `
 	o := orm.NewOrm()

services/company_product.go

@@ -485,7 +485,7 @@ func StaticCompanyTryDay(cont context.Context) (err error) {
 	for _, v := range list {
 		isAdd := false //是否要增加一天，默认不加
 		permissionList, tmpErr := models.GetCompanyReportPermissionByStatus(v.CompanyId, v.ProductId, "试用")
-		if tmpErr == nil {
+		if tmpErr != nil {
 			errList = append(errList, fmt.Sprint("company_id:", v.CompanyId, ";product_id:", v.ProductId, "；寻找对应的试用品种失败，Err:", tmpErr))
 			continue
 		}

services/data/base_edb_lib.go

@@ -159,8 +159,16 @@ func EditPythonEdbData(param string) (resp *models.BaseResponse, err error) {
 	return
 }
 
+var count int64
+
 // postRefreshEdbData 刷新指标数据
 func postRefreshEdbData(param map[string]interface{}, urlStr string) (resp *models.BaseResponse, err error) {
+	count++
+
+	if count%2 == 0 {
+		utils.EDB_LIB_URL = "http://127.0.0.1:8300/edbapi/"
+	}
+
 	postUrl := utils.EDB_LIB_URL + urlStr
 	postData, err := json.Marshal(param)
 	if err != nil {

services/data/edb_info.go

@@ -602,6 +602,7 @@ func CheckThsDataInterface(cont context.Context) (err error) {
 
 // RefreshDataFromCalculateAll 刷新所有计算指标
 func RefreshDataFromCalculateAll() (err error) {
+	var errmsg string
 	defer func() {
 		if err != nil {
 			utils.FileLog.Info("RefreshDataFromCalculateAll Err:" + err.Error())
@@ -852,12 +853,16 @@ func RefreshDataFromCalculateAll() (err error) {
 		fmt.Println("RefreshEdbCalculateData", v.EdbInfoId, v.EdbCode, startDate)
 		result, err := RefreshEdbCalculateData(v.EdbInfoId, v.EdbCode, startDate)
 		if err != nil {
+			errmsg += v.EdbCode + ","
 			err = errors.New("RefreshEdbCalculateData Err:" + err.Error())
-			return err
+			//return err
+			continue
 		}
 		if result.Ret != 200 {
+			errmsg += v.EdbCode + ","
 			err = errors.New("RefreshEdbCalculateData err;msg:" + result.Msg + ";errMsg:" + result.ErrMsg)
-			return err
+			//return err
+			continue
 		}
 
 		//maxAndMinItem, err := data_manage.GetEdbInfoMaxAndMinInfo(source, edbCode)

services/report_push.go

@@ -148,6 +148,36 @@ var permissionMap map[string]string = map[string]string{
 	"黑色百家谈":     "钢材,铁矿,双焦（焦煤、焦炭）",
 }
 
+// permissionLabelMap 品种与同花顺标签的映射关系
+var permissionLabelMap = map[string]string{
+	"宏观经济":      "宏观",
+	"利率债":       "利率债",
+	"原油":        "原油",
+	"PTA":       "PTA",
+	"MEG":       "MEG",
+	"织造终端":      "织造终端",
+	"甲醇":        "甲醇",
+	"聚烯烃":       "聚烯烃",
+	"沥青":        "沥青",
+	"纯苯+苯乙烯":    "纯苯+苯乙烯",
+	"玻璃纯碱":      "玻璃纯碱",
+	"钢材":        "钢材",
+	"铁矿":        "铁矿",
+	"双焦（焦煤、焦炭）": "双焦（焦煤、焦炭）",
+	"有色（锌）":     "有色（锌）",
+	"有色（铜、铝）":   "有色（铜、铝）",
+	"镍+不锈钢":     "镍+不锈钢",
+	"PVC":       "PVC",
+	"聚酯":        "聚酯",
+	"钴锂":        "钴锂",
+	"策略":        "策略",
+	"苯乙烯":       "纯苯+苯乙烯",
+	"锌":         "有色（锌）",
+	"双焦":        "双焦（焦煤、焦炭）",
+	"铜/铝":       "有色（铜、铝）",
+	"镍/不锈钢":     "镍+不锈钢",
+}
+
 //TshResult 同花顺返回信息
 type TshResult struct {
 	ErrorCode int    `json:"error" description:"错误状态码"`
@@ -162,22 +192,22 @@ func SendToThs(sendDetailId, reportId int, reportType string) (err error) {
 		if tmpErr != nil {
 			err = tmpErr
 		}
-	case "研报小程序":
+	case "研报小程序", "研报":
 		tmpErr := SendReportMiniToThs(reportId)
 		if tmpErr != nil {
 			err = tmpErr
 		}
-	case "研报价格驱动":
+	case "研报价格驱动", "价格驱动":
 		tmpErr := SendYbPriceDrivenToThs(reportId)
 		if tmpErr != nil {
 			err = tmpErr
 		}
-	case "研报视频社区":
+	case "研报视频社区", "视频社区":
 		tmpErr := SendYbCommunityVideoToThs(reportId)
 		if tmpErr != nil {
 			err = tmpErr
 		}
-	case "研报线上路演":
+	case "研报线上路演", "线上路演":
 		tmpErr := SendYbRoadVideoToThs(reportId)
 		if tmpErr != nil {
 			err = tmpErr
@@ -302,6 +332,17 @@ func SendThs(title, labelStr, abstract, jumpBaseUrl, logoUrl, dataType string) (
 		return
 	}
 
+	// 关联后的标签数据
+	newLabelList := make([]string, 0)
+	labelList := strings.Split(labelStr, ",")
+	for _, v := range labelList {
+		tmpLabel, ok := permissionLabelMap[v] //判断是否在关联标签里面
+		if !ok {                              //如果不在关联标签里面，那么就把原始的值赋值给
+			tmpLabel = v
+		}
+		newLabelList = append(newLabelList, tmpLabel)
+	}
+	labelStr = strings.Join(newLabelList, ",")
 	utils.FileLog.Info(fmt.Sprintf("labelStr:%s", labelStr))
 	label, err := gorsa.PublicEncrypt(labelStr, pubKey)
 	if err != nil {
@@ -591,7 +632,7 @@ func SendYbRoadVideoToThs(videoId int) (err error) {
 		if v.PermissionName == "宏观经济" {
 			v.PermissionName = "宏观"
 		}
-		permissionName += v.PermissionName+","
+		permissionName += v.PermissionName + ","
 	}
 	if permissionName == "" {
 		err = errors.New("客群标签为空, 不可推送")

services/task.go

@@ -179,8 +179,8 @@ func releaseTask() {
 	task.AddTask("refreshEicData", refreshEicData)
 
 	//刷新指标基础数据
-	refreshBaseData := task.NewTask("refreshBaseData", "0 */30 * * * * ", RefreshBaseData)
-	task.AddTask("refreshBaseData", refreshBaseData)
+	//refreshBaseData := task.NewTask("refreshBaseData", "0 */30 * * * * ", RefreshBaseData)
+	//task.AddTask("refreshBaseData", refreshBaseData)
 
 	//同步弘则数据库中来自，钢联，隆众，有色,人工等基础数据--每隔五分钟，同步一次最新数据
 	syncBaseData := task.NewTask("syncBaseData", "0 */5 * * * * ", SyncBaseData)

utils/common.go

@@ -870,4 +870,13 @@ func GetLocalIP() (ip string, err error) {
 func GetRichText(content string) (contentSub string) {
 	contentSub = strings.Replace(content, "<p data-f-id=\"pbf\" style=\"text-align: center; font-size: 14px; margin-top: 30px; opacity: 0.65; font-family: sans-serif;\">Powered by <a href=\"https://www.froala.com/wysiwyg-editor?pb=1\" title=\"Froala Editor\">Froala Editor</a></p>", "", -1)
 	return
-}
+}
+
+// GetOrmInReplace 获取orm的in查询替换?的方法
+func GetOrmInReplace(num int) string {
+	template := make([]string, num)
+	for i := 0; i < num; i++ {
+		template[i] = "?"
+	}
+	return strings.Join(template, ",")
+}