no message

common/db/db_msg_center.py

@@ -22,13 +22,20 @@ def get_unread_msg_count(db: Session, user_id: int, msg_type_list: dict) -> dict
     for msg_type in msg_type_list:
         where = and_(MsgCenter.msg_type == msg_type.strip())
         logger.info(msg_type)
-        
-        if msg_type == '巡查工作':
-            where = and_(MsgCenter.msg_type == '隐患巡查')
-        elif msg_type == '数据管理':
-            where = and_(MsgCenter.msg_type == '数据采集')
 
-        c1 = db.query(MsgCenter).filter(where).filter(and_(MsgCenter.recv_userid == user_id, MsgCenter.recv_status == 0)).count()
+        c1 = 0
+        if msg_type == '事件管理':
+            # 等同 list_active
+            where = and_(EventBase.del_flag == '0', EventBase.event_title != '', EventBase.event_status.in_(['0', '1']))
+            c1 = db.query(EventBase).filter(where).count() 
+        else:
+            if msg_type == '巡查工作':
+                where = and_(MsgCenter.msg_type == '隐患巡查')
+            elif msg_type == '数据管理':
+                where = and_(MsgCenter.msg_type == '数据采集')
+
+            c1 = db.query(MsgCenter).filter(where).filter(and_(MsgCenter.recv_userid == user_id, MsgCenter.recv_status == 0)).count()
+        
         data.append({"name" : msg_type, "num": c1})
     logger.info(data)
     return data

routers/api/eventManagement/event.py

@@ -114,7 +114,8 @@ def send_yzy_msg(db: Session, event_base: EventBase, user_id: int) -> None:
     }
     YzyApi.add_to_msg_queue(db, data)
 
-    db_msg_center.add_msg(db, "事件管理", event_base.id, to_user_id)
+    # 改为没用关闭的事件统计
+    # db_msg_center.add_msg(db, "事件管理", event_base.id, to_user_id)
 
 @router.get('/list')
 async def get_event_list(