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
7cf0bd41
Commit
7cf0bd41
authored
Jun 24, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改表名
parent
3db7715f
Show whitespace changes
Inline
Side-by-side
Showing
11 changed files
with
163 additions
and
44 deletions
+163
-44
common-utils/src/main/java/com/zq/common/entity/VAreaMarriageStats.java
+3
-2
common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java
+65
-0
portal-server/src/main/java/com/zq/portal/config/SpringSecurityConfig.java
+1
-1
portal-server/src/main/java/com/zq/portal/controller/admin/HyAdminStatsController.java
+19
-4
portal-server/src/main/java/com/zq/portal/controller/app/CjStatsController.java
+1
-1
portal-server/src/main/java/com/zq/portal/controller/app/HyStatsController.java
+8
-8
portal-server/src/main/java/com/zq/portal/controller/app/ShzzStatsController.java
+17
-0
portal-server/src/main/java/com/zq/portal/dao/VAreaMarriageStatsDao.java
+2
-2
portal-server/src/main/java/com/zq/portal/dao/VMarriageStatsDao.java
+16
-0
portal-server/src/main/java/com/zq/portal/manager/CacheKeys.java
+2
-3
portal-server/src/main/java/com/zq/portal/service/StatsService.java
+29
-23
No files found.
common-utils/src/main/java/com/zq/common/entity/
Mrcas
eStats.java
→
common-utils/src/main/java/com/zq/common/entity/
VAreaMarriag
eStats.java
View file @
7cf0bd41
...
...
@@ -9,6 +9,7 @@ import lombok.Builder;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
java.io.Serializable
;
import
java.util.Date
;
/**
...
...
@@ -21,8 +22,8 @@ import java.util.Date;
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName
(
value
=
"
t_mrcas
e_stats"
)
public
class
Mrcas
eStats
{
@TableName
(
value
=
"
v_area_marriag
e_stats"
)
public
class
VAreaMarriag
eStats
{
/**
* id
...
...
common-utils/src/main/java/com/zq/common/entity/VMarriageStats.java
0 → 100644
View file @
7cf0bd41
package
com
.
zq
.
common
.
entity
;
import
java.util.Date
;
import
com.baomidou.mybatisplus.annotation.IdType
;
import
com.baomidou.mybatisplus.annotation.TableId
;
import
com.baomidou.mybatisplus.annotation.TableName
;
import
io.swagger.annotations.ApiModelProperty
;
import
lombok.*
;
/**
* 地区婚姻统计(VMarriageStats)实体类
*
* @author makejava
* @since 2021-06-24 11:57:43
*/
@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@TableName
(
value
=
"v_marriage_stats"
)
public
class
VMarriageStats
{
/**
* id
*/
@TableId
(
type
=
IdType
.
AUTO
)
private
Long
id
;
/**
* 结婚人数
*/
@ApiModelProperty
(
"结婚人数"
)
private
Integer
marryNum
;
/**
* 申请离婚人数
*/
@ApiModelProperty
(
"申请离婚人数"
)
private
Integer
inDivorceNum
;
/**
* 离婚成功
*/
@ApiModelProperty
(
"离婚成功"
)
private
Integer
divorceNum
;
/**
* 跨地区结婚人数
*/
@ApiModelProperty
(
"跨地区结婚人数"
)
private
Integer
crossMarryNum
;
/**
* 跨地区离婚人数
*/
@ApiModelProperty
(
"跨地区离婚人数"
)
private
Integer
crossDivorceNum
;
/**
* createTime
*/
private
Date
createTime
;
}
portal-server/src/main/java/com/zq/portal/config/SpringSecurityConfig.java
View file @
7cf0bd41
...
...
@@ -77,7 +77,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
Set
<
String
>
apiSet
=
new
HashSet
<>();
//不使用注解的时候在这添加url放行
apiSet
.
add
(
"/portal/app/**"
);
apiSet
.
add
(
"/**"
);
//
apiSet.add("/**");
anonymousUrls
.
put
(
"API"
,
apiSet
);
httpSecurity
...
...
portal-server/src/main/java/com/zq/portal/controller/admin/HyAdminStatsController.java
View file @
7cf0bd41
package
com
.
zq
.
portal
.
controller
.
admin
;
import
cn.hutool.core.date.DateUtil
;
import
com.zq.common.annotation.AnonymousAccess
;
import
com.zq.common.config.redis.RedisUtils
;
import
com.zq.common.entity.VMarriageStats
;
import
com.zq.common.vo.ResultVo
;
import
com.zq.portal.manager.CacheKeys
;
import
com.zq.portal.manager.PortalCacheManager
;
import
com.zq.portal.service.StatsService
;
import
com.zq.portal.vo.StatsReqVo
;
import
io.swagger.annotations.Api
;
...
...
@@ -11,6 +17,9 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
import
java.util.ArrayList
;
import
java.util.List
;
@Api
(
tags
=
"婚姻相关接口"
)
@RequiredArgsConstructor
@RestController
...
...
@@ -18,17 +27,23 @@ import org.springframework.web.bind.annotation.RestController;
public
class
HyAdminStatsController
{
public
final
StatsService
statsService
;
public
final
RedisUtils
redisUtils
;
@ApiOperation
(
"获取结婚离婚人数"
)
@PostMapping
(
value
=
"/getTotalMarryDivorce"
)
public
ResultVo
getTotalMarryDivorce
(
@RequestBody
StatsReqVo
vo
)
{
return
ResultVo
.
success
(
statsService
.
get
TotalMarryDivorce
(
vo
));
return
ResultVo
.
success
(
statsService
.
get
MarriageStats
(
vo
));
}
@AnonymousAccess
@ApiOperation
(
"获取地区结婚离婚人数列表"
)
@PostMapping
(
value
=
"/getAreaMarryDivorceList"
)
public
ResultVo
getAreaMarryDivorceList
(
@RequestBody
StatsReqVo
vo
)
{
return
ResultVo
.
success
(
statsService
.
getAreaMarryDivorceList
(
vo
));
@PostMapping
(
value
=
"/getAreaMarriageStatsList"
)
public
ResultVo
getAreaMarriageStatsList
(
@RequestBody
StatsReqVo
vo
)
{
Object
obj
=
redisUtils
.
getObj
(
CacheKeys
.
getAreaMarriageStatsListKey
(
vo
.
getAreaCode
()));
if
(
obj
!=
null
)
{
return
ResultVo
.
success
(
obj
);
}
return
ResultVo
.
success
(
statsService
.
getAreaMarriageStatsList
(
vo
));
}
@ApiOperation
(
"获取地区结婚离婚人数列表"
)
...
...
portal-server/src/main/java/com/zq/portal/controller/app/CjStatsController.java
View file @
7cf0bd41
...
...
@@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.RequestBody;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
@Api
(
tags
=
"统计相关接口"
)
@Api
(
tags
=
"
残疾
统计相关接口"
)
@RequiredArgsConstructor
@RestController
@RequestMapping
(
value
=
"/portal/app/stats"
)
...
...
portal-server/src/main/java/com/zq/portal/controller/app/HyStatsController.java
View file @
7cf0bd41
...
...
@@ -25,17 +25,17 @@ public class HyStatsController {
@ApiOperation
(
"获取结婚离婚人数"
)
@PostMapping
(
value
=
"/getTotalMarryDivorce"
)
public
ResultVo
getTotalMarryDivorce
(
@RequestBody
StatsReqVo
vo
)
{
return
ResultVo
.
success
(
statsService
.
get
TotalMarryDivorce
(
vo
));
return
ResultVo
.
success
(
statsService
.
get
MarriageStats
(
vo
));
}
@ApiOperation
(
"获取地区结婚离婚人数列表"
)
@PostMapping
(
value
=
"/getAreaMarr
yDivorce
List"
)
public
ResultVo
getAreaMarr
yDivorce
List
(
@RequestBody
StatsReqVo
vo
)
{
// Object obj = cacheManager.getObj(CacheKeys.getAreaHy
ListKey(vo.getAreaCode()));
//
if (obj != null) {
//
return ResultVo.success(obj);
//
}
return
ResultVo
.
success
(
statsService
.
getAreaMarr
yDivorce
List
(
vo
));
@PostMapping
(
value
=
"/getAreaMarr
iageStats
List"
)
public
ResultVo
getAreaMarr
iageStats
List
(
@RequestBody
StatsReqVo
vo
)
{
Object
obj
=
cacheManager
.
getObj
(
CacheKeys
.
getAreaMarriageStats
ListKey
(
vo
.
getAreaCode
()));
if
(
obj
!=
null
)
{
return
ResultVo
.
success
(
obj
);
}
return
ResultVo
.
success
(
statsService
.
getAreaMarr
iageStats
List
(
vo
));
}
}
portal-server/src/main/java/com/zq/portal/controller/app/ShzzStatsController.java
0 → 100644
View file @
7cf0bd41
package
com
.
zq
.
portal
.
controller
.
app
;
import
com.zq.portal.service.StatsService
;
import
io.swagger.annotations.Api
;
import
lombok.RequiredArgsConstructor
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RestController
;
@Api
(
tags
=
"社会组织统计相关接口"
)
@RequiredArgsConstructor
@RestController
@RequestMapping
(
value
=
"/portal/app/stats"
)
public
class
ShzzStatsController
{
public
final
StatsService
statsService
;
}
portal-server/src/main/java/com/zq/portal/dao/
Mrcas
eStatsDao.java
→
portal-server/src/main/java/com/zq/portal/dao/
VAreaMarriag
eStatsDao.java
View file @
7cf0bd41
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.zq.common.entity.
Mrcas
eStats
;
import
com.zq.common.entity.
VAreaMarriag
eStats
;
import
org.springframework.stereotype.Repository
;
/**
...
...
@@ -11,6 +11,6 @@ import org.springframework.stereotype.Repository;
* @since 2021-06-24 10:04:22
*/
@Repository
public
interface
MrcaseStatsDao
extends
BaseMapper
<
Mrcas
eStats
>
{
public
interface
VAreaMarriageStatsDao
extends
BaseMapper
<
VAreaMarriag
eStats
>
{
}
portal-server/src/main/java/com/zq/portal/dao/VMarriageStatsDao.java
0 → 100644
View file @
7cf0bd41
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.mybatisplus.core.mapper.BaseMapper
;
import
com.zq.common.entity.VMarriageStats
;
import
org.springframework.stereotype.Repository
;
/**
* 地区婚姻统计(VMarriageStats)表数据库访问层
*
* @author makejava
* @since 2021-06-24 11:58:52
*/
@Repository
public
interface
VMarriageStatsDao
extends
BaseMapper
<
VMarriageStats
>
{
}
portal-server/src/main/java/com/zq/portal/manager/CacheKeys.java
View file @
7cf0bd41
...
...
@@ -8,9 +8,8 @@ public abstract class CacheKeys {
return
PREFIX
+
"map."
+
areaCode
;
}
public
static
String
getArea
Hy
ListKey
(
String
areaCode
)
{
return
PREFIX
+
"
areaHy
List."
+
areaCode
;
public
static
String
getArea
MarriageStats
ListKey
(
String
areaCode
)
{
return
PREFIX
+
"
AreaMarriageStats
List."
+
areaCode
;
}
}
portal-server/src/main/java/com/zq/portal/service/StatsService.java
View file @
7cf0bd41
package
com
.
zq
.
portal
.
service
;
import
cn.hutool.core.date.DateUtil
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.baomidou.mybatisplus.core.toolkit.Wrappers
;
import
com.zq.common.entity.MrcaseStats
;
import
com.zq.common.config.redis.RedisUtils
;
import
com.zq.common.entity.VAreaMarriageStats
;
import
com.zq.common.entity.SystemArea
;
import
com.zq.common.utils.AssertUtils
;
import
com.zq.common.utils.StringUtils
;
import
com.zq.portal.config.DBName
;
import
com.zq.portal.dao.*
;
import
com.zq.portal.manager.CacheKeys
;
import
com.zq.portal.manager.PortalCacheManager
;
...
...
@@ -29,8 +28,8 @@ public class StatsService {
private
final
HyStatsDao
hyStatsDao
;
private
final
ShzzStatsDao
shzzStatsDao
;
private
final
AreaDao
areaDao
;
private
final
MrcaseStatsDao
mrcas
eStatsDao
;
private
final
PortalCacheManager
cacheManager
;
private
final
VAreaMarriageStatsDao
vAreaMarriag
eStatsDao
;
private
final
RedisUtils
redisUtils
;
public
Object
getMapStatsData
(
StatsReqVo
vo
)
{
List
<
Map
<
String
,
Object
>>
returnData
=
new
ArrayList
<>();
...
...
@@ -57,19 +56,19 @@ public class StatsService {
}
if
(
returnData
.
size
()
>
0
)
{
cacheManager
.
setObj
(
CacheKeys
.
getMapDataKey
(
vo
.
getAreaCode
()),
returnData
);
redisUtils
.
setObj
(
CacheKeys
.
getMapDataKey
(
vo
.
getAreaCode
()),
returnData
);
}
return
returnData
;
}
/**
*
获取总离婚结婚人数
*
婚姻统计
*
* @param vo
* @return
*/
public
Object
get
TotalMarryDivorce
(
StatsReqVo
vo
)
{
public
Object
get
MarriageStats
(
StatsReqVo
vo
)
{
if
(
StringUtils
.
isBlank
(
vo
.
getAreaCode
()))
{
vo
.
setAreaCode
(
"450000000000"
);
}
...
...
@@ -85,49 +84,55 @@ public class StatsService {
* @param vo
* @return
*/
public
Object
getAreaMarryDivorceList
(
StatsReqVo
vo
)
{
public
Object
getAreaMarriageStatsList
(
StatsReqVo
vo
)
{
String
areaMarriageStatsListKey
=
CacheKeys
.
getAreaMarriageStatsListKey
(
vo
.
getAreaCode
());
if
(
StringUtils
.
isBlank
(
vo
.
getAreaCode
()))
{
vo
.
setAreaCode
(
"450000000000"
);
}
SystemArea
area
=
areaDao
.
getAreaByCode
(
vo
.
getAreaCode
());
vo
.
setAreaCode
(
area
.
subAreaCode
());
List
<
Mrcas
eStats
>
returnData
=
new
ArrayList
<>();
List
<
VAreaMarriag
eStats
>
returnData
=
new
ArrayList
<>();
List
<
SystemArea
>
systemAreaList
=
areaDao
.
selectList
(
Wrappers
.
lambdaQuery
(
SystemArea
.
builder
().
parentId
(
area
.
getCode
()).
build
()));
for
(
SystemArea
systemArea
:
systemAreaList
)
{
MrcaseStats
build
=
MrcaseStats
.
builder
()
VAreaMarriageStats
vAreaMarriageStats
=
vAreaMarriageStatsDao
.
selectOne
(
Wrappers
.
lambdaQuery
(
VAreaMarriageStats
.
builder
().
areaCode
(
systemArea
.
getCode
()).
createTime
(
DateUtil
.
parseDate
(
DateUtil
.
today
())).
build
()));
if
(
vAreaMarriageStats
==
null
)
{
vAreaMarriageStats
=
VAreaMarriageStats
.
builder
()
.
areaCode
(
systemArea
.
getCode
())
.
areaName
(
systemArea
.
getName
())
.
createTime
(
DateUtil
.
date
())
.
build
();
// 按结婚离婚分类统计
List
<
StatsVo
>
totalMarryDivorce
=
hyStatsDao
.
getTotalMarryDivorce
(
StatsReqVo
.
builder
().
areaCode
(
systemArea
.
subAreaCode
()).
build
());
for
(
StatsVo
statsVo
:
totalMarryDivorce
)
{
if
(
"IA"
.
equals
(
statsVo
.
getType
()))
{
build
.
setIaNum
(
statsVo
.
getNum
());
vAreaMarriageStats
.
setIaNum
(
statsVo
.
getNum
());
}
else
if
(
"IB"
.
equals
(
statsVo
.
getType
()))
{
build
.
setIbNum
(
statsVo
.
getNum
());
vAreaMarriageStats
.
setIbNum
(
statsVo
.
getNum
());
}
else
if
(
"ICA"
.
equals
(
statsVo
.
getType
()))
{
build
.
setIcaNum
(
statsVo
.
getNum
());
vAreaMarriageStats
.
setIcaNum
(
statsVo
.
getNum
());
}
else
if
(
"ICB"
.
equals
(
statsVo
.
getType
()))
{
build
.
setIcbNum
(
statsVo
.
getNum
());
vAreaMarriageStats
.
setIcbNum
(
statsVo
.
getNum
());
}
}
returnData
.
add
(
build
);
//添加统计到数据库
addMrcaseStats
(
returnData
);
}
returnData
.
add
(
vAreaMarriageStats
);
}
cacheManager
.
setObj
(
CacheKeys
.
getAreaHyListKey
(
vo
.
getAreaCode
())
,
returnData
);
redisUtils
.
setObj
(
areaMarriageStatsListKey
,
returnData
);
//添加统计到数据库
addVAreaMarriageStats
(
returnData
);
return
returnData
;
}
public
void
add
MrcaseStats
(
List
<
MrcaseStats
>
mrcas
eStats
)
{
for
(
MrcaseStats
mrcaseStat
:
mrcas
eStats
)
{
public
void
add
VAreaMarriageStats
(
List
<
VAreaMarriageStats
>
vAreaMarriag
eStats
)
{
for
(
VAreaMarriageStats
mrcaseStat
:
vAreaMarriag
eStats
)
{
// 记录统计数
MrcaseStats
ms
=
mrcaseStatsDao
.
selectOne
(
Wrappers
.
lambdaQuery
(
MrcaseStats
.
builder
().
areaCode
(
mrcaseStat
.
getAreaCode
()).
createTime
(
DateUtil
.
date
(
)).
build
()));
VAreaMarriageStats
ms
=
vAreaMarriageStatsDao
.
selectOne
(
Wrappers
.
lambdaQuery
(
VAreaMarriageStats
.
builder
().
areaCode
(
mrcaseStat
.
getAreaCode
()).
createTime
(
DateUtil
.
parseDate
(
DateUtil
.
today
()
)).
build
()));
if
(
ms
==
null
)
{
mrcaseStatsDao
.
insert
(
ms
);
vAreaMarriageStatsDao
.
insert
(
mrcaseStat
);
}
}
}
...
...
@@ -152,4 +157,5 @@ public class StatsService {
List
<
StatsVo
>
statsVoList
=
hyStatsDao
.
getMonthDivorceCoolingData
(
vo
);
return
null
;
}
}
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