no message

common/enc/sys_user_data.py

@@ -23,7 +23,7 @@ def sign_row(db: Session, row: SysUser) -> None:
     phonenumber = mpfun.enc_data(row.phonenumber) # 手机号码
     status = str(row.status) # 用户状态
     del_flag = row.del_flag # 是否已删除
-    yzy_account = mpfun.enc_data(row.yzy_account) # 粤政易账号
+    yzy_account = (row.yzy_account) # 粤政易账号
 
     sign_data = ",".join([user_id, user_name, password, nick_name, dept_id, dept_name, email, phonenumber, status, del_flag, yzy_account])
     sign_hmac = mpfun.sign_data(sign_data)

models/ry_sys_base.py

@@ -151,8 +151,8 @@ class SysUser(Base):
     create_time = Column(DateTime, default=datetime.now, comment='创建时间')
     update_by = Column(BigInteger, default=None, comment='更新者')
     update_time = Column(DateTime, default=datetime.now, onupdate=datetime.now, comment='更新时间')
-    remark = Column(String(500), default=None, comment='备注')
-    yzy_account = Column(String(50), default=None, comment='粤政易账号')
+    remark = Column(String(500), default='', comment='备注')
+    yzy_account = Column(String(50), default='', comment='粤政易账号')
     sign = Column(String, server_default='', default='', comment='HMACSM3数值')
 
     @property

routers/api/eventManagement/event.py

@@ -1001,23 +1001,21 @@ async def send_emergency_plan_task_by_yzy(
         if contact_row is None:
             continue
         
-        yzy_account = mpfun.dec_data(contact_row.yue_gov_ease_phone)
+        yue_gov_ease_phone = contact_row.yue_gov_ease_phone
+        mobile = mpfun.dec_data(yue_gov_ease_phone)
         nick_name = contact_row.contact_name
         
-        yzy_user_row = db.query(YzyOrgUserEntity).filter(YzyOrgUserEntity.account == yzy_account).first()
+        yzy_user_row = db.query(YzyOrgUserEntity).filter(YzyOrgUserEntity.account == mobile).first()
         if yzy_user_row is None:
-            logger.info("粤政易人员ID不存在", yzy_account)
-            yzy_user_id = ""
+            user_row = db.query(SysUser).filter(and_(SysUser.del_flag == '0', SysUser.phonenumber == yue_gov_ease_phone)).first()
+            if user_row is None:
+                logger.info("没用匹配的粤政易用户: {}", mobile)
+                continue
+            else:
+                yzy_user_id = user_row.yzy_account
         else:
             yzy_user_id = yzy_user_row.userid
-
-
-        # 通过通讯录匹配相关负责人
-        # user_row = db.query(SysUser).filter(SysUser.user_id == 1).first()
-        # user_id = user_row.user_id
-        # user_name = user_row.user_name
-        # nick_name = user_row.nick_name
-        # yzy_user_id = "eb4kehgy6wj4qn0jhx1dk6"  # 暂时写死梦梅的账号
+        
         yzy_content = "{}，您好！《{}》现已全面启动，特此通知您单位迅速响应，全力做好预案工作要点：{}".format(row.dept_name, plan_info['plan_name'], row.content)
 
         event_emergency_notify = EventEmergencyNotify(
@@ -1039,12 +1037,15 @@ async def send_emergency_plan_task_by_yzy(
         db.commit()
         db.refresh(event_emergency_notify)
 
+        description = "事件名称: " + event_row.event_title + "\n事件等级:" + db_dict.get_dict_label(db, "mm_event_level", event_info.event_level) + "\n事发地点: " + event_row.address
+        db_msg_center.add_message(db, "事件接报", _user_id, "事件接报提醒", description, event_row.event_code, 'event_base')
+
         # 发送粤政易消息
         detail_url = "{}{}{}".format(settings.YZY_WEB_ROOT, "/yjxp/#/event/detail?event_id=", eventId)
         description = "预案名称: " + plan_name + "\n响应级别:" + response_level + "\n消息内容: "+yzy_content
         data = {
             "yzy_userid": yzy_user_id,
-            "mobile": yzy_account,
+            "mobile": mobile,
             "content": description,
             "recorded_by": user_id,
             "detail_url": detail_url,
@@ -1053,7 +1054,6 @@ async def send_emergency_plan_task_by_yzy(
             "title": "预案通知"
         }
         YzyApi.add_to_msg_queue(db, data)
-
         db_msg_center.add_message(db, "预案通知", _user_id, f"{plan_name}{response_level}通知", yzy_content, event_emergency_notify.id, "event_emergency_notify")
 
     

routers/prod_api/system/user/__init__.py

@@ -969,7 +969,7 @@ async def userlist( user_id_1: int = Query(None ,description='用户id'),
                 "remark": user.remark,
                 "createTime": user.create_time.strftime('%Y-%m-%d %H:%M:%S') if user.create_time else '',
                 "deptName": user.dept_name,
-                "yzyAccount": mpfun.dec_data(user.yzy_account),
+                "yzyAccount": (user.yzy_account),
             }
 
         roles = get_role(db,roleIds)