Compare commits
No commits in common. "a4aad57da383d5df8d4e1dc541184d97d88ec016" and "c43eed0bec58e43be7211779be8667d4f05f2e73" have entirely different histories.
a4aad57da3
...
c43eed0bec
|
|
@ -14,18 +14,18 @@ from app.tmnet_db_func import *
|
|||
from collections import defaultdict
|
||||
|
||||
g_dbinfo = {
|
||||
'host': '120.53.125.169',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~~',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
'db': 'greenwave'
|
||||
}
|
||||
|
||||
g_roadnet_db = {
|
||||
'host': '120.53.125.169',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~~',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
'db': 'tmnet'
|
||||
}
|
||||
|
||||
|
|
@ -39,10 +39,10 @@ g_cloud_db = {
|
|||
|
||||
|
||||
g_cross_delay_db = {
|
||||
'host': '120.53.125.169',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~~',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
'db': 'tmnet'
|
||||
}
|
||||
|
||||
|
|
@ -55,23 +55,23 @@ g_redisinfo = {
|
|||
}
|
||||
|
||||
g_user_db = {
|
||||
'host': '120.53.125.169',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~~',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
'db': 'user'
|
||||
}
|
||||
|
||||
g_task_db = {
|
||||
'host': '120.53.125.169',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~~',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
'db': 'task'
|
||||
}
|
||||
|
||||
g_wave_tool_db = {
|
||||
'host': '49.232.183.190',
|
||||
'host': 'sass_dev',
|
||||
'port': 3306,
|
||||
'user': 'root',
|
||||
'password': 'pmenJIn7EaK40oThn~~',
|
||||
|
|
|
|||
|
|
@ -582,7 +582,7 @@ def do_add_task(params):
|
|||
elif task_type_class == 3:
|
||||
task_info = db_task.query_task(taskno, nodeid, area_id)
|
||||
creator_name, executor_name = task_info['creatorid'], task_info['executor']
|
||||
userids = db_user.query_user_info_by_name([executor_name])
|
||||
userids = db_user.query_user_info_by_name([creator_name, executor_name])
|
||||
if full_review != 1:
|
||||
require_confirm_info = check_param(params, 'require_confirm_info')
|
||||
if not require_confirm_info and full_review != 1:
|
||||
|
|
@ -995,8 +995,6 @@ def do_query_task_detail(params):
|
|||
logging.error(str(params) + ' do_query_task_detail 任务在数据库中不存在!')
|
||||
res = make_common_res(-1, '任务在数据库中不存在。')
|
||||
return json.dumps(res)
|
||||
cross_name_info = db_tmnet.query_cross_list4task(nodeid, area_id)
|
||||
task_crosses_info = db_task.query_ledger_task_crosses(taskno)
|
||||
if task['task_type_class'] == 1:
|
||||
ledger_task_additional_info = query_ledger_task_additional_info(cross_name_info, task_crosses_info[int(taskno)])
|
||||
task['ledger_task_additional_info'] = ledger_task_additional_info
|
||||
|
|
@ -1828,8 +1826,7 @@ def update_greenwave_task_stage_info(params):
|
|||
return json.dumps(make_common_res(11, '缺少任务进度信息，请刷新后重试'))
|
||||
progress = int(progress)
|
||||
creator_name, executor_name = task_info['creatorid'], task_info['executor']
|
||||
creator_id = db_user.query_user_info_by_name([creator_name])
|
||||
executor_id = db_user.query_user_info_by_name([executor_name])
|
||||
userids = db_user.query_user_info_by_name([creator_name, executor_name])
|
||||
|
||||
if modify_stage == 1:
|
||||
wave_crosses = db_wave.query_wave_crosses(waveid)
|
||||
|
|
@ -1841,7 +1838,7 @@ def update_greenwave_task_stage_info(params):
|
|||
return json.dumps(make_common_res(15, '当前绿波设置的运行时段与需求确认单中要求的协调时段不一致，请按需求确认单中要求调整'))
|
||||
ret = db_task.update_stage1_info(task_no, waveid, wave_name, stage_info, task_info, wave_crosses)
|
||||
if ret:
|
||||
# send_confirm_email(userids, f'当前任务到达绿波优化阶段, 请及时处理', task_no, task_info['task_name'], '绿波优化阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达绿波优化阶段, 请及时处理', task_no, task_info['task_name'], '绿波优化阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1851,7 +1848,7 @@ def update_greenwave_task_stage_info(params):
|
|||
return json.dumps(make_common_res(12, '任务未上传绿波优化报告文件， 请先上传文件'))
|
||||
res = db_task.update_stage2_info(task_no, stage_info)
|
||||
if res:
|
||||
send_confirm_email(creator_id, f'当前任务到达方案下发阶段, 请及时处理', task_no, task_info['task_name'], '方案下发阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达方案下发阶段, 请及时处理', task_no, task_info['task_name'], '方案下发阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1865,7 +1862,7 @@ def update_greenwave_task_stage_info(params):
|
|||
delay_reason = ''
|
||||
ret = db_task.update_stage3_info(actually_issue_time, task_no, stage_info, delay_reason)
|
||||
if ret:
|
||||
send_confirm_email(creator_id + executor_id, f'当前任务到达效果确认阶段, 请及时处理', task_no, task_info['task_name'], '效果确认阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达效果确认阶段, 请及时处理', task_no, task_info['task_name'], '效果确认阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1877,9 +1874,9 @@ def update_greenwave_task_stage_info(params):
|
|||
ret, has_bad = db_task.update_stage4_info(task_no, stage_info, tp_info, nodeid, area_id, task_additional_info)
|
||||
if ret:
|
||||
if has_bad:
|
||||
send_confirm_email(executor_id, f'当前任务到达方案微调阶段, 请及时处理', task_no, task_info['task_name'], '方案微调阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达方案微调阶段, 请及时处理', task_no, task_info['task_name'], '方案微调阶段', nodeid, area_id, creator_name, executor_name)
|
||||
else:
|
||||
send_confirm_email(executor_id, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1890,7 +1887,7 @@ def update_greenwave_task_stage_info(params):
|
|||
return json.dumps(make_common_res(18, '缺少效果一致确认时间， 请刷新后重试'))
|
||||
ret = db_task.update_stage5_info(task_no, stage_info, affirm_time)
|
||||
if ret:
|
||||
send_confirm_email(executor_id, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达对比报告阶段, 请及时处理', task_no, task_info['task_name'], '对比报告阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1901,7 +1898,7 @@ def update_greenwave_task_stage_info(params):
|
|||
# 阶段6与阶段2更新内容一致，均为阶段信息，因此此处共用同一个函数
|
||||
ret = db_task.update_stage2_info(task_no, stage_info)
|
||||
if ret:
|
||||
send_confirm_email(creator_id, f'当前任务到达更新台账阶段, 请及时处理', task_no, task_info['task_name'], '更新台账阶段', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务到达更新台账阶段, 请及时处理', task_no, task_info['task_name'], '更新台账阶段', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
@ -1933,7 +1930,7 @@ def update_greenwave_task_stage_info(params):
|
|||
logging.error(f'open_monitor_res: {open_monitor_res}')
|
||||
logging.error(f'update_task_additional_ret:{update_task_additional_ret}')
|
||||
if open_polling_res and open_monitor_res and update_task_additional_ret == 1:
|
||||
# send_confirm_email(userids, f'当前任务阶段已完成, 请及时更新任务状态', task_no, task_info['task_name'], '-', nodeid, area_id, creator_name, executor_name)
|
||||
send_confirm_email(userids, f'当前任务阶段已完成, 请及时更新任务状态', task_no, task_info['task_name'], '-', nodeid, area_id, creator_name, executor_name)
|
||||
db_task.update_task_progress(task_no, nodeid, area_id, progress)
|
||||
return json.dumps(make_common_res(0, '更新成功'))
|
||||
else:
|
||||
|
|
|
|||
|
|
@ -6,10 +6,10 @@ citylist = 350300
|
|||
hot_citylist = 350300
|
||||
|
||||
[db]
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~~
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
dbname = tmnet
|
||||
|
||||
[server]
|
||||
|
|
@ -25,16 +25,16 @@ db = 2
|
|||
|
||||
[rpc]
|
||||
# 本机服务配置
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
port = 50051
|
||||
|
||||
|
||||
[user_dbinfo]
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~~
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
dbname = user
|
||||
|
||||
[cloud_db]
|
||||
|
|
@ -46,27 +46,34 @@ password = pmenJIn7EaK40oThn
|
|||
dbname = gwperf
|
||||
|
||||
[cross_delay_db]
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~~
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
dbname = tmnet
|
||||
port = 3306
|
||||
|
||||
[roadnet_db]
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~~
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
dbname = tmnet
|
||||
|
||||
[task_db]
|
||||
host = 120.53.125.169
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.21
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~~
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
dbname = tmnet
|
||||
|
||||
[wave_db]
|
||||
host = sass_dev
|
||||
host_inner = 172.21.32.14
|
||||
user = root
|
||||
password = pmenJIn7EaK40oThn~~
|
||||
db_name = greenwave
|
||||
|
||||
|
||||
[executive]
|
||||
userid = 15836903493,18518481331
|
||||
Loading…
Reference in New Issue