|
@@ -19,7 +19,7 @@ global tasklist
|
|
|
|
|
|
|
|
|
|
|
|
-botname="open_servicerequest_booked"
|
|
|
+botname="open_service_request_booked"
|
|
|
|
|
|
|
|
|
|
|
@@ -31,7 +31,7 @@ botname="open_servicerequest_booked"
|
|
|
|
|
|
|
|
|
|
|
|
-botname="open_servicerequest_closed"
|
|
|
+botname="open_service_request_closed"
|
|
|
|
|
|
operating_status=239
|
|
|
JID=botname+"@"+config.JSERVER
|
|
@@ -49,7 +49,7 @@ headers = {'Authorization': f'Token {token}'}
|
|
|
listen_to=["799999999990@ej.sharix-app.org","test@ej.sharix-app.org"]
|
|
|
|
|
|
|
|
|
-proceed_to=[botname, "open_strequest_new@ej.sharix-app.org", "open_servicerequest_closed@ej.sharix-app.org", "open_servicerequest_forcemajeure@ej.sharix-app.org"]
|
|
|
+proceed_to=[botname, "open_st_request_new@ej.sharix-app.org", "open_service_request_closed@ej.sharix-app.org", "open_service_request_forcemajeure@ej.sharix-app.org"]
|
|
|
|
|
|
|
|
|
idle_value=10
|
|
@@ -71,7 +71,7 @@ def message_handler(conn, mess):
|
|
|
tasklist.append(orderObj)
|
|
|
bot.bot_log(str(datetime.now())+" Поступивший заказ успешно добавлен в очередь обработки\n")
|
|
|
|
|
|
-def open_servicerequest_closed_wait(period,localtask):
|
|
|
+def open_service_request_closed_wait(period,localtask):
|
|
|
bot.bot_log(botname+" "+str(datetime.now())+" "+"Заказ ожидает\n")
|
|
|
time.sleep(period)
|
|
|
|
|
@@ -82,7 +82,7 @@ def open_servicerequest_closed_wait(period,localtask):
|
|
|
bot.proceed_status(proceed_to[0],localtask)
|
|
|
bot.bot_log(botname+" "+str(datetime.now())+" "+"Заказ подождал и отправлен в очередь\n")
|
|
|
|
|
|
-def open_servicerequest_closed_process(localtask):
|
|
|
+def open_service_request_closed_process(localtask):
|
|
|
bot.bot_log(botname + " " + str(datetime.now()) + " " + "Заказ в обработчике\n")
|
|
|
response = requests.delete(config.API_URL+f"/dbsynce/api/orders/{localtask.id}/",headers=headers)
|
|
|
text = (config.API_URL+f"dbsynce/api/orders/{localtask.id}/")
|
|
@@ -95,7 +95,7 @@ def open_servicerequest_closed_process(localtask):
|
|
|
|
|
|
|
|
|
|
|
|
-def open_servicerequest_closed():
|
|
|
+def open_service_request_closed():
|
|
|
log_thread = threading.Thread(target=log_handler)
|
|
|
log_thread.daemon = True
|
|
|
log_thread.start()
|
|
@@ -108,11 +108,11 @@ def open_servicerequest_closed():
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
+
|
|
|
|
|
|
|
|
|
if (localtask.status in ("239","211","212","220","221","222","231","238","229")):
|
|
|
- t1=threading.Thread(target=open_servicerequest_closed_process, args=([localtask]))
|
|
|
+ t1=threading.Thread(target=open_service_request_closed_process, args=([localtask]))
|
|
|
t1.start()
|
|
|
|
|
|
|
|
@@ -133,4 +133,4 @@ tasklist_dbsynce=jsreq.requestGetList(token, config.API_URL+"/dbsynce/api/orders
|
|
|
bot = JabberBot(JID, PASSWORD, PORT)
|
|
|
|
|
|
bot.register_handler('message', message_handler)
|
|
|
-bot.start(open_servicerequest_closed)
|
|
|
+bot.start(open_service_request_closed)
|