diff --git a/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc b/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc index cf96053..8227361 100644 Binary files a/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc and b/ETL/Mars/Config/__pycache__/Config.cpython-37.pyc differ diff --git a/ETL/Mars/Model/HuiJiModel.py b/ETL/Mars/Model/HuiJiModel.py index 76c0a6e..62909c3 100644 --- a/ETL/Mars/Model/HuiJiModel.py +++ b/ETL/Mars/Model/HuiJiModel.py @@ -227,11 +227,15 @@ class HuiJiModel(object): Db.execute(sql) # 批量插入 sql = "insert into " + tableName + "(task_id,org_code,flag,action_time) values(%s,%s,0,now())" + data = [] for x in organizationnoList: data.append((task_id, x)) # 批量插入 # start = datetime.datetime.now() + + # 去重 + data = list(set(data)) Db.execute_by_execute_batch(sql, data) # end = datetime.datetime.now() # print("execute_by_execute_batch方法用时:", end - start, "秒") @@ -241,7 +245,7 @@ class HuiJiModel(object): Db.execute(sql) # 回写关联关系 - sql = "insert into t_huiji_task_org_releation select task_id,org_code from {tableName} where task_id={task_id}".format( + sql = "insert into t_huiji_task_org_releation(task_id,org_code,flag) select task_id,org_code,flag from {tableName} where task_id={task_id}".format( tableName=tableName, task_id=task_id) Db.execute(sql) @@ -417,6 +421,7 @@ class HuiJiModel(object): sql = sql + " order by t1.task_id desc" + print(sql) return Db.paginate(sql, page, limit) # 根据任务ID获取模块ID diff --git a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc index ddbe794..81c372c 100644 Binary files a/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc and b/ETL/Mars/Model/__pycache__/HuiJiModel.cpython-37.pyc differ diff --git a/ETL/Mars/Start.py b/ETL/Mars/Start.py index a72a7c6..c408ced 100644 --- a/ETL/Mars/Start.py +++ b/ETL/Mars/Start.py @@ -259,7 +259,7 @@ def publishTask(): # 登录接口 -# http://127.0.0.1:8888/Mars/doLogin?org_name=桃源县黄石镇中学 +# http://127.0.0.1:8888/Mars/doLogin?org_name=青山桥镇鳌鱼学校 @app.route('/Mars/doLogin', methods=['GET']) def doLogin(): org_name = request.args.get("org_name") @@ -282,7 +282,9 @@ def updateTaskForSchool(): # 获取任务列表For School +# http://192.168.100.100:8888/Mars/doLogin?org_name=%E6%A1%83%E6%BA%90%E5%8E%BF%E9%BB%84%E7%9F%B3%E9%95%87%E4%B8%AD%E5%AD%A6 # http://127.0.0.1:8888/Mars/listTaskForSchool?page=1&limit=50 +# http://192.168.100.100:8888/Mars/listTaskForSchool?page=1&limit=50 @app.route('/Mars/listTaskForSchool', methods=['GET']) def listTaskForSchool(): org_code = request.cookies.get("organizationno")