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
2600160c
Commit
2600160c
authored
Jun 22, 2021
by
袁伟铭
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
添加多数据源
parent
df582aef
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
122 additions
and
33 deletions
+122
-33
portal-server/pom.xml
+5
-0
portal-server/src/main/java/com/zq/portal/config/DBName.java
+10
-0
portal-server/src/main/java/com/zq/portal/config/SpringSecurityConfig.java
+1
-0
portal-server/src/main/java/com/zq/portal/dao/BzStatsDao.java
+3
-0
portal-server/src/main/java/com/zq/portal/dao/DbStatsDao.java
+3
-0
portal-server/src/main/java/com/zq/portal/dao/HyStatsDao.java
+3
-0
portal-server/src/main/java/com/zq/portal/dao/ShzzStatsDao.java
+3
-0
portal-server/src/main/java/com/zq/portal/service/StatsService.java
+7
-4
portal-server/src/main/java/com/zq/portal/vo/YearStatsVo.java
+0
-2
portal-server/src/main/resources/application.yml
+83
-23
portal-server/src/main/resources/mapper/AreaMapper.xml
+1
-1
portal-server/src/main/resources/mapper/BzStatsMapper.xml
+1
-1
portal-server/src/main/resources/mapper/HyStatsMapper.xml
+1
-1
portal-server/src/main/resources/mapper/ShzzStatsMapper.xml
+1
-1
No files found.
portal-server/pom.xml
View file @
2600160c
...
...
@@ -60,6 +60,11 @@
<artifactId>
mybatis-plus-boot-starter
</artifactId>
<version>
${mybatis.plus.version}
</version>
</dependency>
<dependency>
<groupId>
com.baomidou
</groupId>
<artifactId>
dynamic-datasource-spring-boot-starter
</artifactId>
<version>
3.4.0
</version>
</dependency>
<!-- druid数据源驱动 -->
<dependency>
<groupId>
com.alibaba
</groupId>
...
...
portal-server/src/main/java/com/zq/portal/config/DBName.java
0 → 100644
View file @
2600160c
package
com
.
zq
.
portal
.
config
;
public
class
DBName
{
public
final
static
String
GXBZ
=
"gxbz"
;
public
final
static
String
GXCJ
=
"gxcj"
;
public
final
static
String
GXDB
=
"gxdb"
;
public
final
static
String
GXHY
=
"gxhy"
;
public
final
static
String
GXSHZZ
=
"gxshzz"
;
}
portal-server/src/main/java/com/zq/portal/config/SpringSecurityConfig.java
View file @
2600160c
...
...
@@ -76,6 +76,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
Map
<
String
,
Set
<
String
>>
anonymousUrls
=
getAnonymousUrl
(
handlerMethodMap
);
Set
<
String
>
apiSet
=
new
HashSet
<>();
//不使用注解的时候在这添加url放行
apiSet
.
add
(
"/portal/app/**"
);
// apiSet.add("/static/map/**");
anonymousUrls
.
put
(
"API"
,
apiSet
);
...
...
portal-server/src/main/java/com/zq/portal/dao/BzStatsDao.java
View file @
2600160c
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.zq.portal.config.DBName
;
import
com.zq.portal.vo.YearStatsVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
@DS
(
DBName
.
GXBZ
)
@Repository
public
interface
BzStatsDao
{
...
...
portal-server/src/main/java/com/zq/portal/dao/DbStatsDao.java
View file @
2600160c
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.zq.portal.config.DBName
;
import
com.zq.portal.vo.YearStatsVo
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
@DS
(
DBName
.
GXDB
)
@Repository
public
interface
DbStatsDao
{
...
...
portal-server/src/main/java/com/zq/portal/dao/HyStatsDao.java
View file @
2600160c
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.zq.portal.config.DBName
;
import
com.zq.portal.vo.YearStatsVo
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
@DS
(
DBName
.
GXHY
)
@Repository
public
interface
HyStatsDao
{
...
...
portal-server/src/main/java/com/zq/portal/dao/ShzzStatsDao.java
View file @
2600160c
package
com
.
zq
.
portal
.
dao
;
import
com.baomidou.dynamic.datasource.annotation.DS
;
import
com.zq.portal.config.DBName
;
import
com.zq.portal.vo.YearStatsVo
;
import
org.apache.ibatis.annotations.Param
;
import
org.springframework.stereotype.Repository
;
import
java.util.List
;
@DS
(
DBName
.
GXSHZZ
)
@Repository
public
interface
ShzzStatsDao
{
...
...
portal-server/src/main/java/com/zq/portal/service/StatsService.java
View file @
2600160c
...
...
@@ -29,10 +29,10 @@ public class StatsService {
private
final
PortalCacheManager
portalCacheManager
;
public
Object
getMapStatsData
(
AreaVo
vo
)
{
Object
obj
=
portalCacheManager
.
getObj
(
CacheKeys
.
getMapDataKey
(
vo
.
getPId
()));
if
(
obj
!=
null
)
{
return
obj
;
}
//
Object obj = portalCacheManager.getObj(CacheKeys.getMapDataKey(vo.getPId()));
//
if (obj != null) {
//
return obj;
//
}
List
<
Map
<
String
,
Object
>>
returnData
=
new
ArrayList
<>();
//获取子区域
...
...
@@ -40,6 +40,7 @@ public class StatsService {
AssertUtils
.
isTrue
(
kid
!=
null
&&
kid
.
size
()
>
0
,
"该地区没有数据"
);
for
(
SystemArea
systemArea
:
kid
)
{
// 区域数据
Map
<
String
,
Object
>
areaData
=
new
HashMap
<>();
String
areaCode
=
systemArea
.
subAreaCode
();
// 每年死亡人数
...
...
@@ -51,6 +52,8 @@ public class StatsService {
areaData
.
put
(
"deathsPerYear"
,
deathsPerYear
);
areaData
.
put
(
"marryPerYear"
,
marryPerYear
);
areaData
.
put
(
"soorganPerYear"
,
soorganPerYear
);
areaData
.
put
(
"areaName"
,
systemArea
.
getName
());
areaData
.
put
(
"areaCode"
,
systemArea
.
getCode
());
returnData
.
add
(
areaData
);
}
...
...
portal-server/src/main/java/com/zq/portal/vo/YearStatsVo.java
View file @
2600160c
...
...
@@ -9,6 +9,4 @@ public class YearStatsVo {
private
Integer
num
;
private
String
areaCode
;
}
portal-server/src/main/resources/application.yml
View file @
2600160c
...
...
@@ -21,16 +21,14 @@ spring:
database
:
0
host
:
${redis.url}
port
:
${redis.port}
# password: ${redis.password}
# password: ${redis.password}
#连接超时时间
timeout
:
5000
datasource
:
dynamic
:
# mybatis plus多数据源插件
primary
:
master
#设置默认的数据源或者数据源组,默认值即为master
strict
:
false
#严格匹配数据源,默认false. true未匹配到指定数据源时抛异常,false使用默认数据源
druid
:
db-type
:
com.alibaba.druid.pool.DruidDataSource
driverClassName
:
${jdbc.driver-class-name}
username
:
${jdbc.username}
password
:
${jdbc.password}
url
:
${jdbc.url}
# 初始连接数
initial-size
:
5
# 最小连接数
...
...
@@ -50,23 +48,85 @@ spring:
test-on-return
:
false
# 检测连接是否有效
validation-query
:
select 1
# 配置监控统计
webStatFilter
:
enabled
:
true
stat-view-servlet
:
enabled
:
true
url-pattern
:
/druid/*
reset-enable
:
false
filter
:
stat
:
enabled
:
true
# 记录慢SQL
log-slow-sql
:
true
slow-sql-millis
:
1000
merge-sql
:
true
wall
:
config
:
multi-statement-allow
:
true
datasource
:
master
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/mz_big_data?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
gxbz
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/gx-bz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
gxcj
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/gx-cj?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
gxdb
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/gx-db?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
gxhy
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/gx-hy?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
gxshzz
:
type
:
com.alibaba.druid.pool.DruidDataSource
url
:
jdbc:mysql://192.168.0.193:3306/gx-shzz?characterEncoding=utf8&useSSL=false&serverTimezone=Asia/Shanghai
username
:
root
password
:
rooT123!321
driver-class-name
:
com.mysql.cj.jdbc.Driver
# druid:
# db-type: com.alibaba.druid.pool.DruidDataSource
# driverClassName: ${jdbc.driver-class-name}
# username: ${jdbc.username}
# password: ${jdbc.password}
# url: ${jdbc.url}
# # 初始连接数
# initial-size: 5
# # 最小连接数
# min-idle: 10
# # 最大连接数
# max-active: 20
# # 获取连接超时时间
# max-wait: 5000
# # 连接有效性检测时间
# time-between-eviction-runs-millis: 60000
# # 连接在池中最小生存的时间
# min-evictable-idle-time-millis: 300000
# # 连接在池中最大生存的时间
# max-evictable-idle-time-millis: 900000
# test-while-idle: true
# test-on-borrow: false
# test-on-return: false
# # 检测连接是否有效
# validation-query: select 1
# # 配置监控统计
# webStatFilter:
# enabled: true
# stat-view-servlet:
# enabled: true
# url-pattern: /druid/*
# reset-enable: false
# filter:
# stat:
# enabled: true
# # 记录慢SQL
# log-slow-sql: true
# slow-sql-millis: 1000
# merge-sql: true
# wall:
# config:
# multi-statement-allow: true
# mybatis plus 配置
mybatis-plus
:
global-config
:
...
...
portal-server/src/main/resources/mapper/AreaMapper.xml
View file @
2600160c
...
...
@@ -50,7 +50,7 @@
</select>
<select
id=
"findKid"
parameterType=
"java.lang.String"
resultType=
"com.zq.common.entity.SystemArea"
>
SELECT id as id, type ,parent_id as parentId,name FROM system_area a where a.parent_id=#{value}
SELECT id as id,
code,
type ,parent_id as parentId,name FROM system_area a where a.parent_id=#{value}
</select>
<select
id=
"getYear"
resultType=
"com.zq.common.entity.SystemYear"
>
...
...
portal-server/src/main/resources/mapper/BzStatsMapper.xml
View file @
2600160c
...
...
@@ -6,7 +6,7 @@
SELECT
COUNT(1) 'num', LEFT(i.DEATH_DATE,4) 'year'
FROM
`gx-bz`.
fis_scatter_dead_info i
fis_scatter_dead_info i
WHERE i.ID_CARD LIKE CONCAT(#{areaCode}, '%')
GROUP BY
LEFT(i.DEATH_DATE,4)
...
...
portal-server/src/main/resources/mapper/HyStatsMapper.xml
View file @
2600160c
...
...
@@ -6,7 +6,7 @@
SELECT
COUNT(1) 'num', DATE_FORMAT(m.AIAX0048,"%Y") 'year'
FROM
`gx-hy`.
mrcase m
mrcase m
WHERE (m.AIAP0013 LIKE CONCAT(#{areaCode},'%') OR m.AIAP0014 LIKE CONCAT(#{areaCode},'%'))
GROUP BY
DATE_FORMAT(m.AIAX0048,"%Y")
...
...
portal-server/src/main/resources/mapper/ShzzStatsMapper.xml
View file @
2600160c
...
...
@@ -6,7 +6,7 @@
SELECT
COUNT(1) 'num', DATE_FORMAT(s.issueTime,"%Y") 'year'
FROM
`gx-shzz`.
soorgan s
soorgan s
WHERE s.adminCodeId LIKE CONCAT('45','%')
GROUP BY
DATE_FORMAT(s.issueTime,"%Y")
...
...
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