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
3ae63120
Commit
3ae63120
authored
May 29, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
00e970b4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
3 deletions
+8
-3
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
...rtals/xhx/module/metting/web/MettingRecordController.java
+0
-1
smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
...s/xhx/module/workman/service/impl/WorkmanServiceImpl.java
+6
-0
smart-office-manager/src/test/java/com/mortals/httpclient/metting/MettingRecordController.http
...m/mortals/httpclient/metting/MettingRecordController.http
+2
-2
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
View file @
3ae63120
...
...
@@ -69,7 +69,6 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDeviceCode
()))
{
//根据设备编码 查询房间room
RoomDeviceEntity
roomEntity
=
roomDeviceService
.
selectOne
(
new
RoomDeviceQuery
().
deviceCode
(
query
.
getDeviceCode
()));
//RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
))
{
query
.
setRoomId
(
roomEntity
.
getId
());
}
else
{
...
...
smart-office-manager/src/main/java/com/mortals/xhx/module/workman/service/impl/WorkmanServiceImpl.java
View file @
3ae63120
package
com.mortals.xhx.module.workman.service.impl
;
import
com.alibaba.fastjson.JSON
;
import
com.mortals.framework.common.Rest
;
import
com.mortals.framework.util.SecurityUtil
;
import
com.mortals.framework.util.StringUtils
;
...
...
@@ -83,6 +84,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
)){
uploadDeviceReq
.
setDeviceCodeList
(
roomDeviceService
.
find
(
new
RoomDeviceQuery
().
roomId
(
roomEntity
.
getId
())).
stream
().
map
(
i
->
i
.
getDeviceCode
()).
collect
(
Collectors
.
toList
()));
uploadDeviceReq
.
setAction
(
"refreshWorkman"
);
log
.
info
(
"downMsg:{}"
,
JSON
.
toJSONString
(
uploadDeviceReq
));
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
}
...
...
@@ -96,7 +98,10 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
RoomEntity
roomEntity
=
roomService
.
get
(
entity
.
getRoomId
(),
context
);
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
)){
uploadDeviceReq
.
setDeviceCodeList
(
roomDeviceService
.
find
(
new
RoomDeviceQuery
().
roomId
(
roomEntity
.
getId
())).
stream
().
map
(
i
->
i
.
getDeviceCode
()).
collect
(
Collectors
.
toList
()));
uploadDeviceReq
.
setAction
(
"refreshWorkman"
);
log
.
info
(
"downMsg:{}"
,
JSON
.
toJSONString
(
uploadDeviceReq
));
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
}
...
...
@@ -111,6 +116,7 @@ public class WorkmanServiceImpl extends AbstractCRUDServiceImpl<WorkmanDao, Work
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
)){
uploadDeviceReq
.
setDeviceCodeList
(
roomDeviceService
.
find
(
new
RoomDeviceQuery
().
roomId
(
roomEntity
.
getId
())).
stream
().
map
(
i
->
i
.
getDeviceCode
()).
collect
(
Collectors
.
toList
()));
uploadDeviceReq
.
setAction
(
"refreshWorkman"
);
log
.
info
(
"downMsg:{}"
,
JSON
.
toJSONString
(
uploadDeviceReq
));
messageFeign
.
downMsg
(
uploadDeviceReq
);
}
});
...
...
smart-office-manager/src/test/java/com/mortals/httpclient/metting/MettingRecordController.http
View file @
3ae63120
...
...
@@ -15,12 +15,12 @@ client.global.set("authToken", JSON.parse(response.body).data.token);
###会议记录列表
POST {{baseUrl}}/metting/record/list
Authorization: {{authToken}}
Content-Type: application/json
{
"page":1,
"size":10
"size":-1,
"deviceCode":"a0-9f-10-5a-e0-10"
}
...
...
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