zwxi před 10 měsíci
rodič
revize
6c74be8b4e
2 změnil soubory, kde provedl 38 přidání a 21 odebrání
  1. 37 21
      services/sci99/sci99.go
  2. 1 0
      services/task.go

+ 37 - 21
services/sci99/sci99.go

@@ -95,12 +95,14 @@ func Scii99(cont context.Context) (err error) {
 				ModifyTime:   time.Now(),
 			}
 
-			id, err := models.AddBaseFromSci99Classify(&classifyItem)
-			if err != nil {
+			id, e := models.AddBaseFromSci99Classify(&classifyItem)
+			if e != nil {
+				err = e
 				fmt.Println("Error inserting into database:", err)
 				utils.FileLog.Info("Error inserting into database:", err)
 				return
 			}
+			fmt.Println("新增分类:", classifyItem.ClassifyName)
 			classifyId = int(id)
 			classifyItem.BaseFromSciClassifyId = int(id)
 			ClassifyMap[request.Ppname] = &classifyItem
@@ -118,16 +120,18 @@ func Scii99(cont context.Context) (err error) {
 			request.PriceTypeID = priceTypeID
 
 			// 将请求体序列化为JSON
-			jsonData, err := json.Marshal(request)
-			if err != nil {
+			jsonData, e := json.Marshal(request)
+			if e != nil {
+				err = e
 				fmt.Println("Error marshalling JSON:", err)
 				utils.FileLog.Info("Error marshalling JSON:", err)
 				return
 			}
 
 			// 创建一个HTTP POST请求
-			req, err := http.NewRequest("POST", listUrl, bytes.NewBuffer(jsonData))
-			if err != nil {
+			req, e := http.NewRequest("POST", listUrl, bytes.NewBuffer(jsonData))
+			if e != nil {
+				err = e
 				fmt.Println("Error creating request:", err)
 				utils.FileLog.Info("Error creating request:", err)
 				return
@@ -140,8 +144,9 @@ func Scii99(cont context.Context) (err error) {
 
 			// 发送请求
 			client := &http.Client{}
-			resp, err := client.Do(req)
-			if err != nil {
+			resp, e := client.Do(req)
+			if e != nil {
+				err = e
 				fmt.Println("Error sending request:", err)
 				utils.FileLog.Info("Error sending request:", err)
 				return
@@ -166,8 +171,9 @@ func Scii99(cont context.Context) (err error) {
 				utils.FileLog.Info("Error unmarshalling JSON:", err)
 				return
 			}
-			allCode, err := models.GetBaseFromSci99Index()
-			if err != nil {
+			allCode, e := models.GetBaseFromSci99Index()
+			if e != nil {
+				err = e
 				fmt.Println("select Code err:", err)
 				utils.FileLog.Info("GetBaseFromSci99Index err:", err)
 				return
@@ -202,12 +208,14 @@ func Scii99(cont context.Context) (err error) {
 						CreateTime: time.Now(),
 						ModifyTime: time.Now(),
 					}
-					id, err := models.AddBaseFromSci99Index(&index)
-					if err != nil {
+					id, e := models.AddBaseFromSci99Index(&index)
+					if e != nil {
+						err = e
 						fmt.Println("Error inserting into database:", err)
 						utils.FileLog.Info("Error inserting into database:", err)
 						return
 					}
+					fmt.Println("新增指标:", index.IndexName)
 					index.BaseFromSciIndexId = int(id)
 					IndexMap[indexName] = &index
 				}
@@ -225,13 +233,15 @@ func Scii99(cont context.Context) (err error) {
 				}
 
 				// 获取最新日期
-				dateTime, err := models.GetBaseFromTradeSci99LatestData(indexCode)
-				if err != nil && err.Error() != utils.ErrNoRow() {
+				dateTime, e := models.GetBaseFromTradeSci99LatestData(indexCode)
+				if e != nil && e.Error() != utils.ErrNoRow() {
+					err = e
 					utils.FileLog.Info("GetBaseFromTradeSci99LatestData err:", err)
 					return
 				}
 				if !dateTime.IsZero() {
-					deailReq.Start = dateTime.Format(utils.FormatDate2)
+					fmt.Println("最新日期:", dateTime)
+					deailReq.Start = dateTime.AddDate(0,0,-3).Format(utils.FormatDate2)
 					deailReq.End = time.Now().Format(utils.FormatDate2)
 				}
 
@@ -288,8 +298,9 @@ func Scii99(cont context.Context) (err error) {
 				existDataMap := make(map[string]*models.BaseFromSci99Data)
 
 				//获取所有指标信息
-				allIndex, err := models.GetBaseFromTradeSci99IndexAll(indexCode)
-				if err != nil {
+				allIndex, e := models.GetBaseFromTradeSci99IndexAll(indexCode)
+				if e != nil {
+					err = e
 					fmt.Println("select err:", err)
 					utils.FileLog.Info("GetBaseFromTradeSci99IndexAll err:", err)
 				}
@@ -305,8 +316,10 @@ func Scii99(cont context.Context) (err error) {
 					if dataItem, ok := existDataMap[indexCode + v.RealDate]; ok {
 						if dataItem.Value != v.MDataValue {
 							// 更新
-							err = models.UpdateBaseFromSci99Data(dataItem.Value, indexCode, v.RealDate)
-							if err != nil {
+							fmt.Println("更新指标:", indexCode + v.RealDate)
+							e = models.UpdateBaseFromSci99Data(dataItem.Value, indexCode, v.RealDate)
+							if e != nil {
+								err = e
 								fmt.Println("Error update into database:", err)
 								utils.FileLog.Info("Error update into database:", err)
 								return
@@ -323,11 +336,13 @@ func Scii99(cont context.Context) (err error) {
 							ModifyTime:         time.Now(),
 						}
 						addList = append(addList, &dataItem)
+						fmt.Println("新增数据:", indexCode + v.RealDate)
 					}
 				}
 				if len(addList) > 0 {
-					err = models.AddBaseFromSci99DataMulti(addList)
-					if err != nil {
+					e = models.AddBaseFromSci99DataMulti(addList)
+					if e != nil {
+						err = e
 						fmt.Println("Error inserting into database:", err)
 						utils.FileLog.Info("Error inserting into database:", err)
 						return
@@ -337,6 +352,7 @@ func Scii99(cont context.Context) (err error) {
 			}
 		}
 	}
+	return
 }
 
 func Sci99IndexCodeGenerator(indexName, indexCodeStr, marketSampleName, model string) (indexCode string, needAdd bool) {

+ 1 - 0
services/task.go

@@ -54,6 +54,7 @@ func Task() {
 
 	if utils.BusinessCode == utils.BusinessCodeFuBang {
 		// 仅富邦
+		//sci99.Scii99(nil)
 		sci99 := task.NewTask("refreshSci99", "0 0,30 16-20 * * *", sci99.Scii99) //卓创资讯
 		task.AddTask("卓创资讯", sci99)
 	}