ok

jobs/yzy_job.py

@@ -7,7 +7,7 @@ from utils import *
 from utils.redis_util import *
 from models import *
 from exceptions import *
-from database import get_local_db
+from database import get_local_db, get_share_db
 from extensions import logger
 from common import YzyApi
 from config import settings
@@ -84,6 +84,14 @@ def yzy_msg_queue_proc():
                 except Exception as e:
                     traceback.print_exc()
 
+            redis_unlock(lock_key)
+        print('yzy_msg_queue_proc end.')
+
+    with get_share_db() as db:
+        print('yzy_msg_queue_proc_sk starting...')
+        lock_key = "yzy_msg_queue_job_sk"
+        if redis_lock(lock_key):
+            logger.info(datetime.now())
             rows = db.query(YzyMsgQueueSk).filter(YzyMsgQueueSk.sent_status == 0).limit(30).all()
             for row in rows:
                 try:
@@ -104,7 +112,7 @@ def yzy_msg_queue_proc():
                     traceback.print_exc()
 
             redis_unlock(lock_key)
-        print('yzy_msg_queue_proc end.')
+        print('yzy_msg_queue_proc_sk end.')
 
 def yzy_unit_queue_proc():
     if settings.IS_PROD == False:

models/sharedb.py

@@ -155,4 +155,28 @@ class RescueTeams(Base):
     del_flag = Column(String(2), comment='删除标识，0未删除，2删除')
     create_by = Column(String(255), comment='创建者')
     create_time = Column(DateTime,  comment='创建时间')
-    update_by = Column(String(255), comment='更新者')
+    update_by = Column(String(255), comment='更新者')
+
+
+
+class YzyMsgQueueSk(Base):
+    """
+    粤政易消息队列(数科)
+    """
+    __tablename__ = "yzy_msg_queue_sk"
+
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    request_id = Column(String, default='', server_default='', comment='消息ID')
+    yzy_userid = Column(String, default='', server_default='', comment='粤政易用户ID')
+    title = Column(String, default='', server_default='', comment='标题')
+    content = Column(Text, default='', server_default='', comment='消息体')
+    detail_url = Column(String, default='', server_default='', comment='跳转URL')
+    create_time = Column(DateTime, server_default=func.now(), comment='数据创建时间')
+    sent_time = Column(String, comment='发送时间')
+    sent_status = Column(Integer, default=0, server_default='0', comment='发送状态 0 待发 1发送中 2 发送成功 9 发送失败')
+    errcode = Column(Integer, default=0, server_default='0', comment='错误代码')
+    errmsg = Column(String, default='', server_default='', comment='错误提示')
+    
+    class Config:
+        orm_mode = True
+

models/yzy_base.py

@@ -273,23 +273,3 @@ class YstProcessEntity(Base):
     class Config:
         orm_mode = True
 
-
-
-class YzyMsgQueueSk(Base):
-    """
-    粤政易消息队列(数科)
-    """
-    __tablename__ = "yzy_msg_queue_sk"
-
-    id = Column(Integer, primary_key=True, autoincrement=True)
-    request_id = Column(String, default='', server_default='', comment='消息ID')
-    yzy_userid = Column(String, default='', server_default='', comment='粤政易用户ID')
-    title = Column(String, default='', server_default='', comment='标题')
-    content = Column(Text, default='', server_default='', comment='消息体')
-    detail_url = Column(String, default='', server_default='', comment='跳转URL')
-    create_time = Column(DateTime, server_default=func.now(), comment='数据创建时间')
-    sent_time = Column(String, comment='发送时间')
-    sent_status = Column(Integer, default=0, server_default='0', comment='发送状态 0 待发 1发送中 2 发送成功 9 发送失败')
-    errcode = Column(Integer, default=0, server_default='0', comment='错误代码')
-    errmsg = Column(String, default='', server_default='', comment='错误提示')
-