commit

aarch64/pji/common/service/rosbag_upload.go

@@ -87,16 +87,17 @@ outLoop:
 		}
 
 		// 4 compress包，必须顺序执行，此时每个包会对应生成一个压缩过的包和原始包，原始包后缀为.orig.bag
-		c_log.GlobalLogger.Info("压缩 bag 数据包，故障时间为：", currentTimeWindow.FaultTime)
-		for i, bag := range bags {
-			oldName := bag
-			compressCommand := []string{"compress", "--bz2", oldName}
-			c_log.GlobalLogger.Info("正在压缩中，【FaultTime】=", currentTimeWindow.FaultTime, "【Label】=", currentTimeWindow.Labels, "，进度", i+1, "/", bagNumber, "。")
-			if _, output, err := util.ExecuteWithEnvSync(commonConfig.RosbagEnvs, commonConfig.RosbagPath, compressCommand...); err != nil {
-				c_log.GlobalLogger.Errorf("compress命令执行出错【命令】=%v，【输出】=%v,【err】=%v", compressCommand, output, err)
-				continue
-			}
-		}
+		// 5 todo 机器人去掉压缩过程，防止cpu跑满
+		//c_log.GlobalLogger.Info("压缩 bag 数据包，故障时间为：", currentTimeWindow.FaultTime)
+		//for i, bag := range bags {
+		//	oldName := bag
+		//	compressCommand := []string{"compress", "--bz2", oldName}
+		//	c_log.GlobalLogger.Info("正在压缩中，【FaultTime】=", currentTimeWindow.FaultTime, "【Label】=", currentTimeWindow.Labels, "，进度", i+1, "/", bagNumber, "。")
+		//	if _, output, err := util.ExecuteWithEnvSync(commonConfig.RosbagEnvs, commonConfig.RosbagPath, compressCommand...); err != nil {
+		//		c_log.GlobalLogger.Errorf("compress命令执行出错【命令】=%v，【输出】=%v,【err】=%v", compressCommand, output, err)
+		//		continue
+		//	}
+		//}
 		// 5 upload，必须顺序执行
 		c_log.GlobalLogger.Info("发送bag数据包，故障时间为：", currentTimeWindow.FaultTime)
 		start := time.Now()

amd64/web_server/handler/h_exam.go

@@ -82,7 +82,7 @@ func End(c *gin.Context) {
 		return
 	}
 	c_log.GlobalLogger.Info("数据库查询成功：", result)
-	if !result[0].EndTime.IsZero() {
+	if !result[0].EndTime.Equal(defaultTime) {
 		c_log.GlobalLogger.Error("赛队", param.TeamName, "重复请求考试结束接口！")
 		c.JSON(http.StatusBadRequest, commonEntity.Response{
 			Code: 500,