Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
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
项目统一框架
amos-boot-biz
Commits
5ff1ded5
Commit
5ff1ded5
authored
Jul 22, 2024
by
suhuiguang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.自测bug修改
parent
d25d3c17
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
15 additions
and
3 deletions
+15
-3
DPStatisticsServiceImpl.java
...module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java
+15
-3
No files found.
amos-boot-system-tzs/amos-boot-module-jyjc/amos-boot-module-jyjc-biz/src/main/java/com/yeejoin/amos/boot/module/jyjc/biz/service/impl/DPStatisticsServiceImpl.java
View file @
5ff1ded5
...
@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
...
@@ -2,7 +2,9 @@ package com.yeejoin.amos.boot.module.jyjc.biz.service.impl;
import
cn.hutool.core.date.DateUtil
;
import
cn.hutool.core.date.DateUtil
;
import
com.yeejoin.amos.boot.biz.common.dto.CountDto
;
import
com.yeejoin.amos.boot.biz.common.dto.CountDto
;
import
com.yeejoin.amos.boot.module.common.api.constant.TZSCommonConstant
;
import
com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto
;
import
com.yeejoin.amos.boot.module.common.api.dto.DPFilterParamDto
;
import
com.yeejoin.amos.boot.module.common.api.enums.ReginStepEnum
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.InspectTimeCountDto
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.InspectionTimelinesDto
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto
;
import
com.yeejoin.amos.boot.module.jyjc.api.dto.PublicityInspectOrgInfoDto
;
...
@@ -202,6 +204,17 @@ public class DPStatisticsServiceImpl {
...
@@ -202,6 +204,17 @@ public class DPStatisticsServiceImpl {
return
result
;
return
result
;
}
}
private
List
<
RegionModel
>
setRegionIfRootParent
(
String
regionCode
)
throws
Exception
{
List
<
RegionModel
>
regionList
=
Systemctl
.
regionClient
.
queryByParentRegionCode
(
Integer
.
parseInt
(
regionCode
)).
getResult
();
// 陕西省时需要在地图返回独立的地级市:韩城、杨凌、西咸
if
(
regionCode
.
equals
(
TZSCommonConstant
.
SHAN_XI_REGION_CODE
))
{
List
<
RegionModel
>
independentRegions
=
ReginStepEnum
.
enum2RegionList
(
"map"
);
regionList
.
addAll
(
independentRegions
);
}
return
regionList
;
}
private
void
buildYDataForInspectPersonCount
(
Map
<
String
,
Object
>
result
,
List
<
RegionModel
>
childRegion
)
{
private
void
buildYDataForInspectPersonCount
(
Map
<
String
,
Object
>
result
,
List
<
RegionModel
>
childRegion
)
{
List
<
Long
>
yData
=
new
ArrayList
<>();
List
<
Long
>
yData
=
new
ArrayList
<>();
childRegion
.
forEach
(
regionModel
->
{
childRegion
.
forEach
(
regionModel
->
{
...
@@ -235,8 +248,7 @@ public class DPStatisticsServiceImpl {
...
@@ -235,8 +248,7 @@ public class DPStatisticsServiceImpl {
private
List
<
RegionModel
>
getRegionList
(
DPFilterParamDto
dpFilterParamDto
)
{
private
List
<
RegionModel
>
getRegionList
(
DPFilterParamDto
dpFilterParamDto
)
{
try
{
try
{
if
(
regionChildRegionMap
.
get
(
dpFilterParamDto
.
getCityCode
())
==
null
)
{
if
(
regionChildRegionMap
.
get
(
dpFilterParamDto
.
getCityCode
())
==
null
)
{
FeignClientResult
<
List
<
RegionModel
>>
feignClientResult
=
Systemctl
.
regionClient
.
queryByParentRegionCode
(
Integer
.
parseInt
(
dpFilterParamDto
.
getCityCode
()));
List
<
RegionModel
>
regionModels
=
this
.
setRegionIfRootParent
(
dpFilterParamDto
.
getCityCode
());
List
<
RegionModel
>
regionModels
=
feignClientResult
.
getResult
();
regionChildRegionMap
.
put
(
dpFilterParamDto
.
getCityCode
(),
regionModels
);
regionChildRegionMap
.
put
(
dpFilterParamDto
.
getCityCode
(),
regionModels
);
return
regionModels
;
return
regionModels
;
}
else
{
}
else
{
...
@@ -428,7 +440,7 @@ public class DPStatisticsServiceImpl {
...
@@ -428,7 +440,7 @@ public class DPStatisticsServiceImpl {
}
}
public
List
<
Map
<
String
,
Object
>>
getCenterMapCountDataForOverview
(
DPFilterParamDto
dpFilterParamDto
)
{
public
List
<
Map
<
String
,
Object
>>
getCenterMapCountDataForOverview
(
DPFilterParamDto
dpFilterParamDto
)
{
return
getRegionList
(
dpFilterParamDto
).
parallelStream
().
filter
(
e
->
e
.
getParentRegionCode
()
!=
null
&&
(
e
.
getParentRegionCode
().
toString
()).
equals
(
dpFilterParamDto
.
getCityCode
())).
map
(
r
->
{
return
getRegionList
(
dpFilterParamDto
).
parallelStream
().
map
(
r
->
{
DPFilterParamDto
filterParamDto
=
new
DPFilterParamDto
();
DPFilterParamDto
filterParamDto
=
new
DPFilterParamDto
();
filterParamDto
.
setCityCode
(
r
.
getRegionCode
().
toString
());
filterParamDto
.
setCityCode
(
r
.
getRegionCode
().
toString
());
Map
<
String
,
Object
>
itemResult
=
getCenterMapOverviewData
(
filterParamDto
);
Map
<
String
,
Object
>
itemResult
=
getCenterMapOverviewData
(
filterParamDto
);
...
...
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