Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
C
civil-bigdata
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
civil
civil-bigdata
Commits
769ebb6e
Commit
769ebb6e
authored
Jun 28, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改
parent
f1dffa69
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
14 additions
and
17 deletions
+14
-17
common-utils/src/main/java/com/zq/common/entity/VChildWelfareStats.java
+1
-1
portal-server/src/main/java/com/zq/portal/dao/EtStatsDao.java
+3
-3
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
+5
-4
portal-server/src/main/java/com/zq/portal/service/HyStatsService.java
+2
-6
portal-server/src/main/resources/mapper/EtStatsMapper.xml
+3
-3
No files found.
common-utils/src/main/java/com/zq/common/entity/VChildWelfareStats.java
View file @
769ebb6e
...
...
@@ -58,7 +58,7 @@ public class VChildWelfareStats {
* 收养儿童数量
*/
@ApiModelProperty
(
"收养儿童数量"
)
private
Integer
c
hildNum
;
private
Integer
adoptC
hildNum
;
/**
* 孤儿数量
...
...
portal-server/src/main/java/com/zq/portal/dao/EtStatsDao.java
View file @
769ebb6e
...
...
@@ -21,7 +21,7 @@ public interface EtStatsDao {
StatsVo
getAreaAgencyStats
(
StatsReqVo
vo
);
/**
* 统计区域下的儿童人口
* 统计区域下
收养
的儿童人口
*
* @param vo
* @return
...
...
@@ -42,7 +42,7 @@ public interface EtStatsDao {
* @param vo
* @return
*/
StatsVo
getFactUnadoptedStats
(
StatsReqVo
vo
);
StatsVo
get
Area
FactUnadoptedStats
(
StatsReqVo
vo
);
/**
* 孤儿统计
...
...
@@ -50,5 +50,5 @@ public interface EtStatsDao {
* @param vo
* @return
*/
StatsVo
getOrphanStats
(
StatsReqVo
vo
);
StatsVo
get
Area
OrphanStats
(
StatsReqVo
vo
);
}
portal-server/src/main/java/com/zq/portal/service/EtStatsService.java
View file @
769ebb6e
...
...
@@ -60,10 +60,10 @@ public class EtStatsService {
StatsVo
orgStat
=
etStatsDao
.
getAreaAgencyStats
(
vo
);
build
.
setAgencyNum
(
orgStat
.
getNum
());
StatsVo
childStats
=
etStatsDao
.
getAreaChildStats
(
vo
);
build
.
setChildNum
(
childStats
.
getNum
());
StatsVo
Orphan
=
etStatsDao
.
getOrphanStats
(
vo
);
build
.
set
Adopt
ChildNum
(
childStats
.
getNum
());
StatsVo
Orphan
=
etStatsDao
.
get
Area
OrphanStats
(
vo
);
build
.
setOrphanNum
(
Orphan
.
getNum
());
StatsVo
factUnadoptedStats
=
etStatsDao
.
getFactUnadoptedStats
(
vo
);
StatsVo
factUnadoptedStats
=
etStatsDao
.
get
Area
FactUnadoptedStats
(
vo
);
build
.
setFactUnadoptedNum
(
factUnadoptedStats
.
getNum
());
redisUtils
.
setObj
(
PortalCacheKeys
.
getAgencyChildStatsKey
(
vo
),
build
);
...
...
@@ -95,6 +95,7 @@ public class EtStatsService {
* @return
*/
public
List
<
VChildWelfareStats
>
getAgencyChildStatsList
(
StatsReqVo
vo
)
{
String
cacheKey
=
PortalCacheKeys
.
getAgencyChildStatsListKey
(
vo
);
if
(
StrUtil
.
isBlank
(
vo
.
getAreaCode
()))
{
vo
.
setAreaCode
(
"450000000000"
);
}
...
...
@@ -108,7 +109,7 @@ public class EtStatsService {
returnData
.
add
(
etAgencyWelfareStats
);
}
redisUtils
.
setObj
(
PortalCacheKeys
.
getAgencyChildStatsListKey
(
vo
)
,
returnData
);
redisUtils
.
setObj
(
cacheKey
,
returnData
);
return
returnData
;
}
...
...
portal-server/src/main/java/com/zq/portal/service/HyStatsService.java
View file @
769ebb6e
...
...
@@ -132,6 +132,7 @@ public class HyStatsService {
* @return
*/
public
List
<
VMarriageStats
>
getAreaUnderMarriageStatsList
(
StatsReqVo
vo
)
{
String
cacheKey
=
PortalCacheKeys
.
getAreaUnderMarriageStatsListKey
(
vo
);
if
(
StringUtils
.
isBlank
(
vo
.
getAreaCode
()))
{
vo
.
setAreaCode
(
"450000000000"
);
}
...
...
@@ -144,12 +145,7 @@ public class HyStatsService {
returnData
.
add
(
marriageStats
);
}
if
(
vo
.
getYear
()
!=
null
)
{
// 搜索的有过期时间避免内存暂用
redisUtils
.
setObj
(
PortalCacheKeys
.
getAreaUnderMarriageStatsListKey
(
vo
),
returnData
,
1
,
TimeUnit
.
DAYS
);
}
else
{
redisUtils
.
setObj
(
PortalCacheKeys
.
getAreaUnderMarriageStatsListKey
(
vo
),
returnData
);
}
redisUtils
.
setObj
(
cacheKey
,
returnData
);
return
returnData
;
}
...
...
portal-server/src/main/resources/mapper/EtStatsMapper.xml
View file @
769ebb6e
...
...
@@ -17,7 +17,7 @@
</if>
</select>
<!--统计区域下的儿童人口-->
<!--统计区域下
收养
的儿童人口-->
<select
id=
"getAreaChildStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT
count( 1 ) 'num'
...
...
@@ -51,7 +51,7 @@
</select>
<!--事实无人领养-->
<select
id=
"getFactUnadoptedStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
<select
id=
"get
Area
FactUnadoptedStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT
COUNT(1) 'num'
FROM
...
...
@@ -66,7 +66,7 @@
</if>
</select>
<select
id=
"getOrphanStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
<select
id=
"get
Area
OrphanStats"
resultType=
"com.zq.portal.vo.StatsVo"
>
SELECT
COUNT(1) 'num'
FROM
...
...
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