no message

routers/api/eventManagement/event.py

@@ -882,7 +882,6 @@ async def send_emergency_plan_task_by_yzy(
     plan_info = get_model_dict(row)
     plan_name = plan_info['plan_name']
 
-    send_queue = []
     rows = db.query(EmergencyUnit).filter(EmergencyUnit.plan_id == plan_id).order_by(EmergencyUnit.dept_order.asc()).all()
     if len(rows) == 0:
         return {
@@ -964,27 +963,30 @@ async def send_emergency_plan_task_by_yzy(
         db.commit()
         db.refresh(event_emergency_notify)
 
+        # 发送粤政易消息
+        detail_url = "{}{}{}".format(settings.YZY_WEB_ROOT, "/yjxp/#/event/detail?event_id=", eventId)
         description = "预案名称: " + plan_name + "\n响应级别:" + response_level + "\n消息内容: "+yzy_content
-        redirect_url = "/" # 主页
-        # detail_url = YzyApi.format_redirect_url(redirect_url)
-        detail_url = "{}{}".format(settings.YZY_WEB_ROOT, redirect_url)
-
-        send_queue.append({
-            "id": event_emergency_notify.id,
-            "yzy_user_id": yzy_user_id,
-            "description": description,
-            "detail_url": detail_url
-        })
-
-        db_msg_center.add_msg(db, "预案通知", event_emergency_notify.id, user_id)
-    
-    background_tasks.add_task(async_send_yzy_msg, db, send_queue)
+        data = {
+            "yzy_userid": yzy_user_id,
+            "mobile": yzy_account,
+            "content": description,
+            "recorded_by": user_id,
+            "detail_url": detail_url,
+            "foreign_key": event_emergency_notify.id,
+            "from_scenario": "event_emergency_notify",
+            "title": "预案通知"
+        }
+        YzyApi.add_to_msg_queue(db, data)
+
+        db_msg_center.add_msg(db, "预案通知", event_emergency_notify.id, _user_id)
 
     return {
         "code": 200,
         "msg": "预案任务下发成功"
     }
 
+
+'''
 def async_send_yzy_msg(db: Session, queue: dict):
     for item in queue:
         event_emergency_notify = db.query(EventEmergencyNotify).filter(EventEmergencyNotify.id == item['id']).first()
@@ -1008,7 +1010,8 @@ def async_send_yzy_msg(db: Session, queue: dict):
 
                 except Exception:
                     pass
-        
+'''
+
 # 获取预案通知
 @router.post("/emergency_plan_task_list")
 async def emergency_plan_task_list(

routers/api/onlineRollCall/call.py

@@ -563,7 +563,7 @@ def send_yzy_msg(db: Session, detail_entity: OnlineRollCallDetail, user_id: int)
                 "title": "在线点名提醒"
             }
             YzyApi.add_to_msg_queue(db, data)
-            db_msg_center.add_msg(db, "在线点名", detail_entity.id, user_id)
+            db_msg_center.add_msg(db, "在线点名", detail_entity.id, to_user_id)
 
             user_list.append(yzy_account)