Browse Source

fix: 修正室外机器人master关闭逻辑

HeWang 5 months ago
parent
commit
b2816e8a87
1 changed files with 5 additions and 6 deletions
  1. 5 6
      aarch64/pjibot_delivery/control/main.go

+ 5 - 6
aarch64/pjibot_delivery/control/main.go

@@ -238,12 +238,11 @@ func main() {
 		// error 错误状态,此状态下不启动数采任务
 		// error 错误状态,此状态下不启动数采任务
 
 
 		// 启停master
 		// 启停master
-		if localStatus == "running" && timeAllowedFlag && !limitReachedFlag {
-			if !launchedFlag { // 目前未启动数采程序
-				c_log.GlobalLogger.Info("数采程序启动 - 开始。")
-				startMasterNode()
-			}
-		} else if localStatus == "idle" || !timeAllowedFlag || !limitReachedFlag {
+		if localStatus == "running" && timeAllowedFlag && !limitReachedFlag && !launchedFlag {
+			// 目前未启动数采程序
+			c_log.GlobalLogger.Info("数采程序启动 - 开始。")
+			startMasterNode()
+		} else if localStatus == "idle" || !timeAllowedFlag || limitReachedFlag {
 			if !renewedFlag && launchedFlag && len(entity.TimeWindowConsumerQueue) == 0 {
 			if !renewedFlag && launchedFlag && len(entity.TimeWindowConsumerQueue) == 0 {
 				time.Sleep(time.Duration(waitStopLength) * time.Minute)
 				time.Sleep(time.Duration(waitStopLength) * time.Minute)
 				c_log.GlobalLogger.Info("数采程序关闭 - 开始。")
 				c_log.GlobalLogger.Info("数采程序关闭 - 开始。")