Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
F
fill-system
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
廖旭伟
fill-system
Commits
165cf1fb
Commit
165cf1fb
authored
Mar 31, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加设备相关
parent
37ff8b9f
Pipeline
#2554
canceled with stages
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
...com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
+1
-1
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
.../mortals/xhx/module/matter/web/MatterDatumController.java
+2
-2
No files found.
fill-manager/src/main/java/com/mortals/xhx/module/matter/model/vo/MatterDatumVo.java
View file @
165cf1fb
...
@@ -28,5 +28,5 @@ public class MatterDatumVo extends BaseEntityLong {
...
@@ -28,5 +28,5 @@ public class MatterDatumVo extends BaseEntityLong {
private
Integer
pub
;
private
Integer
pub
;
private
String
device
num
;
private
String
device
Code
;
}
}
\ No newline at end of file
fill-manager/src/main/java/com/mortals/xhx/module/matter/web/MatterDatumController.java
View file @
165cf1fb
...
@@ -158,8 +158,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
...
@@ -158,8 +158,8 @@ public class MatterDatumController extends BaseCRUDJsonBodyMappingController<Mat
return
matterDatumInfo
;
return
matterDatumInfo
;
}).
collect
(
Collectors
.
toList
());
}).
collect
(
Collectors
.
toList
());
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDevice
num
())){
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDevice
Code
())){
Set
<
Long
>
matterSet
=
deviceMatterDatumService
.
find
(
new
DeviceMatterDatumQuery
().
deviceCode
(
query
.
getDevice
num
())).
stream
().
map
(
item
->
item
.
getMatterId
()).
collect
(
Collectors
.
toSet
());
Set
<
Long
>
matterSet
=
deviceMatterDatumService
.
find
(
new
DeviceMatterDatumQuery
().
deviceCode
(
query
.
getDevice
Code
())).
stream
().
map
(
item
->
item
.
getMatterId
()).
collect
(
Collectors
.
toSet
());
Iterator
<
MatterDatumInfo
>
iterator
=
collect
.
iterator
();
Iterator
<
MatterDatumInfo
>
iterator
=
collect
.
iterator
();
while
(
iterator
.
hasNext
())
{
while
(
iterator
.
hasNext
())
{
MatterDatumInfo
next
=
iterator
.
next
();
MatterDatumInfo
next
=
iterator
.
next
();
...
...
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