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
834debee
Commit
834debee
authored
Sep 20, 2022
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加区域点击
parent
b9f90d33
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
5 deletions
+4
-5
common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
.../src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
+2
-2
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
...xhx/module/sitestat/service/impl/SitestatServiceImpl.java
+2
-3
No files found.
common-lib/src/main/java/com/mortals/xhx/feign/site/ISiteFeign.java
View file @
834debee
...
...
@@ -86,7 +86,7 @@ public interface ISiteFeign extends IFeign {
* @return
*/
@PostMapping
(
value
=
"/site/getFlatSitesByAreaCode"
)
Rest
<
List
<
SitePdu
>>
getFlatSitesByArea
Ids
(
@RequestBody
SitePdu
sitePdu
);
Rest
<
List
<
SitePdu
>>
getFlatSitesByArea
Code
(
@RequestBody
SitePdu
sitePdu
);
...
...
@@ -131,7 +131,7 @@ class SiteFeignFallbackFactory implements FallbackFactory<ISiteFeign> {
}
@Override
public
Rest
<
List
<
SitePdu
>>
getFlatSitesByArea
Ids
(
SitePdu
sitePdu
)
{
public
Rest
<
List
<
SitePdu
>>
getFlatSitesByArea
Code
(
SitePdu
sitePdu
)
{
return
Rest
.
fail
(
"暂时无法获取站点子站点,请稍后再试!"
);
}
};
...
...
device-manager/src/main/java/com/mortals/xhx/module/sitestat/service/impl/SitestatServiceImpl.java
View file @
834debee
...
...
@@ -197,9 +197,8 @@ public class SitestatServiceImpl extends AbstractCRUDServiceImpl<SitestatDao, Si
}
else
{
SitePdu
sitePdu
=
new
SitePdu
();
List
<
String
>
areaCodeList
=
new
ArrayList
<>();
areaCodeList
.
add
(
entity
.
getAreaCode
());
sitePdu
.
setAreaCodeList
(
areaCodeList
);
Rest
<
List
<
SitePdu
>>
result
=
siteFeign
.
getFlatSitesByAreaIds
(
sitePdu
);
sitePdu
.
setAreaCode
(
entity
.
getAreaCode
());
Rest
<
List
<
SitePdu
>>
result
=
siteFeign
.
getFlatSitesByAreaCode
(
sitePdu
);
log
.
info
(
"areaSiteList:{}"
,
JSON
.
toJSONString
(
result
));
if
(
result
.
getCode
()
==
YesNoEnum
.
YES
.
getValue
())
{
//根据返回的id 筛选列表
...
...
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