dever 4 years ago
parent
commit
4b64f64ea6
3 changed files with 15 additions and 6 deletions
  1. 8 1
      conf/dev.conf
  2. 4 4
      service/zeus/core.py
  3. 3 1
      sync.py

+ 8 - 1
conf/dev.conf

@@ -84,4 +84,11 @@ mobile				= True
 
 ;云端配置
 [zeus]
-host                = http://192.168.33.10:8088/
+host                = http://192.168.33.10:8088/
+
+;同步配置
+[sync]
+;同步的表,多个用逗号隔开
+table               = farm,farm_user,farm_product,farm_work,farm_work_method,farm_work_category,farm_work_land,origin_batch,origin_growth,device_info,device_gateway,device_camera,device_camera_pic,device_group,device_page,device_pic,device_printer,device_set_condition,device_set_loop,device_set_timing
+;同步的方法,仅限service
+service              = core,zeus

+ 4 - 4
service/zeus/core.py

@@ -17,17 +17,17 @@ class Core(object):
         pass
 
     # 实时同步
-    def rsync(self, table):
-        command = Demeter.path + 'sync.py -t ' + table
+    def rsync(self, table, id):
+        command = Demeter.path + 'sync.py -t ' + table + ' -i ' + id
         Shell.popen("python3 " + command, bg=True)
         #self.sync(table)
 
     # 远程同步
-    def sync(self, table):
+    def sync(self, table, search={}):
         zeus = Demeter.config['zeus']['host']
         url = zeus + 'interface/sync'
         farm = Demeter.config['setting']['farm']
-        data = Demeter.service('common').list(table)
+        data = Demeter.service('common').list(table, search=search)
         param = {}
         param['data'] = json.dumps(data)
         param['table'] = table

+ 3 - 1
sync.py

@@ -8,6 +8,8 @@ from demeter.core import *
 
 param = {}
 param['table'] = 't'
+param['id'] = 'i'
 Demeter.getopt(param)
 table = Demeter.option['table']
-Demeter.service('core', 'zeus').sync(table)
+id = Demeter.option['id']
+Demeter.service('core', 'zeus').sync(table, {'id':id})