1

services/base_from_fenwei.go

@@ -370,6 +370,8 @@ func handleIndexData(indexInfo *models.FenWeiNetIndexInfo, indexIdMap map[string
 		format = convertYearMonthToLastDay(indexInfo.DataTime)
 	} else if indexInfo.Frequency == "月度" && isFirstDayOfMonth(indexInfo.DataTime) {
 		format = convertYearMonthDayToLastDay(indexInfo.DataTime)
+	} else {
+		format = indexInfo.DataTime
 	}
 
 	// 获取指标数据
@@ -396,6 +398,8 @@ func handleIndexData(indexInfo *models.FenWeiNetIndexInfo, indexIdMap map[string
 	data.ModifyTime = time.Now()
 	data.DataTimestamp = timestamp
 
+	// 打印data对象日志
+
 	logs.Info("handleIndexData data : ", data)
 
 	return data, nil
@@ -435,21 +439,34 @@ func addFenWeiClassify(info *models.FenWeiNetIndexInfo) (int, error) {
 	classify.Level = 1
 
 	// ClassifyName 拿到”-“分割的字符串 拿到前面的字符串
+	// 是否需要新增子分类
+	var childClassifyName string
 	if strings.Contains(classify.ClassifyName, "-") {
 		classifyArr := strings.Split(classify.ClassifyName, "-")
 		if len(classifyArr) > 1 {
-			classify.ClassifyName = classifyArr[0]
-			parentClassify, err := classify.GetByClassifyName(classify.ClassifyName)
+			parentClassify, err := classify.GetByClassifyName(classifyArr[0])
 			if err != nil {
 				return 0, err
 			}
 			if parentClassify != nil {
+				// 判断子分类是否存在
+				childClassify, err := classify.GetByClassifyName(classifyArr[1])
+				if err != nil {
+					return 0, err
+				}
+				if childClassify != nil {
+					return childClassify.ClassifyId, nil
+				}
+
 				classify.ParentId = parentClassify.ClassifyId
 				classify.Level = parentClassify.Level + 1
+				classify.ClassifyName = classifyArr[1]
 			} else {
-				//新增分类
+				//新增父分类
+				classify.ClassifyName = classifyArr[0]
 				classify.ParentId = 0
 				classify.Level = 1
+				childClassifyName = classifyArr[1]
 			}
 		}
 		return 0, nil
@@ -463,8 +480,12 @@ func addFenWeiClassify(info *models.FenWeiNetIndexInfo) (int, error) {
 	if err != nil {
 		return 0, err
 	}
-	if err != nil {
-		return 0, err
+	// 新增子分类
+	if childClassifyName != "" {
+		classify.ClassifyName = childClassifyName
+		classify.ParentId = int(classifyId)
+		classify.Level = classify.Level + 1
+		classifyId, err = models.AddBaseFromFenWeiClassify(classify)
 	}
 
 	return int(classifyId), nil