edit

cron.py

@@ -68,7 +68,7 @@ def mulQueue():
 		model = Demeter.model('device_mul_queue')
 
 		model.status = 1
-		data = model.select(type='fetchone', order='inorder asc,device_id asc')
+		data = model.select(type='fetchone', order='inorder asc,udate asc,hardware_id asc')
 		service = Demeter.service('device')
 
 		# 查看当前有没有正在执行的设备，如果有，不能继续执行了

model/device_mul_queue.py

@@ -22,5 +22,7 @@ class Device_mul_queue(Model):
 	state = Fields(type='boolean', default='True', comment='数据存在状态')
 	cdate = Fields(type='int', default='time', comment='创建时间')
 	inorder = Fields(type='int', default='0', comment='设备的排序')
+	udate = Fields(type='int', comment='接入时间，仅做排序用')
+	hardware_id = Fields(type='bigint', comment='硬件id仅做排序用')
 
 	#ALTER TABLE device_mul_queue ADD inorder int default 100; 

service/device.py

@@ -62,7 +62,12 @@ class Device(object):
 			queue_model.device_id = info['id']
 			queue_model.status = 1
 			queue_model.value = switch
-			queue_model.inorder = info['inorder']
+			if info['inorder']:
+				queue_model.inorder = info['inorder']
+			else:
+				queue_model.inorder = 100
+			queue_model.udate = info['udate']
+			queue_model.hardware_id = info['hardware_id']
 			queue_model.insert()
 			return