Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
D
device-new-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
赵啸非
device-new-platform
Commits
bb8da4b8
Commit
bb8da4b8
authored
Sep 20, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加区域点击
parent
d8bf959c
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
2 deletions
+2
-2
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+2
-2
No files found.
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
bb8da4b8
...
@@ -198,7 +198,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
...
@@ -198,7 +198,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
SitePdu
sitePdu
=
new
SitePdu
();
SitePdu
sitePdu
=
new
SitePdu
();
sitePdu
.
setAreaCodeList
(
Arrays
.
asList
(
entity
.
getAreaCode
()));
sitePdu
.
setAreaCodeList
(
Arrays
.
asList
(
entity
.
getAreaCode
()));
Rest
<
List
<
SitePdu
>>
result
=
siteFeign
.
getFlatSitesBySiteId
(
sitePdu
);
Rest
<
List
<
SitePdu
>>
result
=
siteFeign
.
getFlatSitesBySiteId
(
sitePdu
);
// log.info("s
iteList:{}",JSON.toJSONString(result));
log
.
info
(
"areaS
iteList:{}"
,
JSON
.
toJSONString
(
result
));
if
(
result
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
if
(
result
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
//根据返回的id 筛选列表
//根据返回的id 筛选列表
Map
<
Long
,
SitestatEntity
>
collectMap
=
this
.
find
(
new
SitestatEntity
(),
context
).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getSiteId
(),
y
->
y
,(
o
,
n
)->
n
));
Map
<
Long
,
SitestatEntity
>
collectMap
=
this
.
find
(
new
SitestatEntity
(),
context
).
stream
().
collect
(
Collectors
.
toMap
(
x
->
x
.
getSiteId
(),
y
->
y
,(
o
,
n
)->
n
));
...
@@ -206,7 +206,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
...
@@ -206,7 +206,7 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getSiteName
()))
{
if
(!
ObjectUtils
.
isEmpty
(
entity
.
getSiteName
()))
{
list
=
MemoryPagination
.
search
(
entity
.
getSiteName
(),
list
);
list
=
MemoryPagination
.
search
(
entity
.
getSiteName
(),
list
);
}
}
//
log.info("siteStatList:{}",JSON.toJSONString(list));
//
log.info("siteStatList:{}",JSON.toJSONString(list));
pageInfo
.
setTotalResult
(
list
.
size
());
pageInfo
.
setTotalResult
(
list
.
size
());
List
<
SitestatEntity
>
siteStatList
=
MemoryPagination
.
pagination
(
list
,
pageInfo
.
getCurrPage
(),
pageInfo
.
getPrePageResult
());
List
<
SitestatEntity
>
siteStatList
=
MemoryPagination
.
pagination
(
list
,
pageInfo
.
getCurrPage
(),
pageInfo
.
getPrePageResult
());
res
.
setList
(
siteStatList
);
res
.
setList
(
siteStatList
);
...
...
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