hsun 11 months ago
parent
commit
bc297f1577
3 changed files with 21 additions and 7 deletions
  1. 9 4
      services/base_from_ccf/common.go
  2. 0 3
      services/task.go
  3. 12 0
      utils/common.go

+ 9 - 4
services/base_from_ccf/common.go

@@ -330,12 +330,17 @@ func savePageHtml(nameKey, saveDir string, historyPage bool, reportMax int) (fil
 
 		htm, e := fetchPageHtml(fmt.Sprintf("%s%s", CCFReportDetailBaseUrl, v.Href))
 		if e != nil {
-			err = fmt.Errorf("获取首页HTML失败, err: %v", e)
-			return
+			utils.FileLog.Info("获取页面失败, err: %v", e)
+			continue
+		}
+		dateDir := fmt.Sprintf("%s/%s", saveDir, strDate)
+		if e = utils.MkDir(dateDir); e != nil {
+			utils.FileLog.Info(fmt.Sprintf("创建目录失败, err: %v", e))
+			continue
 		}
-		outputPath := fmt.Sprintf("%s/%d-%s-%s.html", saveDir, v.Page, strDate, v.Title)
+		outputPath := fmt.Sprintf("%s/%d-%s.html", dateDir, v.Page, v.Title)
 		if e = writeHTMLToFile(string(htm), outputPath); e != nil {
-			fmt.Printf("写入html出错, err: %v", e)
+			utils.FileLog.Info(fmt.Sprintf("写入HTML出错, err: %v", e))
 			continue
 		}
 		files = append(files, outputPath)

+ 0 - 3
services/task.go

@@ -76,9 +76,6 @@ func Task() {
 		// 各品种装置-每周四15-18点每隔半小时
 		taskCCFStockTable := task.NewTask("taskCCFStockTable", "0 */30 15-18 * * 4", ccfService.TaskStockTable)
 		task.AddTask("CCF装置检修", taskCCFStockTable)
-
-		//var ctx context.Context
-		//go ccfService.ReadEdbHistoryFiles(ctx)
 	}
 
 	task.StartTask()

+ 12 - 0
utils/common.go

@@ -1260,3 +1260,15 @@ func CreateDirIfNotExists(directoryPath string) error {
 
 	return nil
 }
+
+// MkDir 创建目录
+func MkDir(dirPath string) error {
+	err := os.MkdirAll(dirPath, 0755)
+	if err != nil {
+		if os.IsExist(err) {
+			return nil
+		}
+		return err
+	}
+	return nil
+}