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
f62a22f7
Commit
f62a22f7
authored
May 30, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
4f6433b2
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
.../java/com/mortals/xhx/module/room/web/RoomController.java
+1
-1
smart-office-manager/src/test/java/com/mortals/httpclient/room/RoomController.http
...test/java/com/mortals/httpclient/room/RoomController.http
+1
-1
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
View file @
f62a22f7
...
@@ -56,7 +56,7 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
...
@@ -56,7 +56,7 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
@Override
@Override
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
protected
void
init
(
Map
<
String
,
Object
>
model
,
Context
context
)
{
this
.
addDict
(
model
,
"roomType"
,
paramService
.
getParamBySecondOrganize
(
"Room"
,
"roomType"
));
this
.
addDict
(
model
,
"roomType"
,
paramService
.
getParamBySecondOrganize
(
"Room"
,
"roomType"
));
this
.
addDict
(
model
,
"device"
,
deviceService
.
find
(
new
DeviceQuery
()));
//
this.addDict(model, "device", deviceService.find(new DeviceQuery()));
Set
<
Long
>
deviceLedSet
=
roomDeviceService
.
find
(
new
RoomDeviceQuery
()).
stream
().
filter
(
f
->
f
.
getDeviceId
()
!=
null
).
map
(
item
->
item
.
getDeviceId
()).
collect
(
Collectors
.
toSet
());
Set
<
Long
>
deviceLedSet
=
roomDeviceService
.
find
(
new
RoomDeviceQuery
()).
stream
().
filter
(
f
->
f
.
getDeviceId
()
!=
null
).
map
(
item
->
item
.
getDeviceId
()).
collect
(
Collectors
.
toSet
());
...
...
smart-office-manager/src/test/java/com/mortals/httpclient/room/RoomController.http
View file @
f62a22f7
...
@@ -20,7 +20,7 @@ Content-Type: application/json
...
@@ -20,7 +20,7 @@ Content-Type: application/json
{
{
"page":1,
"page":1,
"size":1,
"size":1,
"deviceCode":"
a0-9f-10-5a-e0-10
"
"deviceCode":"
11-22-33-44
"
}
}
...
...
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