libushang 3 týždňov pred
rodič
commit
16d82ad32c
4 zmenil súbory, kde vykonal 22 pridanie a 5 odobranie
  1. 2 2
      common/db/db_msg_center.py
  2. 3 2
      jobs/__init__.py
  3. 17 0
      jobs/yst_job.py
  4. 0 1
      jobs/yzy_job.py

+ 2 - 2
common/db/db_msg_center.py

@@ -42,7 +42,7 @@ def get_unread_msg_count(db: Session, user_id: int, msg_type_list: dict) -> dict
     data = []
     for msg_type in msg_type_list:
         where = and_(MsgCenter.msg_type == msg_type.strip())
-        logger.info(msg_type)
+        # logger.info(msg_type)
 
         c1 = 0
         if msg_type == '事件管理':
@@ -68,7 +68,7 @@ def get_unread_msg_count(db: Session, user_id: int, msg_type_list: dict) -> dict
             c1 = db.query(MsgCenter).filter(where).filter(and_(MsgCenter.del_flag == '0', MsgCenter.recv_userid == user_id, MsgCenter.recv_status == 0)).count()
         
         data.append({"name" : msg_type, "num": c1})
-    logger.info(data)
+    # logger.info(data)
     return data
 
 def update_msg_read(db: Session, user_id: int, msg_type: str, foreign_key: str) -> None:

+ 3 - 2
jobs/__init__.py

@@ -14,6 +14,7 @@ from .duty_job import proc as duty_proc
 from .vehicle_job import proc as vehicle_proc
 from .hkvideo_job import proc as hkvideo_proc
 from .sign_data_job import sign_data_proc
+from .yst_job import daiban_proc as yst_daiban_proc
 
 def register_jobs(scheduler: BaseScheduler):
     # scheduler.add_job(yzy_proc, next_run_time=(datetime.now() + timedelta(seconds=3)))
@@ -24,8 +25,8 @@ def register_jobs(scheduler: BaseScheduler):
     # scheduler.add_job(wdyy_proc, next_run_time=(datetime.now() + timedelta(seconds=3)))
     # scheduler.add_job(wdyy_proc, CronTrigger.from_crontab('0 * * * *'))
 
-    # scheduler.add_job(wdgh_proc, next_run_time=(datetime.now() + timedelta(seconds=13)))
-    # scheduler.add_job(wdyy_proc, CronTrigger.from_crontab('0 * * * *'))
+    scheduler.add_job(yst_daiban_proc, next_run_time=(datetime.now() + timedelta(seconds=13)))
+    scheduler.add_job(yst_daiban_proc, CronTrigger.from_crontab('* * * * *'))
 
     # 暂时不用了
     # scheduler.add_job(avcon_proc, next_run_time=(datetime.now() + timedelta(seconds=15)))

+ 17 - 0
jobs/yst_job.py

@@ -0,0 +1,17 @@
+
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+from datetime import datetime
+from sqlalchemy.orm import Session
+from utils import *
+from utils.redis_util import *
+from models import *
+from exceptions import *
+from database import get_local_db
+from extensions import logger
+from common import YzyApi
+from config import settings
+import traceback
+
+def daiban_proc(db = get_local_db()):
+    logger.info(datetime.now())

+ 0 - 1
jobs/yzy_job.py

@@ -11,7 +11,6 @@ from extensions import logger
 from common import YzyApi
 from config import settings
 import traceback
-import inspect
 
 def proc():
     if settings.IS_DEV: