mkt/mkt-phone
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Manual mergre from local code

Browse Source
This commit is contained in:
Сергей Филимонов 2024-01-19 15:51:06 +07:00
parent ccd5d6874d
commit c103fd34a3
4 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker-compose.yaml
View File

@ -48,6 +48,15 @@ services:
- mongo - mongo
networks: networks:
- phone - phone
worker-dev:
build: ./worker-dev
restart: always
environment:
- TZ=Asia/Krasnoyarsk
depends_on:
- mongo
networks:
- phone
web: web:
build: ./web build: ./web
restart: always restart: always

2
web/app.py
View File

@ -29,7 +29,7 @@ IgnoreList = ['83919865589', '83912051046', '83912051045', '84950213944', '84951
@app.route("/web/call/") @app.route("/web/call/")
def WebCall(): def WebCall():
call = coll_call.find().sort('time', -1) call = coll_call.find().limit(findLimit).sort('time', -1)
return render_template("WebCall.html", call=call) return render_template("WebCall.html", call=call)
@app.route("/web/call/status/<id>") @app.route("/web/call/status/<id>")

3
web_admin/templates/WebCall.html
View File

@ -22,6 +22,7 @@
<!-- <td>Номер оператора</td> --> <!-- <td>Номер оператора</td> -->
<td>Дата время</td> <td>Дата время</td>
<td>Дополнитительная информация</td> <td>Дополнитительная информация</td>
<td>uuid</td>
</tr> </tr>
<body> <body>
@ -54,6 +55,8 @@
{% if entry.reason|length > 1 %} {% if entry.reason|length > 1 %}
{{ entry.reason }} {{ entry.reason }}
{% endif %} {% endif %}
<td> {{ entry.uuid }}</td>
</td> </td>
</tr> </tr>

5
worker/app.py
View File

@ -63,7 +63,6 @@ def main():
insDict = {"client": srcJson['from'], "time": srcJson['time'], "status": 0, insDict = {"client": srcJson['from'], "time": srcJson['time'], "status": 0,
"recordUrl": srcJson["recordUrl"], "duration": srcJson["duration"], "important": tmpIncoming[srcJson['uuid']][2]} "recordUrl": srcJson["recordUrl"], "duration": srcJson["duration"], "important": tmpIncoming[srcJson['uuid']][2]}
except Exception as e: except Exception as e:
# print(srcJson)
print(e) print(e)
insDict = { insDict = {
"client": srcJson['from'], "time": srcJson['time'], "status": 1, "important": tmpIncoming[srcJson['uuid']][2]} "client": srcJson['from'], "time": srcJson['time'], "status": 1, "important": tmpIncoming[srcJson['uuid']][2]}
@ -94,11 +93,11 @@ def main():
#r = coll_phone.update_one({'$and': [{'client': {'$regex': srcJson['to']}}, {'status': 1}]}, {'$set': {'status': 2, 'callid': srcJson['uuid']}}) #r = coll_phone.update_one({'$and': [{'client': {'$regex': srcJson['to']}}, {'status': 1}]}, {'$set': {'status': 2, 'callid': srcJson['uuid']}})
r = coll_phone.update_one({'$and': [{'client': {'$regex': srcJson['to']}}, {'status': {'$in': [1,4]}}]}, {'$set': {'status': 2, 'callid': srcJson['uuid']}}) r = coll_phone.update_one({'$and': [{'client': {'$regex': srcJson['to']}}, {'status': {'$in': [1,4]}}]}, {'$set': {'status': 2, 'callid': srcJson['uuid']}})
if srcJson['state'] == 'HANGUP': if srcJson['state'] == 'HANGUP':
try: try:
# Проверяем заполнено ли поле recordURL, если нет то меняем статус на 4 # Проверяем заполнено ли поле recordURL, если нет то меняем статус на 4
if len(srcJson['recordUrl']) > 4: if len(srcJson['recordUrl']) > 4:
coll_phone.update_one({'callid':srcJson['uuid']}, {'$set': {'recordUrl': srcJson['recordUrl']}}) coll_phone.update_one({'callid':srcJson['uuid']}, {'$set': {'recordUrl': srcJson['recordUrl']}})
else: else:
coll_phone.update_one({'callid':srcJson['uuid']}, {'$set': {'status': 4}}) coll_phone.update_one({'callid':srcJson['uuid']}, {'$set': {'status': 4}})
except Exception as e: except Exception as e:
print(e) print(e)