commit

aarch64/pji/common/config/yaml/cloud-config-pji1.yaml

@@ -32,7 +32,6 @@ record-envs:
   - "CPLUS_INCLUDE_PATH=/usr/include/drm:"
   - "ROS_DISTRO=melodic"
   - "LOGNAME=root"
-  - "_=/bin/sh"
   - "ROS_VERSION=1"
   - "PKG_CONFIG_PATH=/opt/ros/melodic/lib/pkgconfig"
   - "XDG_SESSION_ID=5"

aarch64/pjisuv/common/service/kill_self.go

@@ -24,7 +24,6 @@ var (
 
 // KillSignal 停止信号，主从节点接收到数据后准备重启
 type KillSignal struct {
-	NodeName       string
 	DropUploadData bool
 	Restart        bool
 }

aarch64/pjisuv/common/service/rosbag_upload.go

@@ -115,7 +115,7 @@ outLoop:
 			}
 		}
 		c_log.GlobalLogger.Info("上传完成，花费时间：", time.Since(start))
-		if commonConfig.LocalConfig.Node.Name == "master" {
+		if commonConfig.LocalConfig.Node.Name == "node1" {
 			// 在上传完成的包目录同级下添加一个目录同名的json
 			var triggerIds []string
 			for _, label := range currentTimeWindow.Labels {

aarch64/pjisuv/control/main/control.go

@@ -59,12 +59,12 @@ func main() {
 			}
 			var killArgs *commonService.KillSignal
 			if lastStatus == "UN_CHANGE" && status == "CHANGE" {
-				killArgs = &commonService.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: true}
-				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				killArgs = &commonService.KillSignal{DropUploadData: config.PlatformConfig.DropUploadData, Restart: true}
+				c_log.GlobalLogger.Info("更新任务，发送rpc重启信号到本地：", killArgs)
 			}
 			if lastStatus == "UN_CHANGE" && status == "NONE" {
-				killArgs = &commonService.KillSignal{NodeName: config.LocalConfig.Node.Name, DropUploadData: config.PlatformConfig.DropUploadData, Restart: false}
-				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地"+config.LocalConfig.Node.Name+"：", killArgs)
+				killArgs = &commonService.KillSignal{DropUploadData: config.PlatformConfig.DropUploadData, Restart: false}
+				c_log.GlobalLogger.Info("杀死任务，发送rpc结束信号到本地：", killArgs)
 			}
 
 			KillRpcClient, err := rpc.Dial("tcp", config.LocalConfig.Node.Ip+":"+config.CloudConfig.RpcPort)

pjisuv-control.service

@@ -4,7 +4,7 @@ Description=Your Service Description
 [Service]
 Type=simple
 User=root
-ExecStart=/root/rosbag-handle/pji-control.exe
+ExecStart=/mnt/media/sda1/cicv-data-closedloop/pjisuv-control.exe
 
 [Install]
 WantedBy=multi-user.target