From 5d70327428efc1d341617d0b26c059bc5217b951 Mon Sep 17 00:00:00 2001
From: yl <ykxkd@outlook.com>
Date: 星期四, 27 十月 2022 17:33:06 +0800
Subject: [PATCH] 极光消息推送
---
VueWebApi/DLL/DAL/AppDeviceManageDAL.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
index 86c7ecc..673b6ae 100644
--- a/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
+++ b/VueWebApi/DLL/DAL/AppDeviceManageDAL.cs
@@ -931,7 +931,7 @@
mn.flag = data.Rows[i]["FLAG"].ToString();
mn.children = new List<AnDnDateSub>();
//鏍规嵁鍛煎彨绫诲瀷id鏌ユ壘缁戝畾浜哄憳
- sql = @"select U.usercode,U.username
+ sql = @"select U.usercode,U.username,U.rid
from TAnDon_Roul_ConFigUser A
inner join TUser U on A.usercode=U.usercode
where A.ando_cogfigid=@id";
@@ -942,6 +942,8 @@
for (int j = 0; j < data0.Rows.Count; j++)
{
AnDnDateSub sn = new AnDnDateSub();
+ sn.rid= data0.Rows[j]["RID"].ToString();//rid
+ sn.alias = data0.Rows[j]["RID"].ToString() + data0.Rows[j]["USERCODE"].ToString(); //鍒悕
sn.usercode = data0.Rows[j]["USERCODE"].ToString();
sn.username = data0.Rows[j]["USERNAME"].ToString();
mn.children.Add(sn);
@@ -1037,6 +1039,7 @@
eqp_code = eqpcode,
type = code,
resp_user = json[i].children[j].usercode,
+ alias= json[i].children[j].alias,
status = "N"
}
});
@@ -1044,7 +1047,7 @@
}
}
//鏋佸厜鎺ㄩ��
- //mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
+ mes = JPushManage.ExecutePushByUserId(username, wkshpcode, eqpcode, json);
bool aa = DapperHelper.DoTransaction(list);
if (aa)
{
--
Gitblit v1.9.3