فهرست منبع

feat: 采集时间限制

HeWang 5 ماه پیش
والد
کامیت
9983a251d5
2فایلهای تغییر یافته به همراه8 افزوده شده و 8 حذف شده
  1. 4 4
      aarch64/pjibot_delivery/common/config/c_cloud.go
  2. 4 4
      tools/pji/pji_time/main/main.go

+ 4 - 4
aarch64/pjibot_delivery/common/config/c_cloud.go

@@ -181,16 +181,16 @@ func InitCloudConfig() {
 		os.Exit(-1)
 	}
 	// 单独解析采集时间
-	startTime, err := time.Parse("11:11", newCloudConfig.CollectWindow.Start)
+	startTime, err := time.Parse("15:04", newCloudConfig.CollectWindow.Start)
 	if err != nil {
 		c_log.GlobalLogger.Error("云端配置文件解析采集时间【startTime】失败 ", err, "取默认值【00:00】")
-		newCloudConfig.CollectWindow.StartTime, _ = time.Parse("11:11", "00:00")
+		newCloudConfig.CollectWindow.StartTime, _ = time.Parse("15:04", "00:00")
 	}
 	newCloudConfig.CollectWindow.StartTime = startTime
-	endTime, err := time.Parse("11:11", newCloudConfig.CollectWindow.End)
+	endTime, err := time.Parse("15:04", newCloudConfig.CollectWindow.End)
 	if err != nil {
 		c_log.GlobalLogger.Error("云端配置文件解析采集时间【endTime】失败 ", err, "取默认值【23:59】")
-		newCloudConfig.CollectWindow.EndTime, _ = time.Parse("11:11", "23:59")
+		newCloudConfig.CollectWindow.EndTime, _ = time.Parse("15:04", "23:59")
 	}
 	newCloudConfig.CollectWindow.EndTime = endTime
 	if len(newCloudConfig.CollectWindow.Days) == 0 {

+ 4 - 4
tools/pji/pji_time/main/main.go

@@ -23,16 +23,16 @@ func IsTimeAllowed(currentTime time.Time) bool {
 		End:   "17:00",
 	}
 	// 单独解析采集时间
-	startTime, err := time.Parse("11:11", cw.Start)
+	startTime, err := time.Parse("15:04", cw.Start)
 	if err != nil {
 		fmt.Println("云端配置文件解析采集时间【startTime】失败 ", err, "取默认值【00:00】")
-		cw.StartTime, _ = time.Parse("11:11", "00:00")
+		cw.StartTime, _ = time.Parse("15:04", "00:00")
 	}
 	cw.StartTime = startTime
-	endTime, err := time.Parse("11:11", cw.End)
+	endTime, err := time.Parse("15:04", cw.End)
 	if err != nil {
 		fmt.Println("云端配置文件解析采集时间【endTime】失败 ", err, "取默认值【23:59】")
-		cw.EndTime, _ = time.Parse("11:11", "23:59")
+		cw.EndTime, _ = time.Parse("15:04", "23:59")
 	}
 	cw.EndTime = endTime
 	if len(cw.Days) == 0 {