Skip to content

E
Education
Commit 9502602c authored by 黄奎's avatar 黄奎
Browse files
Options

1111

parent 30c19983
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 234 additions and 163 deletions
Edu.Common/Message/MessageHelper.cs
View file @ 9502602c
...@@ -2,38 +2,23 @@ ...@@ -2,38 +2,23 @@
using System; using System;
using System.Collections.Generic; using System.Collections.Generic;
using System.Text; using System.Text;
using System.Threading.Tasks;
namespace Edu.Common.Message namespace Edu.Common.Message
{ {
/// <summary> /// <summary>
/// 消息发送 /// 消息队列帮助类
/// </summary> /// </summary>
public class MessageHelper public class MessageHelper : IDisposable
{ {
/// <summary> private readonly ConnectionFactory _factory;
/// 获取连接 private IConnection _connection;
/// </summary> private IModel _channel;
/// <param name="rabbitConfig">连接配置实体</param>
/// <returns></returns>
private static ConnectionFactory GetConnectionFactory(RabbitConfig rabbitConfig)
{
ConnectionFactory factory = new ConnectionFactory
{
HostName = rabbitConfig.HostName,
//默认端口
Port = rabbitConfig.Port,
UserName = rabbitConfig.UserName,
Password = rabbitConfig.Password,
};
return factory;
}
/// <summary> /// <summary>
/// 发送信息 /// 构造函数
/// </summary> /// </summary>
/// <param name="message"></param> public MessageHelper()
public static void SendMessage(PushMessageModel message)
{ {
Int32.TryParse(Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "Port"), out int Port); Int32.TryParse(Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "Port"), out int Port);
RabbitConfig rabbitConfig = new RabbitConfig() RabbitConfig rabbitConfig = new RabbitConfig()
...@@ -44,62 +29,118 @@ namespace Edu.Common.Message ...@@ -44,62 +29,118 @@ namespace Edu.Common.Message
UserName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "UserName"), UserName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "UserName"),
QueenName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "QueenName"), QueenName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "QueenName"),
}; };
var obj = new // 设置连接参数
_factory = new ConnectionFactory()
{ {
Id = 0,// 主键 HostName = rabbitConfig.HostName,
message.Title, //默认端口
message.Content, Port = Port,
message.CoverImg, UserName = rabbitConfig.UserName,
message.CategoryId, Password = rabbitConfig.Password,
message.Platform,
message.SendType,
message.SendTime,
message.ReceiveId,
message.JumpUrl,
message.CreateByName,
message.MsgSign,
message.MsgTemplateCode,
message.WorkMsgType,
Status = 0,
CreateTime = DateTime.Now,
AppId = Common.Config.PushAppId,
IsRead=0,
}; };
Task.Run(() => }
/// <summary>
/// 发送消息
/// </summary>
/// <param name="message"></param>
/// <param name="PushAppId"></param>
private void SendMessage(PushMessageModel message)
{
try
{ {
try InitConnection();
Int32.TryParse(Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "Port"), out int Port);
RabbitConfig rabbitConfig = new RabbitConfig()
{ {
using (IConnection conn = GetConnectionFactory(rabbitConfig).CreateConnection()) HostName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "HostName"),
{ Password = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "Password"),
using (IModel channel = conn.CreateModel()) Port = Port,
{ UserName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "UserName"),
//在MQ上定义一个持久化队列，如果名称相同不会重复创建 QueenName = Common.Config.ReadConfigKey("RabbitMqConfig", subKey: "QueenName"),
channel.QueueDeclare(rabbitConfig.QueenName, true, false, false, null); };
byte[] buffer = Encoding.UTF8.GetBytes(Common.Plugin.JsonHelper.Serialize(obj)); string queenName = rabbitConfig.QueenName;
IBasicProperties properties = channel.CreateBasicProperties(); var obj = new
properties.DeliveryMode = 2;
channel.BasicPublish("", rabbitConfig.QueenName, properties, buffer);
}
}
}
catch (Exception ex)
{ {
Common.Plugin.LogHelper.Write(ex, "RabbitMq_SendMessage"); Id = 0,// 主键
} message.Title,
}); message.Content,
message.CoverImg,
message.CategoryId,
message.Platform,
message.SendType,
message.SendTime,
message.ReceiveId,
message.JumpUrl,
message.CreateByName,
message.MsgSign,
message.MsgTemplateCode,
message.WorkMsgType,
Status = 0,
CreateTime = DateTime.Now,
AppId = Common.Config.PushAppId,
IsRead = 0,
};
var body = Encoding.UTF8.GetBytes(Common.Plugin.JsonHelper.Serialize(obj));
// 声明队列
_channel.QueueDeclare(queue: queenName,
durable: true,// 设置为true表示队列是持久化的
exclusive: false,
autoDelete: false,
arguments: null);
IBasicProperties properties = _channel.CreateBasicProperties();
properties.DeliveryMode = 2;
_channel.BasicPublish(exchange: "", routingKey: queenName, basicProperties: properties, body: body);
Common.Plugin.LogHelper.WriteInfo("发送企微消息:" + Common.Plugin.JsonHelper.Serialize(obj));
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "SendMessage");
}
} }
/// <summary> /// <summary>
/// 批量推送 /// 发送消息
/// </summary> /// </summary>
/// <param name="msgList"></param> /// <param name="list"></param>
public static void SendMessage(List<PushMessageModel> msgList) /// <param name="PushAppId"></param>
public void SendMessage(List<PushMessageModel> list)
{ {
foreach (var item in msgList) foreach (var item in list)
{ {
SendMessage(item); SendMessage(item);
} }
} }
/// <summary>
/// 初始化链接
/// </summary>
private void InitConnection()
{
try
{
if (_connection == null || !_connection.IsOpen)
{
_connection = _factory.CreateConnection();
_channel = _connection.CreateModel();
}
}
catch (Exception ex)
{
Common.Plugin.LogHelper.Write(ex, "InitConnection");
}
}
/// <summary>
/// 释放资源
/// </summary>
public void Dispose()
{
_channel?.Close();
_channel?.Dispose();
_connection?.Close();
_connection?.Dispose();
}
} }
} }
Edu.Common/Plugin/PushWorkChatHelper.cs
View file @ 9502602c
...@@ -36,7 +36,8 @@ namespace Edu.Common.Plugin ...@@ -36,7 +36,8 @@ namespace Edu.Common.Plugin
Platform = 5, Platform = 5,
ReceiveId = receiveid ReceiveId = receiveid
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> list = new List<Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(list);
} }
} }
} }
Edu.Module.Course/ClassModule.cs
View file @ 9502602c
...@@ -2184,8 +2184,8 @@ namespace Edu.Module.Course ...@@ -2184,8 +2184,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -2213,7 +2213,8 @@ namespace Edu.Module.Course ...@@ -2213,7 +2213,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -2246,8 +2247,8 @@ namespace Edu.Module.Course ...@@ -2246,8 +2247,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
#region 即将欠费提醒（管理者） #region 即将欠费提醒（管理者）
...@@ -2274,7 +2275,8 @@ namespace Edu.Module.Course ...@@ -2274,7 +2275,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -2307,8 +2309,8 @@ namespace Edu.Module.Course ...@@ -2307,8 +2309,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -2337,7 +2339,8 @@ namespace Edu.Module.Course ...@@ -2337,7 +2339,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -2370,8 +2373,8 @@ namespace Edu.Module.Course ...@@ -2370,8 +2373,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -2400,7 +2403,8 @@ namespace Edu.Module.Course ...@@ -2400,7 +2403,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -2438,7 +2442,8 @@ namespace Edu.Module.Course ...@@ -2438,7 +2442,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
...@@ -2663,8 +2668,8 @@ namespace Edu.Module.Course ...@@ -2663,8 +2668,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -2692,7 +2697,8 @@ namespace Edu.Module.Course ...@@ -2692,7 +2697,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
......
Edu.Module.Course/OrderModule.cs
View file @ 9502602c
...@@ -1728,7 +1728,8 @@ namespace Edu.Module.Course ...@@ -1728,7 +1728,8 @@ namespace Edu.Module.Course
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
......
Edu.Module.Customer/CustomerStudentModule.cs
View file @ 9502602c
...@@ -324,7 +324,8 @@ namespace Edu.Module.Customer ...@@ -324,7 +324,8 @@ namespace Edu.Module.Customer
if (!string.IsNullOrEmpty(queryTargetWorkId)) if (!string.IsNullOrEmpty(queryTargetWorkId))
{ {
modelWork.ReceiveId = queryTargetWorkId; modelWork.ReceiveId = queryTargetWorkId;
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
if (assistList != null && assistList.Count > 0) if (assistList != null && assistList.Count > 0)
...@@ -335,7 +336,8 @@ namespace Edu.Module.Customer ...@@ -335,7 +336,8 @@ namespace Edu.Module.Customer
if (!string.IsNullOrEmpty(queryTargetWorkId)) if (!string.IsNullOrEmpty(queryTargetWorkId))
{ {
modelWork.ReceiveId = queryTargetWorkId; modelWork.ReceiveId = queryTargetWorkId;
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
} }
...@@ -767,7 +769,8 @@ namespace Edu.Module.Customer ...@@ -767,7 +769,8 @@ namespace Edu.Module.Customer
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
} }
......
Edu.Module.Duty/DutyPlanModule.cs
View file @ 9502602c
This diff is collapsed.
Edu.Module.Duty/VisitorReserveModule.cs
View file @ 9502602c
...@@ -48,7 +48,7 @@ namespace Edu.Module.Duty ...@@ -48,7 +48,7 @@ namespace Edu.Module.Duty
/// 账号管理仓储层对象 /// 账号管理仓储层对象
/// </summary> /// </summary>
private readonly RB_AccountRepository accountRepository = new RB_AccountRepository(); private readonly RB_AccountRepository accountRepository = new RB_AccountRepository();
/// <summary> /// <summary>
/// 学员仓储层对象 /// 学员仓储层对象
/// </summary> /// </summary>
...@@ -104,7 +104,7 @@ namespace Edu.Module.Duty ...@@ -104,7 +104,7 @@ namespace Edu.Module.Duty
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
[TransactionCallHandler] [TransactionCallHandler]
public virtual bool SetVisitorReserveModule(RB_Visitor_Reserve_Extend model,out string message) public virtual bool SetVisitorReserveModule(RB_Visitor_Reserve_Extend model, out string message)
{ {
message = ""; message = "";
bool flag; bool flag;
...@@ -138,7 +138,8 @@ namespace Edu.Module.Duty ...@@ -138,7 +138,8 @@ namespace Edu.Module.Duty
{ {
model.ReserveClassId = remodel.ReserveClassId; model.ReserveClassId = remodel.ReserveClassId;
} }
else { else
{
var newFlag = SetReserveClassModule(reserveClass, out string newMsg); var newFlag = SetReserveClassModule(reserveClass, out string newMsg);
if (!newFlag) if (!newFlag)
{ {
...@@ -157,7 +158,7 @@ namespace Edu.Module.Duty ...@@ -157,7 +158,7 @@ namespace Edu.Module.Duty
return false; return false;
} }
model.ReserveClassId = reserveClass.ReserveClassId; model.ReserveClassId = reserveClass.ReserveClassId;
} }
} }
if (visitor_ReserveRepository.ExistsVisitorReserveRepository(model)) if (visitor_ReserveRepository.ExistsVisitorReserveRepository(model))
{ {
...@@ -215,7 +216,7 @@ namespace Edu.Module.Duty ...@@ -215,7 +216,7 @@ namespace Edu.Module.Duty
/// </summary> /// </summary>
/// <param name="Id"></param> /// <param name="Id"></param>
/// <returns></returns> /// <returns></returns>
public bool UpdateVisitorReserveStatusModule(int Id,int ReserveStatus,string Remark) public bool UpdateVisitorReserveStatusModule(int Id, int ReserveStatus, string Remark)
{ {
Dictionary<string, object> fileds = new Dictionary<string, object>() Dictionary<string, object> fileds = new Dictionary<string, object>()
{ {
...@@ -254,17 +255,17 @@ namespace Edu.Module.Duty ...@@ -254,17 +255,17 @@ namespace Edu.Module.Duty
string visitorIds = string.Join(",", visitorList.Select(qitem => qitem.Visitor_Id)); string visitorIds = string.Join(",", visitorList.Select(qitem => qitem.Visitor_Id));
if (!string.IsNullOrEmpty(visitorIds)) if (!string.IsNullOrEmpty(visitorIds))
{ {
stuOrderList= student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel() stuOrderList = student_OrderGuestRepository.GetStrOrderGuestListRepository(new RB_Student_OrderGuest_ViewModel()
{ {
QStudentIds = visitorIds QStudentIds = visitorIds
}); });
} }
} }
foreach (var item in list) foreach (var item in list)
{ {
var tempList = visitorList?.Where(qitem => qitem.ReserveClassId == item.ReserveClassId); var tempList = visitorList?.Where(qitem => qitem.ReserveClassId == item.ReserveClassId);
item.JoinNum = tempList?.Count()??0; item.JoinNum = tempList?.Count() ?? 0;
item.VisitorList = tempList?.ToList() ?? new List<RB_Visitor_Reserve_Extend>(); item.VisitorList = tempList?.ToList() ?? new List<RB_Visitor_Reserve_Extend>();
int OrderCount = 0; int OrderCount = 0;
int failCount = 0; int failCount = 0;
...@@ -279,7 +280,7 @@ namespace Edu.Module.Duty ...@@ -279,7 +280,7 @@ namespace Edu.Module.Duty
OrderCount++; OrderCount++;
} }
} }
item.FailCount = failCount; item.FailCount = failCount;
item.OrderCount = OrderCount; item.OrderCount = OrderCount;
if (item.OrderCount > 0) if (item.OrderCount > 0)
...@@ -310,7 +311,7 @@ namespace Edu.Module.Duty ...@@ -310,7 +311,7 @@ namespace Edu.Module.Duty
/// </summary> /// </summary>
/// <param name="model"></param> /// <param name="model"></param>
/// <returns></returns> /// <returns></returns>
public bool SetReserveClassModule(RB_Reserve_Class_Extend model,out string message) public bool SetReserveClassModule(RB_Reserve_Class_Extend model, out string message)
{ {
bool flag; bool flag;
message = ""; message = "";
...@@ -368,8 +369,8 @@ namespace Edu.Module.Duty ...@@ -368,8 +369,8 @@ namespace Edu.Module.Duty
var teacherList = accountRepository.GetAccountListRepository(new Model.ViewModel.User.RB_Account_ViewModel() var teacherList = accountRepository.GetAccountListRepository(new Model.ViewModel.User.RB_Account_ViewModel()
{ {
Group_Id = model.Group_Id, Group_Id = model.Group_Id,
QAccountIds = (model?.TeacherId??0) +","+(oldModel?.TeacherId??0), QAccountIds = (model?.TeacherId ?? 0) + "," + (oldModel?.TeacherId ?? 0),
AccountType= Common.Enum.User.AccountTypeEnum.Teacher AccountType = Common.Enum.User.AccountTypeEnum.Teacher
}); });
Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel() Common.Message.PushMessageModel pushModel = new Common.Message.PushMessageModel()
{ {
...@@ -382,7 +383,7 @@ namespace Edu.Module.Duty ...@@ -382,7 +383,7 @@ namespace Edu.Module.Duty
SendType = 0, SendType = 0,
Title = "试听课", Title = "试听课",
Platform = 2, Platform = 2,
ReceiveId = (teacherList.Where(qitem=>qitem.AccountId==model.TeacherId)?.FirstOrDefault()?.Id??0).ToString(), ReceiveId = (teacherList.Where(qitem => qitem.AccountId == model.TeacherId)?.FirstOrDefault()?.Id ?? 0).ToString(),
}; };
Common.Message.PushMessageModel pushModel2 = new Common.Message.PushMessageModel() Common.Message.PushMessageModel pushModel2 = new Common.Message.PushMessageModel()
{ {
...@@ -402,7 +403,7 @@ namespace Edu.Module.Duty ...@@ -402,7 +403,7 @@ namespace Edu.Module.Duty
pushModel, pushModel,
pushModel2 pushModel2
}; };
Common.Message.MessageHelper.SendMessage(messageList); new Common.Message.MessageHelper().SendMessage(messageList);
} }
} }
else else
...@@ -431,7 +432,8 @@ namespace Edu.Module.Duty ...@@ -431,7 +432,8 @@ namespace Edu.Module.Duty
}; };
if (flag) if (flag)
{ {
Common.Message.MessageHelper.SendMessage(pushModel); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { pushModel };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
return flag; return flag;
...@@ -492,12 +494,12 @@ namespace Edu.Module.Duty ...@@ -492,12 +494,12 @@ namespace Edu.Module.Duty
/// <param name="model"></param> /// <param name="model"></param>
/// <param name="RoomMessage"></param> /// <param name="RoomMessage"></param>
/// <returns></returns> /// <returns></returns>
public bool CheckClassRoomModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model,out string RoomMessage) public bool CheckClassRoomModule(DateTime chooseDateTime, DateTime chooseEndTime, RB_Reserve_Class_Extend model, out string RoomMessage)
{ {
RoomMessage = ""; RoomMessage = "";
var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel() var planList = class_PlanRepository.GetClassPlanListExtRepository(new RB_Class_Plan_ViewModel()
{ {
ClassRoomId=model.ClassRoomId, ClassRoomId = model.ClassRoomId,
QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate), QClassDateStr = Common.ConvertHelper.FormatDate(model.ClassDate),
Group_Id = model.Group_Id Group_Id = model.Group_Id
}); });
...@@ -574,7 +576,7 @@ namespace Edu.Module.Duty ...@@ -574,7 +576,7 @@ namespace Edu.Module.Duty
return reserve_ClassRepository.ExistsReserveClassRepository(model); return reserve_ClassRepository.ExistsReserveClassRepository(model);
} }
/// <summary> /// <summary>
/// 根据编号获取约课班级 /// 根据编号获取约课班级
/// </summary> /// </summary>
...@@ -633,7 +635,8 @@ namespace Edu.Module.Duty ...@@ -633,7 +635,8 @@ namespace Edu.Module.Duty
}; };
if (flag) if (flag)
{ {
Common.Message.MessageHelper.SendMessage(pushModel); List<Common.Message.PushMessageModel> pushList = new List<PushMessageModel>() { pushModel };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
return flag; return flag;
......
Edu.Module.User/StudentModule.cs
View file @ 9502602c
...@@ -455,7 +455,8 @@ namespace Edu.Module.User ...@@ -455,7 +455,8 @@ namespace Edu.Module.User
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
...@@ -767,7 +768,8 @@ namespace Edu.Module.User ...@@ -767,7 +768,8 @@ namespace Edu.Module.User
{ {
var queryTargetWorkId = accountModule.GetWorkUserIdModule(customerModel.CreateBy); var queryTargetWorkId = accountModule.GetWorkUserIdModule(customerModel.CreateBy);
modelWork.ReceiveId = queryTargetWorkId; modelWork.ReceiveId = queryTargetWorkId;
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
//if (assistList != null && assistList.Count > 0) //if (assistList != null && assistList.Count > 0)
//{ //{
......
Edu.Repository/Course/RB_Course_ChapterRepository.cs
View file @ 9502602c
...@@ -143,7 +143,10 @@ namespace Edu.Repository.Course ...@@ -143,7 +143,10 @@ namespace Edu.Repository.Course
}); });
builder = builder.Remove(builder.Length - 1, 1); builder = builder.Remove(builder.Length - 1, 1);
builder.Append("ON DUPLICATE KEY UPDATE CurrentHours=VALUES(CurrentHours);"); builder.Append("ON DUPLICATE KEY UPDATE CurrentHours=VALUES(CurrentHours);");
flag= Execute(builder.ToString()) > 0; flag = Execute(builder.ToString()) > 0;
//builder.Append(@" REPLACE INTO rb_course_chapter (ChapterId, CurrentHours) VALUES(@ChapterId,@CurrentHours)");
//param
} }
catch (Exception ex) catch (Exception ex)
{ {
......
Edu.Repository/EduTask/RB_Student_LeaveRepository.cs
View file @ 9502602c
...@@ -304,8 +304,8 @@ namespace Edu.Repository.EduTask ...@@ -304,8 +304,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -333,7 +333,8 @@ namespace Edu.Repository.EduTask ...@@ -333,7 +333,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -366,8 +367,8 @@ namespace Edu.Repository.EduTask ...@@ -366,8 +367,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
#region 即将欠费提醒（管理者） #region 即将欠费提醒（管理者）
...@@ -394,7 +395,8 @@ namespace Edu.Repository.EduTask ...@@ -394,7 +395,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -428,7 +430,8 @@ namespace Edu.Repository.EduTask ...@@ -428,7 +430,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -458,7 +461,8 @@ namespace Edu.Repository.EduTask ...@@ -458,7 +461,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -492,8 +496,8 @@ namespace Edu.Repository.EduTask ...@@ -492,8 +496,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -522,7 +526,8 @@ namespace Edu.Repository.EduTask ...@@ -522,7 +526,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
...@@ -560,7 +565,8 @@ namespace Edu.Repository.EduTask ...@@ -560,7 +565,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
...@@ -658,8 +664,8 @@ namespace Edu.Repository.EduTask ...@@ -658,8 +664,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -687,7 +693,8 @@ namespace Edu.Repository.EduTask ...@@ -687,7 +693,8 @@ namespace Edu.Repository.EduTask
Platform = 5, Platform = 5,
ReceiveId = x.WorkUserId ReceiveId = x.WorkUserId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
}); });
} }
#endregion #endregion
......
Edu.WebApi/Controllers/Course/ClassController.cs
View file @ 9502602c
...@@ -2340,10 +2340,11 @@ namespace Edu.WebApi.Controllers.Course ...@@ -2340,10 +2340,11 @@ namespace Edu.WebApi.Controllers.Course
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
Common.Message.MessageHelper.SendMessage(model); List<Common.Message.PushMessageModel> pushList2 = new List<Common.Message.PushMessageModel>() { model };
new Common.Message.MessageHelper().SendMessage(pushList2);
} }
return flag ? ApiResult.Success() : ApiResult.Failed(); return flag ? ApiResult.Success() : ApiResult.Failed();
} }
......
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @ 9502602c
...@@ -413,10 +413,10 @@ namespace Edu.WebApi.Controllers.User ...@@ -413,10 +413,10 @@ namespace Edu.WebApi.Controllers.User
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
return ApiResult.Success(); return ApiResult.Success();
} }
else else
...@@ -548,8 +548,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -548,8 +548,8 @@ namespace Edu.WebApi.Controllers.User
Platform = 5, Platform = 5,
ReceiveId = queryTargetWorkId ReceiveId = queryTargetWorkId
}; };
Common.Message.MessageHelper.SendMessage(modelWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
#endregion #endregion
...@@ -578,7 +578,8 @@ namespace Edu.WebApi.Controllers.User ...@@ -578,7 +578,8 @@ namespace Edu.WebApi.Controllers.User
Platform = 5, Platform = 5,
ReceiveId = to ReceiveId = to
}; };
Common.Message.MessageHelper.SendMessage(modelPubWork); List<Common.Message.PushMessageModel> pushList = new List<Common.Message.PushMessageModel>() { modelPubWork };
new Common.Message.MessageHelper().SendMessage(pushList);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment