提交路口管家任务管理相关内容

app/common_worker.py

@@ -226,18 +226,21 @@ def init_with_config():
     if config.has_option('cross_delay_db', 'password'):
         password = config.get('cross_delay_db', 'password')
         g_cross_delay_db['password'] = password
+    if config.has_option('task_db', 'host'):
+        host = config.get('task_db', 'host')
+        g_task_db['host'] = host
     if config.has_option('task_db', 'port'):
         port = int(config.get('task_db', 'port'))
-        g_cross_delay_db['port'] = port
+        g_task_db['port'] = port
     if config.has_option('task_db', 'dbname'):
         dbname = config.get('task_db', 'dbname')
-        g_cross_delay_db['db'] = dbname
+        g_task_db['db'] = dbname
     if config.has_option('task_db', 'user'):
         user = config.get('task_db', 'user')
-        g_cross_delay_db['user'] = user
+        g_task_db['user'] = user
     if config.has_option('task_db', 'password'):
         password = config.get('task_db', 'password')
-        g_cross_delay_db['password'] = password
+        g_task_db['password'] = password
     #     redis
     if config.has_section('redis'):
         if config.has_option('redis', 'ip'):
@@ -275,7 +278,7 @@ def init_with_config():
         if config.has_option('cross_delay_db', 'host_inner'):
             g_cross_delay_db['host'] = config.get('cross_delay_db', 'host_inner')
         if config.has_option('task_db', 'host_inner'):
-            g_cross_delay_db['host'] = config.get('task_db', 'host_inner')
+            g_task_db['host'] = config.get('task_db', 'host_inner')
     print(g_dbinfo)
     print(g_roadnet_db)
     print(g_cloud_db)

app/task_db_func.py

@@ -177,7 +177,7 @@ class TaskDbHelper(TableDbHelperBase):
                  record_state, task_src, task_class, nodeid, area_id):
         sql_insert = "insert into task (timestamp, creatorid, task_name, task_type, data_type, plan_begin_time, plan_end_time,publish_time," \
                      " executor, progress, task_state, description, crossids, sectionids, arteryids, comment," \
-                     " record_state, task_src, task_class, nodeid)  values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s', %s)" % (
+                     " record_state, task_src, task_class, nodeid, area_id)  values('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s', %s)" % (
                          timestamp, creatorid, task_name, task_type, data_type, plan_begin_time, plan_end_time,publish_time,
                          executor, progress, task_state, description, crossids, sectionids, arteryids, comment,
                          record_state, task_src, task_class, nodeid, area_id)
@@ -241,7 +241,7 @@ class TaskDbHelper(TableDbHelperBase):
         return self.do_execute(sql)
 
     def update_task_state(self, nodeid, area_id, task_no, state):
-        sql = "update task set state='%s' where nodeid='%s' and area_id='%s' and task_no='%s'" % (state, nodeid, area_id, task_no)
+        sql = "update task set task_state='%s' where nodeid='%s' and area_id='%s' and taskno='%s'" % (state, nodeid, area_id, task_no)
         return self.do_execute(sql)
 
     # 私有属性示例

app/task_worker.py

@@ -246,7 +246,7 @@ def do_remove_task(params):
     tasknos = check_param(params, 'tasknos')
     if not tasknos or len(tasknos) < 1:
         return json.dumps(make_common_res(2, '任务id缺失，请检查后重试'))
-    count = db_task.delete_task(tasknos, nodeid)
+    count = db_task.delete_task(tasknos, nodeid, area_id)
     if count != len(tasknos):
         logging.error(str(params) + ' do_remove_task删除失败!')
         res = make_common_res(-1, '删除失败')

app/views_task.py

@@ -95,7 +95,7 @@ def distribute_task():
 # "taskno"
 @app.route('/api/approval_task', methods=['POST'])
 def approval_task():
-    return do_approval(request.get_json())
+    return do_approval(dict(request.form))
 
 #完成任务
 #参数：