Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart-office-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart-office-platform
Commits
4b7ce947
Commit
4b7ce947
authored
Jan 09, 2024
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改通知去重复
parent
a6e54825
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
12 deletions
+11
-12
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java
...module/metting/service/impl/MettingRecordServiceImpl.java
+11
-12
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/service/impl/MettingRecordServiceImpl.java
View file @
4b7ce947
...
@@ -119,7 +119,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
...
@@ -119,7 +119,6 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
protected
void
saveBefore
(
MettingRecordEntity
entity
,
Context
context
)
throws
AppException
{
protected
void
saveBefore
(
MettingRecordEntity
entity
,
Context
context
)
throws
AppException
{
super
.
saveBefore
(
entity
,
context
);
super
.
saveBefore
(
entity
,
context
);
checkStartAndEndTime
(
entity
);
checkStartAndEndTime
(
entity
);
Boolean
bool
=
checkExistStartMeetTime
(
entity
);
Boolean
bool
=
checkExistStartMeetTime
(
entity
);
if
(
bool
)
{
if
(
bool
)
{
throw
new
AppException
(
"当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!"
);
throw
new
AppException
(
"当前会议室该时段已经存在等待或进行中的会议,请选择其它时间段!"
);
...
@@ -134,17 +133,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
...
@@ -134,17 +133,17 @@ public class MettingRecordServiceImpl extends AbstractCRUDServiceImpl<MettingRec
boolean
in
=
DateUtil
.
isIn
(
new
Date
(),
entity
.
getMeetTimeStart
(),
entity
.
getMeetTimeEnd
());
boolean
in
=
DateUtil
.
isIn
(
new
Date
(),
entity
.
getMeetTimeStart
(),
entity
.
getMeetTimeEnd
());
if
(
in
)
{
if
(
in
)
{
entity
.
setMeetStatus
(
MeetStatusEnum
.
进行中
.
getValue
());
entity
.
setMeetStatus
(
MeetStatusEnum
.
进行中
.
getValue
());
//发送推送通知
}
RoomDeviceQuery
roomDeviceQuery
=
new
RoomDeviceQuery
();
//发送推送通知
roomDeviceQuery
.
setRoomId
(
entity
.
getRoomId
()
);
RoomDeviceQuery
roomDeviceQuery
=
new
RoomDeviceQuery
(
);
RoomDeviceEntity
roomDeviceEntity
=
roomDeviceService
.
selectOne
(
roomDeviceQuery
);
roomDeviceQuery
.
setRoomId
(
entity
.
getRoomId
()
);
if
(!
ObjectUtils
.
isEmpty
(
roomDeviceEntity
))
{
RoomDeviceEntity
roomDeviceEntity
=
roomDeviceService
.
selectOne
(
roomDeviceQuery
);
UploadDeviceReq
uploadDeviceReq
=
new
UploadDeviceReq
();
if
(!
ObjectUtils
.
isEmpty
(
roomDeviceEntity
))
{
uploadDeviceReq
.
setDeviceCodeList
(
Arrays
.
asList
(
roomDeviceEntity
.
getDeviceCode
())
);
UploadDeviceReq
uploadDeviceReq
=
new
UploadDeviceReq
(
);
uploadDeviceReq
.
setAction
(
"refreshMetting"
);
uploadDeviceReq
.
setDeviceCodeList
(
Arrays
.
asList
(
roomDeviceEntity
.
getDeviceCode
())
);
log
.
info
(
"refreshMetting send deviceList :{}"
,
JSON
.
toJSONString
(
Arrays
.
asList
(
roomDeviceEntity
.
getDeviceCode
()))
);
uploadDeviceReq
.
setAction
(
"refreshMetting"
);
messageFeign
.
downMsg
(
uploadDeviceReq
);
log
.
info
(
"refreshMetting send deviceList :{}"
,
JSON
.
toJSONString
(
Arrays
.
asList
(
roomDeviceEntity
.
getDeviceCode
()))
);
}
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
}
}
}
...
...
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