迁移task，增加task db

Signed-off-by: yinzijian <yinzijian@haomozhixing.onaliyun.com>

app/cross_eva_views.py

@@ -84,6 +84,7 @@ def update_cross_examine_record_state_api():
     return update_cross_examine_record_state(request.json)
 
 from app.user_views import *
+from app.views_task import *
 
 if __name__ == '__main__':
     pass

app/global_source.py

@@ -5,6 +5,7 @@ from app.models import *
 # from app.gw_db_func import *
 from app.models_wave import RoadLinkManager
 from app.phase_db_func import PhaseTableDbHelper
+from app.task_db_func import TaskDbHelper
 from tool.mysql_common_connector_pool import *
 from app.user_db_func import *
 from app.tmnet_db_func import *
@@ -86,7 +87,7 @@ g_db_cloud = GWPerfCloudDbHelper(g_cloud_pool)
 # 全局的数据库对象
 db_user = UserDbHelper(g_user_pool)
 db_cross = CrossDbHelper(g_cross_delay_pool)
-
+db_task = TaskDbHelper(g_db_pool)
 db_phasetable = PhaseTableDbHelper(g_db_pool)
 db_tmnet = TmnetDbHelper(g_roadnet_pool)
 

app/task_worker.py

@@ -4,7 +4,7 @@
 # @Description:
 
 import json
-
+from app.global_source import db_user, db_task
 from flask import request, send_file
 from pypinyin import lazy_pinyin, Style
 
@@ -23,10 +23,10 @@ def do_query_task_list_parameter(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
 
@@ -79,10 +79,10 @@ def do_query_task_list(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
 
@@ -237,10 +237,10 @@ def do_remove_task(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     tasknos = check_param(params, 'tasknos')
@@ -268,10 +268,10 @@ def do_distribute_task(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -336,10 +336,10 @@ def do_approval(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -395,10 +395,10 @@ def do_complete_task(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -446,10 +446,10 @@ def do_add_task(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
 
@@ -567,10 +567,11 @@ def do_query_completed_task_cross_list(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
 
@@ -598,10 +599,10 @@ def do_query_completed_task_by_cross(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     crossid = check_param(params, 'crossid')
@@ -673,10 +674,10 @@ def do_update_task(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -783,10 +784,10 @@ def do_task_file_download(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -814,10 +815,10 @@ def do_query_task_history(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -849,10 +850,10 @@ def del_task_file_api(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     taskno = check_param(params, 'taskno')
@@ -884,10 +885,10 @@ def do_query_task_progress_history(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
     # taskno = params.get('taskno')
@@ -915,10 +916,10 @@ def do_query_task_detail(params):
     userid = check_param(params, 'userid')
     if not userid:
         return json.dumps(make_common_res(4, '缺少userid， 请刷新后重试'))
-    area_list = db_user.query_user_areas(userid)
+    area_list = db_user.query_areaid_list(userid)
     if not area_list or len(area_list) < 1:
         return json.dumps(make_common_res(5, '用户信息异常'))
-    area_list = [int(row['area_id']) for row in area_list]
+    area_list = map(int, area_list)
     if int(area_id) not in area_list:
         return json.dumps(make_common_res(6, '用户信息异常'))
 

app/user_db_func.py

@@ -131,4 +131,4 @@ class UserDbHelper(TableDbHelperBase):
 
     def modify_password(self, userid, new_password):
         sql = "update user set password = '%s' where userno = '%s'" % (new_password, userid)
-        return self.do_execute(sql)
+        return self.do_execute(sql)