| 
					
				 | 
			
			
				@@ -41,16 +41,16 @@ function reportDel() { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // 定时扫描,如果发现机器人关闭或者错误,并且停止时间超过1分钟以上了,就进行清仓检查 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 function reportSearchPositions() {//DOTO node 代码修改完毕,待测试 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    const intervalInMilliseconds = 3000; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    const intervalInMilliseconds = 1000 * 60; 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     setInterval(() => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         // logger.info('--当前 定时检查清仓'); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         robot.appMap.forEach((value, key) => { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            let isStartTime = value.closeTime + (1000*60) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-            if (value.id !== -1 && isStartTime >= new Date().getTime() &&  (value.threadStatus === robot.RobotStatus.STOPPED || value.threadStatus === robot.RobotStatus.ERROR) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            let isStartTime = value.closeTime + (1000 * 60) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+            if (value.id !== -1 && isStartTime >= new Date().getTime() && (value.threadStatus === robot.RobotStatus.STOPPED || value.threadStatus === robot.RobotStatus.ERROR) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // && value.isClearance === false 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             ) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                logger.info('发起清仓检查:'+value.id+"停机时间:"+value.closeTime +"当前时间:"+new Date().getTime()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                logger.info('发起清仓检查:' + value.id + "停机时间:" + value.closeTime + "当前时间:" + new Date().getTime()); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // robot.robotStatus(value) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // {"id":"375", 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // "callPort":"1111", 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -59,11 +59,11 @@ function reportSearchPositions() {//DOTO node 代码修改完毕,待测试 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // "strategyName":"as","checkId":"467"} 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 robot.searchPositions({ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "id":value.id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "callPort":value.port, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "path":value.path, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "programName":value.programName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-                    "strategyName":value.strategyName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "id": value.id, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "callPort": value.port, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "path": value.path, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "programName": value.programName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+                    "strategyName": value.strategyName, 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				                 // value.isClearance = true 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				             } 
			 |