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
c733899c
Commit
c733899c
authored
Jul 05, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
App添加儿童和殡葬的接口
parent
30bfd811
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
78 additions
and
2 deletions
+78
-2
api-server/src/main/java/com/zq/api/feign/PortalFeign.java
+12
-0
api-server/src/main/java/com/zq/api/service/IApiLogic.java
+32
-0
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
+20
-0
portal-server/src/main/java/com/zq/portal/controller/app/EtStatsController.java
+6
-0
portal-server/src/main/java/com/zq/portal/service/StatsService.java
+8
-2
No files found.
api-server/src/main/java/com/zq/api/feign/PortalFeign.java
View file @
c733899c
...
@@ -49,4 +49,16 @@ public interface PortalFeign {
...
@@ -49,4 +49,16 @@ public interface PortalFeign {
@PostMapping
(
"/stats/gatherSearch"
)
@PostMapping
(
"/stats/gatherSearch"
)
ResultVo
gatherSearch
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
ResultVo
gatherSearch
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
@PostMapping
(
"/stats/getAgencyChildStats"
)
ResultVo
getAgencyChildStats
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
@PostMapping
(
"/stats/getAgencyChildStatsList"
)
ResultVo
getAgencyChildStatsList
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
@PostMapping
(
"/stats/getCremationStats"
)
ResultVo
getCremationStats
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
@PostMapping
(
"/stats/getCremationStatsList"
)
ResultVo
getCremationStatsList
(
@RequestBody
Map
<
String
,
Object
>
paramsMap
);
}
}
api-server/src/main/java/com/zq/api/service/IApiLogic.java
View file @
c733899c
...
@@ -163,4 +163,36 @@ public interface IApiLogic extends IApiCommon {
...
@@ -163,4 +163,36 @@ public interface IApiLogic extends IApiCommon {
* @return
* @return
*/
*/
ApiResp
gatherSearch
(
ApiForm
form
);
ApiResp
gatherSearch
(
ApiForm
form
);
/**
* 指定区域下的儿童福利数据统计
*
* @param form
* @return
*/
ApiResp
getAgencyChildStats
(
ApiForm
form
);
/**
* 指定区域下级区域的儿童福利数据统计列表
*
* @param form
* @return
*/
ApiResp
getAgencyChildStatsList
(
ApiForm
form
);
/**
* 火化量统计
*
* @param form
* @return
*/
ApiResp
getCremationStats
(
ApiForm
form
);
/**
* 火化量统计列表
*
* @param form
* @return
*/
ApiResp
getCremationStatsList
(
ApiForm
form
);
}
}
api-server/src/main/java/com/zq/api/service/impl/ApiV100Logic.java
View file @
c733899c
...
@@ -111,4 +111,24 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
...
@@ -111,4 +111,24 @@ public class ApiV100Logic extends BaseApiLogic implements IApiLogic {
public
ApiResp
gatherSearch
(
ApiForm
form
)
{
public
ApiResp
gatherSearch
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
gatherSearch
(
form
.
getParamsMap
()));
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
gatherSearch
(
form
.
getParamsMap
()));
}
}
@Override
public
ApiResp
getAgencyChildStats
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
getAgencyChildStats
(
form
.
getParamsMap
()));
}
@Override
public
ApiResp
getAgencyChildStatsList
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
getAgencyChildStatsList
(
form
.
getParamsMap
()));
}
@Override
public
ApiResp
getCremationStats
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
getCremationStats
(
form
.
getParamsMap
()));
}
@Override
public
ApiResp
getCremationStatsList
(
ApiForm
form
)
{
return
ApiUtils
.
toApiResp
(
form
,
portalFeign
.
getCremationStatsList
(
form
.
getParamsMap
()));
}
}
}
portal-server/src/main/java/com/zq/portal/controller/app/EtStatsController.java
View file @
c733899c
...
@@ -19,6 +19,12 @@ public class EtStatsController {
...
@@ -19,6 +19,12 @@ public class EtStatsController {
public
final
EtStatsService
etStatsService
;
public
final
EtStatsService
etStatsService
;
@ApiOperation
(
"统计该区域的机构和儿童数量"
)
@PostMapping
(
value
=
"/getAgencyChildStats"
)
public
ResultVo
<
Object
>
getAgencyChildStats
(
@RequestBody
StatsReqVo
vo
)
{
return
ResultVo
.
success
(
etStatsService
.
getCacheAgencyChildStats
(
vo
));
}
@ApiOperation
(
"儿童福利机构统计列表"
)
@ApiOperation
(
"儿童福利机构统计列表"
)
@PostMapping
(
value
=
"/getAgencyChildStatsList"
)
@PostMapping
(
value
=
"/getAgencyChildStatsList"
)
public
ResultVo
getAgencyChildStatsList
(
@RequestBody
StatsReqVo
vo
)
{
public
ResultVo
getAgencyChildStatsList
(
@RequestBody
StatsReqVo
vo
)
{
...
...
portal-server/src/main/java/com/zq/portal/service/StatsService.java
View file @
c733899c
...
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
...
@@ -19,7 +19,7 @@ import java.util.concurrent.TimeUnit;
public
class
StatsService
{
public
class
StatsService
{
private
final
HyStatsDao
hyStatsDao
;
private
final
HyStatsDao
hyStatsDao
;
private
final
YlStatsDao
yl
StatsDao
;
private
final
EtStatsDao
et
StatsDao
;
private
final
BzStatsDao
bzStatsDao
;
private
final
BzStatsDao
bzStatsDao
;
private
final
ShzzStatsDao
shzzStatsDao
;
private
final
ShzzStatsDao
shzzStatsDao
;
private
final
AreaDao
areaDao
;
private
final
AreaDao
areaDao
;
...
@@ -118,9 +118,15 @@ public class StatsService {
...
@@ -118,9 +118,15 @@ public class StatsService {
// 婚姻搜索
// 婚姻搜索
List
<
Map
<
String
,
Object
>>
marriageSearchList
=
hyStatsDao
.
search
(
SearchReqVo
.
builder
().
keyword
(
vo
.
getKeyword
()).
build
());
List
<
Map
<
String
,
Object
>>
marriageSearchList
=
hyStatsDao
.
search
(
SearchReqVo
.
builder
().
keyword
(
vo
.
getKeyword
()).
build
());
// 救助
// 儿童
List
<
Map
<
String
,
Object
>>
etSearchList
=
etStatsDao
.
search
(
SearchReqVo
.
builder
().
keyword
(
vo
.
getKeyword
()).
build
());
// 殡葬
List
<
Map
<
String
,
Object
>>
bzSearchList
=
bzStatsDao
.
search
(
SearchReqVo
.
builder
().
keyword
(
vo
.
getKeyword
()).
build
());
returnMap
.
put
(
"marriage"
,
marriageSearchList
);
returnMap
.
put
(
"marriage"
,
marriageSearchList
);
returnMap
.
put
(
"child"
,
etSearchList
);
returnMap
.
put
(
"funeral"
,
bzSearchList
);
redisUtils
.
setObj
(
PortalCacheKeys
.
gatherSearchKey
(
vo
),
returnMap
,
1L
,
TimeUnit
.
HOURS
);
redisUtils
.
setObj
(
PortalCacheKeys
.
gatherSearchKey
(
vo
),
returnMap
,
1L
,
TimeUnit
.
HOURS
);
return
returnMap
;
return
returnMap
;
...
...
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