Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
黄奎
Education
Commits
9502602c
Commit
9502602c
authored
Aug 23, 2023
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1111
parent
30c19983
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
234 additions
and
163 deletions
+234
-163
MessageHelper.cs
Edu.Common/Message/MessageHelper.cs
+107
-66
PushWorkChatHelper.cs
Edu.Common/Plugin/PushWorkChatHelper.cs
+2
-1
ClassModule.cs
Edu.Module.Course/ClassModule.cs
+22
-16
OrderModule.cs
Edu.Module.Course/OrderModule.cs
+2
-1
CustomerStudentModule.cs
Edu.Module.Customer/CustomerStudentModule.cs
+6
-3
DutyPlanModule.cs
Edu.Module.Duty/DutyPlanModule.cs
+33
-31
VisitorReserveModule.cs
Edu.Module.Duty/VisitorReserveModule.cs
+22
-19
StudentModule.cs
Edu.Module.User/StudentModule.cs
+4
-2
RB_Course_ChapterRepository.cs
Edu.Repository/Course/RB_Course_ChapterRepository.cs
+4
-1
RB_Student_LeaveRepository.cs
Edu.Repository/EduTask/RB_Student_LeaveRepository.cs
+22
-15
ClassController.cs
Edu.WebApi/Controllers/Course/ClassController.cs
+4
-3
UserCenterController.cs
Edu.WebApi/Controllers/User/UserCenterController.cs
+6
-5
No files found.
Edu.Common/Message/MessageHelper.cs
View file @
9502602c
...
...
@@ -2,38 +2,23 @@
using
System
;
using
System.Collections.Generic
;
using
System.Text
;
using
System.Threading.Tasks
;
namespace
Edu.Common.Message
{
/// <summary>
/// 消息
发送
/// 消息
队列帮助类
/// </summary>
public
class
MessageHelper
public
class
MessageHelper
:
IDisposable
{
/// <summary>
/// 获取连接
/// </summary>
/// <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
;
}
private
readonly
ConnectionFactory
_factory
;
private
IConnection
_connection
;
private
IModel
_channel
;
/// <summary>
///
发送信息
///
构造函数
/// </summary>
/// <param name="message"></param>
public
static
void
SendMessage
(
PushMessageModel
message
)
public
MessageHelper
()
{
Int32
.
TryParse
(
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"Port"
),
out
int
Port
);
RabbitConfig
rabbitConfig
=
new
RabbitConfig
()
...
...
@@ -44,62 +29,118 @@ namespace Edu.Common.Message
UserName
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"UserName"
),
QueenName
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"QueenName"
),
};
var
obj
=
new
// 设置连接参数
_factory
=
new
ConnectionFactory
()
{
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
,
HostName
=
rabbitConfig
.
HostName
,
//默认端口
Port
=
Port
,
UserName
=
rabbitConfig
.
UserName
,
Password
=
rabbitConfig
.
Password
,
};
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
())
{
using
(
IModel
channel
=
conn
.
CreateModel
())
{
//在MQ上定义一个持久化队列,如果名称相同不会重复创建
channel
.
QueueDeclare
(
rabbitConfig
.
QueenName
,
true
,
false
,
false
,
null
);
byte
[]
buffer
=
Encoding
.
UTF8
.
GetBytes
(
Common
.
Plugin
.
JsonHelper
.
Serialize
(
obj
));
IBasicProperties
properties
=
channel
.
CreateBasicProperties
();
properties
.
DeliveryMode
=
2
;
channel
.
BasicPublish
(
""
,
rabbitConfig
.
QueenName
,
properties
,
buffer
);
}
}
}
catch
(
Exception
ex
)
HostName
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"HostName"
),
Password
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"Password"
),
Port
=
Port
,
UserName
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"UserName"
),
QueenName
=
Common
.
Config
.
ReadConfigKey
(
"RabbitMqConfig"
,
subKey
:
"QueenName"
),
};
string
queenName
=
rabbitConfig
.
QueenName
;
var
obj
=
new
{
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>
/// <param name="msgList"></param>
public
static
void
SendMessage
(
List
<
PushMessageModel
>
msgList
)
/// <param name="list"></param>
/// <param name="PushAppId"></param>
public
void
SendMessage
(
List
<
PushMessageModel
>
list
)
{
foreach
(
var
item
in
msgL
ist
)
foreach
(
var
item
in
l
ist
)
{
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
Platform
=
5
,
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
Platform
=
5
,
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
...
...
@@ -2213,7 +2213,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2246,8 +2247,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
#
region
即将欠费提醒(管理者)
...
...
@@ -2274,7 +2275,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2307,8 +2309,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2337,7 +2339,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2370,8 +2373,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2400,7 +2403,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
@@ -2438,7 +2442,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
Platform
=
5
,
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
...
...
@@ -2692,7 +2697,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
...
...
Edu.Module.Course/OrderModule.cs
View file @
9502602c
...
...
@@ -1728,7 +1728,8 @@ namespace Edu.Module.Course
Platform
=
5
,
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
if
(!
string
.
IsNullOrEmpty
(
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
)
...
...
@@ -335,7 +336,8 @@ namespace Edu.Module.Customer
if
(!
string
.
IsNullOrEmpty
(
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
Platform
=
5
,
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.
Click to expand it.
Edu.Module.Duty/VisitorReserveModule.cs
View file @
9502602c
...
...
@@ -48,7 +48,7 @@ namespace Edu.Module.Duty
/// 账号管理仓储层对象
/// </summary>
private
readonly
RB_AccountRepository
accountRepository
=
new
RB_AccountRepository
();
/// <summary>
/// 学员仓储层对象
/// </summary>
...
...
@@ -104,7 +104,7 @@ namespace Edu.Module.Duty
/// <param name="model"></param>
/// <returns></returns>
[
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
=
""
;
bool
flag
;
...
...
@@ -138,7 +138,8 @@ namespace Edu.Module.Duty
{
model
.
ReserveClassId
=
remodel
.
ReserveClassId
;
}
else
{
else
{
var
newFlag
=
SetReserveClassModule
(
reserveClass
,
out
string
newMsg
);
if
(!
newFlag
)
{
...
...
@@ -157,7 +158,7 @@ namespace Edu.Module.Duty
return
false
;
}
model
.
ReserveClassId
=
reserveClass
.
ReserveClassId
;
}
}
}
if
(
visitor_ReserveRepository
.
ExistsVisitorReserveRepository
(
model
))
{
...
...
@@ -215,7 +216,7 @@ namespace Edu.Module.Duty
/// </summary>
/// <param name="Id"></param>
/// <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
>()
{
...
...
@@ -254,17 +255,17 @@ namespace Edu.Module.Duty
string
visitorIds
=
string
.
Join
(
","
,
visitorList
.
Select
(
qitem
=>
qitem
.
Visitor_Id
));
if
(!
string
.
IsNullOrEmpty
(
visitorIds
))
{
stuOrderList
=
student_OrderGuestRepository
.
GetStrOrderGuestListRepository
(
new
RB_Student_OrderGuest_ViewModel
()
stuOrderList
=
student_OrderGuestRepository
.
GetStrOrderGuestListRepository
(
new
RB_Student_OrderGuest_ViewModel
()
{
QStudentIds
=
visitorIds
});
}
}
foreach
(
var
item
in
list
)
{
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
>();
int
OrderCount
=
0
;
int
failCount
=
0
;
...
...
@@ -279,7 +280,7 @@ namespace Edu.Module.Duty
OrderCount
++;
}
}
item
.
FailCount
=
failCount
;
item
.
OrderCount
=
OrderCount
;
if
(
item
.
OrderCount
>
0
)
...
...
@@ -310,7 +311,7 @@ namespace Edu.Module.Duty
/// </summary>
/// <param name="model"></param>
/// <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
;
message
=
""
;
...
...
@@ -368,8 +369,8 @@ namespace Edu.Module.Duty
var
teacherList
=
accountRepository
.
GetAccountListRepository
(
new
Model
.
ViewModel
.
User
.
RB_Account_ViewModel
()
{
Group_Id
=
model
.
Group_Id
,
QAccountIds
=
(
model
?.
TeacherId
??
0
)
+
","
+(
oldModel
?.
TeacherId
??
0
),
AccountType
=
Common
.
Enum
.
User
.
AccountTypeEnum
.
Teacher
QAccountIds
=
(
model
?.
TeacherId
??
0
)
+
","
+
(
oldModel
?.
TeacherId
??
0
),
AccountType
=
Common
.
Enum
.
User
.
AccountTypeEnum
.
Teacher
});
Common
.
Message
.
PushMessageModel
pushModel
=
new
Common
.
Message
.
PushMessageModel
()
{
...
...
@@ -382,7 +383,7 @@ namespace Edu.Module.Duty
SendType
=
0
,
Title
=
"试听课"
,
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
()
{
...
...
@@ -402,7 +403,7 @@ namespace Edu.Module.Duty
pushModel
,
pushModel2
};
Common
.
Message
.
MessageHelper
.
SendMessage
(
messageList
);
new
Common
.
Message
.
MessageHelper
()
.
SendMessage
(
messageList
);
}
}
else
...
...
@@ -431,7 +432,8 @@ namespace Edu.Module.Duty
};
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
;
...
...
@@ -492,12 +494,12 @@ namespace Edu.Module.Duty
/// <param name="model"></param>
/// <param name="RoomMessage"></param>
/// <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
=
""
;
var
planList
=
class_PlanRepository
.
GetClassPlanListExtRepository
(
new
RB_Class_Plan_ViewModel
()
{
ClassRoomId
=
model
.
ClassRoomId
,
ClassRoomId
=
model
.
ClassRoomId
,
QClassDateStr
=
Common
.
ConvertHelper
.
FormatDate
(
model
.
ClassDate
),
Group_Id
=
model
.
Group_Id
});
...
...
@@ -574,7 +576,7 @@ namespace Edu.Module.Duty
return
reserve_ClassRepository
.
ExistsReserveClassRepository
(
model
);
}
/// <summary>
/// 根据编号获取约课班级
/// </summary>
...
...
@@ -633,7 +635,8 @@ namespace Edu.Module.Duty
};
if
(
flag
)
{
Common
.
Message
.
MessageHelper
.
SendMessage
(
pushModel
);
List
<
Common
.
Message
.
PushMessageModel
>
pushList
=
new
List
<
PushMessageModel
>()
{
pushModel
};
new
Common
.
Message
.
MessageHelper
().
SendMessage
(
pushList
);
}
}
return
flag
;
...
...
Edu.Module.User/StudentModule.cs
View file @
9502602c
...
...
@@ -455,7 +455,8 @@ namespace Edu.Module.User
Platform
=
5
,
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
{
var
queryTargetWorkId
=
accountModule
.
GetWorkUserIdModule
(
customerModel
.
CreateBy
);
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)
//{
...
...
Edu.Repository/Course/RB_Course_ChapterRepository.cs
View file @
9502602c
...
...
@@ -143,7 +143,10 @@ namespace Edu.Repository.Course
});
builder
=
builder
.
Remove
(
builder
.
Length
-
1
,
1
);
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
)
{
...
...
Edu.Repository/EduTask/RB_Student_LeaveRepository.cs
View file @
9502602c
...
...
@@ -304,8 +304,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -333,7 +333,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -366,8 +367,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
#
region
即将欠费提醒(管理者)
...
...
@@ -394,7 +395,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -428,7 +430,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -458,7 +461,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -492,8 +496,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -522,7 +526,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
@@ -560,7 +565,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
Platform
=
5
,
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
...
...
@@ -687,7 +693,8 @@ namespace Edu.Repository.EduTask
Platform
=
5
,
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
...
...
Edu.WebApi/Controllers/Course/ClassController.cs
View file @
9502602c
...
...
@@ -2340,10 +2340,11 @@ namespace Edu.WebApi.Controllers.Course
Platform
=
5
,
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
();
}
...
...
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @
9502602c
...
...
@@ -413,10 +413,10 @@ namespace Edu.WebApi.Controllers.User
Platform
=
5
,
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
();
}
else
...
...
@@ -548,8 +548,8 @@ namespace Edu.WebApi.Controllers.User
Platform
=
5
,
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
...
...
@@ -578,7 +578,8 @@ namespace Edu.WebApi.Controllers.User
Platform
=
5
,
ReceiveId
=
to
};
Common
.
Message
.
MessageHelper
.
SendMessage
(
modelPubWork
);
List
<
Common
.
Message
.
PushMessageModel
>
pushList
=
new
List
<
Common
.
Message
.
PushMessageModel
>()
{
modelPubWork
};
new
Common
.
Message
.
MessageHelper
().
SendMessage
(
pushList
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment