Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
T
traffic-signal-platform
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
signal
traffic-signal-platform
Commits
287fc781
Commit
287fc781
authored
Feb 07, 2023
by
duanruiming
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[update] 态势检测-辖区分组添加行政区级别
parent
c97355c3
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
0 deletions
+6
-0
AreaTreePO.java
...ol-service/src/main/java/net/wanji/web/po/AreaTreePO.java
+3
-0
SituationDetectionServiceImpl.java
...wanji/web/service/impl/SituationDetectionServiceImpl.java
+3
-0
No files found.
signal-control-service/src/main/java/net/wanji/web/po/AreaTreePO.java
View file @
287fc781
...
...
@@ -27,6 +27,9 @@ public class AreaTreePO {
@ApiModelProperty
(
value
=
"父行政区划代码"
)
private
Integer
parentCode
;
@ApiModelProperty
(
value
=
"行政区级别"
)
private
Integer
level
;
@ApiModelProperty
(
value
=
"子行政区划列表"
)
private
List
<
AreaTreePO
>
children
;
...
...
signal-control-service/src/main/java/net/wanji/web/service/impl/SituationDetectionServiceImpl.java
View file @
287fc781
...
...
@@ -397,12 +397,15 @@ public class SituationDetectionServiceImpl implements SituationDetectionService
List
<
AreaTreePO
>
resultList
=
areaTreePOS
.
stream
().
filter
(
areaTreePO
->
areaTreePO
.
getChildren
()
!=
null
).
collect
(
Collectors
.
toList
());
// 辖区构建
List
<
AreaTreePO
>
jurisdictionAreaList
=
tBaseAreaInfoMapper
.
selectJurisdictionArea
();
jurisdictionAreaList
.
forEach
(
areaTreePO
->
areaTreePO
.
setLevel
(
3
));
Map
<
Integer
,
List
<
AreaTreePO
>>
parentCodeListMap
=
jurisdictionAreaList
.
stream
().
collect
(
Collectors
.
groupingBy
(
AreaTreePO:
:
getParentCode
));
for
(
AreaTreePO
areaTreePO
:
resultList
)
{
areaTreePO
.
setLevel
(
1
);
List
<
AreaTreePO
>
childrenList
=
areaTreePO
.
getChildren
();
for
(
AreaTreePO
child
:
childrenList
)
{
Integer
areaCode
=
child
.
getAreaCode
();
child
.
setLevel
(
2
);
if
(!
parentCodeListMap
.
isEmpty
()
&&
parentCodeListMap
.
containsKey
(
areaCode
))
{
child
.
setChildren
(
parentCodeListMap
.
get
(
areaCode
));
}
...
...
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