dongchangxi/make2
1
0 Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

数据库代码抽离，增加影棚ID

Browse Source
This commit is contained in:
dongchangxi committed 2023-10-14 15:49:37 +08:00
1 parent 7ac055e796
commit abca8a3cfc
10 files changed
+527 -327
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

main_service.py
+21 -14
View File
@@ -1,7 +1,14 @@
import sys,socket,time
import sys,socket,time,platform
from logic import logic_main_service
import logging
import main_step1,main_step2,main_step3
if platform.system() == 'Windows':
#线上正式运行
sys.path.append('e:\\libs\\')
#本地测试
else:
sys.path.append('/data/deploy/make3d/make2/libs/')
import main_service_db
if __name__ == '__main__':
#循环值守
while True:
@@ -14,31 +21,31 @@ if __name__ == '__main__':
else:
if data["run_step"] == "step1":
# 本地测试分布运行的用
# time.sleep(5)
# print("更新step1的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
# logic_main_service.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step1","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
time.sleep(5)
print("更新step1的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
main_service_db.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step1","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
#生产线上用
main_step1.step1(data["task_key"], experience=False, makeloop=False,task_distributed_id=data['task_distributed_id'])
#main_step1.step1(data["task_key"], experience=False, makeloop=False,task_distributed_id=data['task_distributed_id'])
elif data["run_step"] == "step2":
# 本地测试分布运行的用
# time.sleep(15)
# print("更新step2的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
# logic_main_service.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step2","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
time.sleep(15)
print("更新step2的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
main_service_db.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step2","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
#生产线上用
main_step2.step2(data["task_key"], data['task_distributed_id'])
#main_step2.step2(data["task_key"], data['task_distributed_id'])
elif data["run_step"] == "step3":
# 本地测试分布运行的用
# time.sleep(8)
time.sleep(8)
# #更新子表的finished_at
# print("更新step3的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
# logic_main_service.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step3","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
print("更新step3的结束时间",time.strftime("%Y-%m-%d %H:%M:%S", time.localtime()))
main_service_db.update_task_distributed_detail({"task_distributed_id":data["task_distributed_id"],"step":"step3","finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
#更新主表的status 和 finished_at
#logic_main_service.update_task_distributed({"id":data["task_distributed_id"],"status":2,"finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
main_service_db.update_task_distributed({"id":data["task_distributed_id"],"status":2,"finished_at":time.strftime("%Y-%m-%d %H:%M:%S", time.localtime())})
#生产线上用
main_step3.step3(data["task_key"], data['task_distributed_id'])
#main_step3.step3(data["task_key"], data['task_distributed_id'])