| 
					
				 | 
			
			
				@@ -9,7 +9,7 @@ import time 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from demeter.core import * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from gevent import monkey; monkey.patch_socket() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 import gevent 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-from pic import pic 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+#from pic import pic 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 from demeter.mqtt import * 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 # 处理定时命令、周期命令、条件控制、消息、设备状态等 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 timeSleep = 10 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -23,7 +23,7 @@ def switch(value): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 def device(): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	while 1: 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model = Demeter.model('device_info') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		cur = Demeter.time() - 1200 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		cur = Demeter.time() - 1800 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model.cdate.assgin(cur, '<=') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		model.status = True 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		data = model.select() 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -177,12 +177,12 @@ def timeSync(): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 def handle(): 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	gevent.joinall([ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		gevent.spawn(timing), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		gevent.spawn(loop), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		gevent.spawn(device), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		gevent.spawn(savePic), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		#gevent.spawn(timing), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		#gevent.spawn(loop), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		#gevent.spawn(device), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		#gevent.spawn(savePic), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		gevent.spawn(control), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-		gevent.spawn(timeSync), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+		#gevent.spawn(timeSync), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		gevent.spawn(mulQueue), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 		gevent.spawn(mulQueueDrop), 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 	]) 
			 |