From 32b30ca11a37c59a65544f8a1c3807e683423163 Mon Sep 17 00:00:00 2001 From: PAN Lei Date: Tue, 8 Mar 2022 20:58:22 +0100 Subject: [PATCH] add more infos to ReserveResultPojo --- card_pool.py | 5 +++++ check_results.py | 4 ++-- logs/LogSender.py | 7 +++++-- main.py | 4 ++-- notification/mailer.py | 12 ++++++------ pojo/ReserveResultPojo.py | 6 +++--- 6 files changed, 23 insertions(+), 15 deletions(-) diff --git a/card_pool.py b/card_pool.py index 1d1446d..26db54f 100644 --- a/card_pool.py +++ b/card_pool.py @@ -2,6 +2,9 @@ import logging import serial +import params +from logs.LogSender import LOG_SUBJECT_EVENT, TYPE_EVENT_CHANGE_SLOT + PORT = "/dev/tty.usbmodem1432101" BAUDRATE = 115200 @@ -28,6 +31,8 @@ class CardPool: self._send_command("AT+NEXT11\r") def switch_to_slot(self, slot_number: int): + params.oracle_log_sender.send_log(msg="换到" + str(slot_number) + "行", source=LOG_SUBJECT_EVENT, + type=TYPE_EVENT_CHANGE_SLOT) if slot_number < 10: self._send_command("AT+SWIT00-000{}\r".format(slot_number)) else: diff --git a/check_results.py b/check_results.py index d9f0d2d..586a715 100644 --- a/check_results.py +++ b/check_results.py @@ -4,7 +4,7 @@ from playwright.sync_api import sync_playwright import params from db.DbManager import DataManager -from logs.LogSender import EVENT_CHECK_RESULTS, LOG_SUBJECT_EVENT +from logs.LogSender import TYPE_EVENT_CHECK_RESULTS, LOG_SUBJECT_EVENT from pojo.ReserveResultPojo import ReserveResultPojo SORRY_SENTENCE = "nous sommes sincèrement désolés de n'avoir pu vous satisfaire cette fois-ci" @@ -48,7 +48,7 @@ def run(playwright, url) -> ResultEnum: # need to start at 21h00 if __name__ == '__main__': # get the list - params.oracle_log_sender.send_log(msg="开始检查约会结果", subject=LOG_SUBJECT_EVENT, type=EVENT_CHECK_RESULTS) + params.oracle_log_sender.send_log(msg="开始检查约会结果", subject=LOG_SUBJECT_EVENT, type=TYPE_EVENT_CHECK_RESULTS) db_manager = params.firebase_store_manager collection = db_manager.get_all_successful_items() count = 0 diff --git a/logs/LogSender.py b/logs/LogSender.py index 650092c..5eab257 100644 --- a/logs/LogSender.py +++ b/logs/LogSender.py @@ -10,9 +10,12 @@ from logs.AppLogging import init_logger from pojo import ReserveResultPojo from pojo.ReserveResultPojo import PublishType -# Log type +# Log subjects LOG_SUBJECT_EVENT = "EVENT" -EVENT_CHECK_RESULTS = "EVENT_CHECK_RESULTS" +# Log type +TYPE_EVENT_CHECK_RESULTS = "EVENT_CHECK_RESULTS" +TYPE_EVENT_RESET_ALL_SIM_CARDS = "EVENT_RESET_ALL_SIM_CARDS" +TYPE_EVENT_CHANGE_SLOT = "EVENT_CHANGE_SLOT" LOG_ERROR = "ERROR" LOG_TYPE_INFO = "INFO" LOG_APPOINTMENT_ERROR = "APPOINTMENT_ERROR" diff --git a/main.py b/main.py index 5edd2b8..c94478b 100644 --- a/main.py +++ b/main.py @@ -11,7 +11,7 @@ import params from ModemPool import ModemPool from card_pool import CardPool from commandor import Commandor -from logs.LogSender import LOG_APPOINTMENT_TIMEOUT, LOG_SUBJECT_EVENT +from logs.LogSender import LOG_APPOINTMENT_TIMEOUT, LOG_SUBJECT_EVENT, TYPE_EVENT_RESET_ALL_SIM_CARDS from params import MODEM_POOL_PORTS, CARD_POOL_PORT, firebase_store_manager, oracle_log_sender from pojo.ReserveResultPojo import ReserveResultPojo from utils.excel_reader import ExcelHelper @@ -160,7 +160,7 @@ def start_listen(): def read_all_the_phone_number(): - params.oracle_log_sender.send_log(msg="SIM卡自检开始", subject=LOG_SUBJECT_EVENT, type=LOG_SUBJECT_EVENT) + params.oracle_log_sender.send_log(msg="SIM卡自检开始", subject=LOG_SUBJECT_EVENT, type=TYPE_EVENT_RESET_ALL_SIM_CARDS) slot_number = 1 global current_card_pool_slot slot_sum = 30 diff --git a/notification/mailer.py b/notification/mailer.py index a96dfd0..bdf3908 100644 --- a/notification/mailer.py +++ b/notification/mailer.py @@ -56,11 +56,11 @@ class Mailer: if __name__ == '__main__': - result = ReserveResultPojo(email="panleicim@gmail.com", phone="0649614591", url="url", firstName="Lei", - lastName="PAN", message="msg", type=PublishType.SUCCESS, passport="Ed1543183", + result = ReserveResultPojo(email="purge_jigsaws_0p@icloud.com", phone="0649614591", url="url", firstName="wenjing", + lastName="Chen", message="msg", type=PublishType.SUCCESS, passport="Ed1543183", slot_position=1, sim_position=1) - mytemplate = Template(filename=definitions.ROOT_DIR + "/templates/appointment_results.html") - print(mytemplate.render(result_list=[result])) - # mailer = Mailer() - # mailer.send_email([result]) + # mytemplate = Template(filename=definitions.ROOT_DIR + "/templates/appointment_results.html") + # print(mytemplate.render(result_list=[result])) + mailer = Mailer() + mailer.send_email([result]) diff --git a/pojo/ReserveResultPojo.py b/pojo/ReserveResultPojo.py index 88167f4..d169d05 100644 --- a/pojo/ReserveResultPojo.py +++ b/pojo/ReserveResultPojo.py @@ -20,9 +20,9 @@ class ReserveResultPojo: email: None id = None accepted = None - passport: str - slot_position: int - sim_position: int + passport = None + slot_position = None + sim_position = None @staticmethod def from_firestore_dict(source):