shiyang / regional-platform

Commit d45fe136ab228e84ddda0950e8b65c319b25cae8

Authored by jiangjiazhi over 9 years ago

Merge remote-tracking branch 'origin/master'

Showing 18 changed files

platform-data-api/src/main/resources/database.properties
platform-data-api/src/main/resources/spring/applicationContext.xml
platform-operate-api/pom.xml
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/StatisticsController.java
platform-operate-api/src/main/resources/database.properties
platform-operate-api/src/main/resources/spring/applicationContext-dal.xml
platform-operate-api/src/main/resources/spring/applicationContext.xml
platform-reportData/pom.xml
platform-reportData/src/main/java/com/lymsh/platform/reportdata/dao/StatisticsMapper.java
platform-reportData/src/main/java/com/lymsh/platform/reportdata/model/AreaData.java
platform-reportData/src/main/java/com/lymsh/platform/reportdata/service/StatisticsService.java
platform-reportData/src/main/java/com/lymsh/platform/reportdata/service/impl/StatisticsServiceImpl.java
platform-reportData/src/main/resources/reportOrm/StatisticsMapper.xml
platform-reportData/src/test/sql.txt
platform-resource/resources/config-dev.properties
platform-resource/resources/config-product.properties
platform-resource/resources/config-test.properties
pom.xml

...	...	@@ -50,8 +50,8 @@
50	50
51	51	earlydata.driver=oracle.jdbc.driver.OracleDriver
52	52	earlydata.jdbcurl=jdbc:oracle:thin:@192.168.1.127:1521:orcl
53		-earlydata.username=LYMS_QHDCESHI5
54		-earlydata.password=LYMS_QHDCESHI5
	53	+earlydata.username=LYMS_21
	54	+earlydata.password=LYMS_21
55	55
56	56	earlydata.maxpoolsize=5
57	57	earlydata.initialpoolsize=2

...	...	@@ -17,6 +17,7 @@
17	17	<!-- 配置要扫描的包 -->
18	18	<context:component-scan base-package="com.lyms.platform.biz.dal.impl" />
19	19	<context:component-scan base-package="com.lyms.platform.permission.*" />
	20	+ <context:component-scan base-package="com.lymsh.mommybaby.earlydata.model.*" />
20	21	<bean id="configProperties"
21	22	class="org.springframework.beans.factory.config.PropertiesFactoryBean">
22	23	<property name="locations">

...	...	@@ -36,6 +36,11 @@
36	36	<version>${project.version}</version>
37	37	</dependency>
38	38	<dependency>
	39	+ <groupId>com.lyms.core</groupId>
	40	+ <artifactId>platform-reportData</artifactId>
	41	+ <version>${project.version}</version>
	42	+ </dependency>
	43	+ <dependency>
39	44	<groupId>org.apache.activemq</groupId>
40	45	<artifactId>activemq-all</artifactId>
41	46	<version>${org.activemq.version}</version>

	1	+package com.lyms.platform.operate.web.controller;
	2	+
	3	+import com.lyms.platform.common.annotation.TokenRequired;
	4	+import com.lyms.platform.common.base.BaseController;
	5	+import com.lyms.platform.common.constants.ErrorCodeConstants;
	6	+import com.lyms.platform.common.utils.JsonUtil;
	7	+import com.lyms.platform.common.utils.ResultUtils;
	8	+import com.lymsh.platform.reportdata.model.AreaData;
	9	+import com.lymsh.platform.reportdata.service.StatisticsService;
	10	+import org.apache.commons.lang.StringUtils;
	11	+import org.springframework.beans.factory.annotation.Autowired;
	12	+import org.springframework.stereotype.Controller;
	13	+import org.springframework.web.bind.annotation.PathVariable;
	14	+import org.springframework.web.bind.annotation.RequestMapping;
	15	+import org.springframework.web.bind.annotation.RequestMethod;
	16	+import org.springframework.web.bind.annotation.RequestParam;
	17	+
	18	+import javax.servlet.http.HttpServletResponse;
	19	+import java.util.HashMap;
	20	+import java.util.List;
	21	+import java.util.Map;
	22	+
	23	+/**
	24	+ * Created by Administrator on 2016/6/28 0028.
	25	+ */
	26	+@Controller
	27	+@RequestMapping("/statistics")
	28	+public class StatisticsController extends BaseController {
	29	+
	30	+ @Autowired
	31	+ private StatisticsService statisticsService;
	32	+
	33	+ @RequestMapping(value = "/countryData", method = RequestMethod.GET)
	34	+ @TokenRequired
	35	+ public void getCountryData(HttpServletResponse response, @RequestParam(value = "year", required = false)String year) {
	36	+ if (StringUtils.isBlank(year)) {
	37	+ year = null;
	38	+ }
	39	+ List<AreaData> simpleList = statisticsService.queryProvincePatients(year);
	40	+ List<AreaData> riskList = statisticsService.queryProvinceRiskPatients(year);
	41	+ Map<String,Object> result= new HashMap<String, Object>();
	42	+ result.put("simpleList", simpleList);
	43	+ result.put("riskList", riskList);
	44	+ ResultUtils.buildSuccessResultAndWrite(response, result);
	45	+ }
	46	+
	47	+}

...	...	@@ -46,4 +46,14 @@
46	46	mongo.config.replica.set.name=repl
47	47	mongo.config.database=test
48	48	mongo.config.username= mongo.config.password= mongodb.connection=
	49	+
	50	+
	51	+report.driver=oracle.jdbc.driver.OracleDriver
	52	+report.jdbcurl=${report.db.jdbcurl}
	53	+report.username=${report.db.username}
	54	+report.password=${report.db.password}
	55	+
	56	+report.maxpoolsize=5
	57	+report.initialpoolsize=2
	58	+report.minpoolsize=2

...	...	@@ -50,6 +50,7 @@
50	50
51	51	<!-- all class in the back-package are auto loaded as a mapper -->
52	52	<bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
	53	+ <property name="sqlSessionFactoryBeanName" value="mainSqlSessionFactory"></property>
53	54	<property name="basePackage" value="com.lyms.platform.permission.dao" />
54	55	</bean>
55	56
...	...	@@ -64,6 +65,53 @@
64	65	<!-- Mabatis Data Layer -->
65	66	<bean id="mainSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
66	67	<constructor-arg index="0" ref="mainSqlSessionFactory" />
	68	+ </bean>
	69	+
	70	+
	71	+ <!-- DataSource configuration 数据仓库主数据库 -->
	72	+ <bean id="reportDataSource" class="com.mchange.v2.c3p0.ComboPooledDataSource">
	73	+ <property name="driverClass" value="${report.driver}" />
	74	+ <property name="jdbcUrl" value="${report.jdbcurl}" />
	75	+ <property name="user" value="${report.username}" />
	76	+ <property name="password" value="${report.password}" />
	77	+ <property name="maxPoolSize" value="${report.maxpoolsize}" />
	78	+ <property name="initialPoolSize" value="${report.initialpoolsize}" />
	79	+ <property name="maxIdleTime" value="7200"></property>
	80	+ <property name="acquireRetryDelay" value="1000"></property>
	81	+ <property name="breakAfterAcquireFailure" value="false"></property>
	82	+ <property name="acquireRetryAttempts" value="3" />
	83	+ <property name="minPoolSize" value="${report.minpoolsize}" />
	84	+ </bean>
	85	+
	86	+ <bean id="reportJdbcTemplate" class="org.springframework.jdbc.core.JdbcTemplate"
	87	+ p:dataSource-ref="reportDataSource" />
	88	+
	89	+ <bean id="reportSqlSessionFactory" class="org.mybatis.spring.SqlSessionFactoryBean">
	90	+ <property name="dataSource" ref="reportDataSource" />
	91	+ <property name="mapperLocations">
	92	+ <list>
	93	+ <value>classpath:reportOrm/.xml</value>
	94	+ </list>
	95	+ </property>
	96	+ </bean>
	97	+
	98	+ <!-- manage transaction -->
	99	+ <bean id="reportTransactionManager"
	100	+ class="org.springframework.jdbc.datasource.DataSourceTransactionManager">
	101	+ <property name="dataSource" ref="reportDataSource" />
	102	+ </bean>
	103	+
	104	+ <tx:annotation-driven transaction-manager="reportTransactionManager"/>
	105	+
	106	+ <!-- Mabatis Data Layer -->
	107	+ <bean id="reportSqlSessionTemplate" class="org.mybatis.spring.SqlSessionTemplate">
	108	+ <constructor-arg index="0" ref="reportSqlSessionFactory" />
	109	+ </bean>
	110	+
	111	+ <!-- all class in the back-package are auto loaded as a mapper -->
	112	+ <bean class="org.mybatis.spring.mapper.MapperScannerConfigurer">
	113	+ <property name="sqlSessionFactoryBeanName" value="reportSqlSessionFactory"></property>
	114	+ <property name="basePackage" value="com.lymsh.platform.reportdata.dao" />
67	115	</bean>
68	116
69	117

...	...	@@ -14,6 +14,9 @@
14	14	<context:component-scan base-package="com.lyms.platform.biz.dal.impl"/>
15	15	<context:component-scan base-package="com.lyms.platform.operate.web.facade"/>
16	16	<context:component-scan base-package="com.lyms.platform.permission.*"/>
	17	+ <context:component-scan base-package="com.lymsh.platform.reportdata.model.*" />
	18	+ <context:component-scan base-package="com.lymsh.platform.reportdata.dao" />
	19	+ <context:component-scan base-package="com.lymsh.platform.reportdata.service" />
17	20	<!-- 提示信息加载类 -->
18	21	<bean class="com.lyms.platform.common.core.resolve.MessageResolver">
19	22	<property name="messageFile" value="message.properties"/>

	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<project xmlns="http://maven.apache.org/POM/4.0.0"
	3	+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
	4	+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
	5	+ <parent>
	6	+ <artifactId>regional-platform</artifactId>
	7	+ <groupId>com.lyms.core</groupId>
	8	+ <version>1.0.1</version>
	9	+ </parent>
	10	+ <modelVersion>4.0.0</modelVersion>
	11	+ <packaging>jar</packaging>
	12	+ <artifactId>platform-reportData</artifactId>
	13	+
	14	+ <dependencies>
	15	+ <dependency>
	16	+ <groupId>com.lyms.core</groupId>
	17	+ <artifactId>platform-common</artifactId>
	18	+ <version>1.0.1</version>
	19	+ </dependency>
	20	+ <dependency>
	21	+ <groupId>com.oracle</groupId>
	22	+ <artifactId>ojdbc14</artifactId>
	23	+ <version>11.2.0.1.0</version>
	24	+ </dependency>
	25	+ </dependencies>
	26	+ <build>
	27	+ <plugins>
	28	+ <plugin>
	29	+ <groupId>org.apache.maven.plugins</groupId>
	30	+ <artifactId>maven-compiler-plugin</artifactId>
	31	+ <configuration>
	32	+ <source>1.7</source>
	33	+ <target>1.7</target>
	34	+ </configuration>
	35	+ </plugin>
	36	+ </plugins>
	37	+ <finalName>platform-mommyData</finalName>
	38	+ </build>
	39	+
	40	+</project>

	1	+package com.lymsh.platform.reportdata.dao;
	2	+
	3	+import com.lymsh.platform.reportdata.model.AreaData;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * Created by Administrator on 2016/6/28 0028.
	9	+ */
	10	+public interface StatisticsMapper {
	11	+
	12	+ public List<AreaData> queryProvincePatients(String year);
	13	+
	14	+ public List<AreaData> queryProvinceRiskPatients(String year);
	15	+
	16	+}

	1	+package com.lymsh.platform.reportdata.model;
	2	+
	3	+/**
	4	+ * Created by Administrator on 2016/6/28 0028.
	5	+ */
	6	+public class AreaData {
	7	+
	8	+ private String provinceId;
	9	+ private String provinceName;
	10	+ private String cityId;
	11	+ private String cityName;
	12	+ private String areaId;
	13	+ private String areaName;
	14	+ private Integer val;
	15	+ private String year;
	16	+
	17	+ public String getProvinceId() {
	18	+ return provinceId;
	19	+ }
	20	+
	21	+ public void setProvinceId(String provinceId) {
	22	+ this.provinceId = provinceId;
	23	+ }
	24	+
	25	+ public String getProvinceName() {
	26	+ return provinceName;
	27	+ }
	28	+
	29	+ public void setProvinceName(String provinceName) {
	30	+ this.provinceName = provinceName;
	31	+ }
	32	+
	33	+ public String getCityId() {
	34	+ return cityId;
	35	+ }
	36	+
	37	+ public void setCityId(String cityId) {
	38	+ this.cityId = cityId;
	39	+ }
	40	+
	41	+ public String getCityName() {
	42	+ return cityName;
	43	+ }
	44	+
	45	+ public void setCityName(String cityName) {
	46	+ this.cityName = cityName;
	47	+ }
	48	+
	49	+ public String getAreaId() {
	50	+ return areaId;
	51	+ }
	52	+
	53	+ public void setAreaId(String areaId) {
	54	+ this.areaId = areaId;
	55	+ }
	56	+
	57	+ public String getAreaName() {
	58	+ return areaName;
	59	+ }
	60	+
	61	+ public void setAreaName(String areaName) {
	62	+ this.areaName = areaName;
	63	+ }
	64	+
	65	+ public Integer getVal() {
	66	+ return val;
	67	+ }
	68	+
	69	+ public void setVal(Integer val) {
	70	+ this.val = val;
	71	+ }
	72	+
	73	+ public String getYear() {
	74	+ return year;
	75	+ }
	76	+
	77	+ public void setYear(String year) {
	78	+ this.year = year;
	79	+ }
	80	+}

	1	+package com.lymsh.platform.reportdata.service;
	2	+
	3	+import com.lymsh.platform.reportdata.model.AreaData;
	4	+
	5	+import java.util.List;
	6	+
	7	+/**
	8	+ * Created by Administrator on 2016/6/28 0028.
	9	+ */
	10	+public interface StatisticsService {
	11	+
	12	+ public List<AreaData> queryProvincePatients(String year);
	13	+
	14	+ public List<AreaData> queryProvinceRiskPatients(String year);
	15	+
	16	+}

	1	+package com.lymsh.platform.reportdata.service.impl;
	2	+
	3	+import com.lymsh.platform.reportdata.dao.StatisticsMapper;
	4	+import com.lymsh.platform.reportdata.model.AreaData;
	5	+import com.lymsh.platform.reportdata.service.StatisticsService;
	6	+import org.springframework.beans.factory.annotation.Autowired;
	7	+import org.springframework.stereotype.Service;
	8	+
	9	+import java.util.List;
	10	+
	11	+/**
	12	+ * Created by Administrator on 2016/6/28 0028.
	13	+ */
	14	+@Service
	15	+public class StatisticsServiceImpl implements StatisticsService {
	16	+
	17	+ @Autowired
	18	+ private StatisticsMapper statisticsMapper;
	19	+
	20	+ @Override
	21	+ public List<AreaData> queryProvincePatients(String year) {
	22	+ return statisticsMapper.queryProvincePatients(year);
	23	+ }
	24	+
	25	+ @Override
	26	+ public List<AreaData> queryProvinceRiskPatients(String year) {
	27	+ return statisticsMapper.queryProvinceRiskPatients(year);
	28	+ }
	29	+}

	1	+<?xml version="1.0" encoding="UTF-8" ?>
	2	+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
	3	+<mapper namespace="com.lymsh.platform.reportdata.dao.StatisticsMapper">
	4	+
	5	+ <resultMap id="AreaDataResultMap" type="com.lymsh.platform.reportdata.model.AreaData">
	6	+ <result column="province_id" property="provinceId" jdbcType="VARCHAR"/>
	7	+ <result column="province_name" property="provinceName" jdbcType="VARCHAR"/>
	8	+ <result column="year" property="year" jdbcType="VARCHAR"/>
	9	+ <result column="val" property="val" jdbcType="INTEGER"/>
	10	+ </resultMap>
	11	+
	12	+ <select id="queryProvincePatients" resultMap="AreaDataResultMap" parameterType="java.lang.String">
	13	+ SELECT
	14	+ ODS_D_PROVINCE.PROVINCE_ID as province_id,
	15	+ ODS_D_PROVINCE.PROVINCE as province_name,
	16	+ <if test="year != null and year != ''">
	17	+ ODS_D_DIM_DATE.YEAR_1 as year,
	18	+ </if>
	19	+ COUNT(ODS_F_GRAVIDA_RECORD.RECORD_ID) as val
	20	+ FROM
	21	+ ODS_D_PROVINCE,
	22	+ ODS_D_DIM_DATE,
	23	+ ODS_F_GRAVIDA_RECORD,
	24	+ ODS_D_HOSPITAL,
	25	+ ODS_D_CITY
	26	+ WHERE
	27	+ ( ODS_F_GRAVIDA_RECORD.HOSPITAL_NO=ODS_D_HOSPITAL.HOSPITAL_NO )
	28	+ AND ( ODS_D_CITY.PROVINCE_ID=ODS_D_PROVINCE.PROVINCE_ID )
	29	+ AND ( ODS_F_GRAVIDA_RECORD.INSERT_DATE=ODS_D_DIM_DATE.DATE_1 )
	30	+ AND ( ODS_D_HOSPITAL.CITY_ID=ODS_D_CITY.CITY_ID(+) )
	31	+ <if test="year != null and year != ''">
	32	+ AND ODS_D_DIM_DATE.YEAR_1=${year}
	33	+ </if>
	34	+ GROUP BY
	35	+ ODS_D_PROVINCE.PROVINCE_ID,
	36	+ ODS_D_PROVINCE.PROVINCE
	37	+ <if test="year != null and year != ''">
	38	+ ,ODS_D_DIM_DATE.YEAR_1
	39	+ </if>
	40	+ </select>
	41	+
	42	+ <select id="queryProvinceRiskPatients" resultMap="AreaDataResultMap" parameterType="java.lang.String">
	43	+ SELECT
	44	+ ODS_D_PROVINCE.PROVINCE_ID as province_id,
	45	+ ODS_D_PROVINCE.PROVINCE as province_name,
	46	+ <if test="year != null and year != ''">
	47	+ ODS_D_DIM_DATE.YEAR_1 as year,
	48	+ </if>
	49	+ COUNT(ODS_F_GRAVIDA_RECORD.RECORD_ID) as val
	50	+ FROM
	51	+ ODS_D_PROVINCE,
	52	+ ODS_D_DIM_DATE,
	53	+ ODS_F_GRAVIDA_RECORD,
	54	+ ODS_F_EXAMINE_HISTORY,
	55	+ ODS_D_HOSPITAL,
	56	+ ODS_D_CITY
	57	+ WHERE
	58	+ ( ODS_F_GRAVIDA_RECORD.RECORD_ID=ODS_F_EXAMINE_HISTORY.RECORD_ID(+) )
	59	+ AND ( ODS_F_GRAVIDA_RECORD.HOSPITAL_NO=ODS_D_HOSPITAL.HOSPITAL_NO )
	60	+ AND ( ODS_D_CITY.PROVINCE_ID=ODS_D_PROVINCE.PROVINCE_ID )
	61	+ AND ( ODS_F_GRAVIDA_RECORD.INSERT_DATE=ODS_D_DIM_DATE.DATE_1 )
	62	+ AND ( ODS_D_HOSPITAL.CITY_ID=ODS_D_CITY.CITY_ID(+) )
	63	+ AND
	64	+ (
	65	+ ODS_F_EXAMINE_HISTORY.EXAMINE_HISTORY_NUM = 1
	66	+ AND
	67	+ ODS_F_EXAMINE_HISTORY.HIGH_RISK_FACTOR NOT IN ( '健康','健康,无' )
	68	+ )
	69	+ <if test="year != null and year != ''">
	70	+ AND ODS_D_DIM_DATE.YEAR_1=${year}
	71	+ </if>
	72	+ GROUP BY
	73	+ ODS_D_PROVINCE.PROVINCE_ID,
	74	+ ODS_D_PROVINCE.PROVINCE
	75	+ <if test="year != null and year != ''">
	76	+ ,ODS_D_DIM_DATE.YEAR_1
	77	+ </if>
	78	+ </select>
	79	+
	80	+
	81	+</mapper>

	1	+这个就是每个省份每年的建档孕妇数
	2	+
	3	+SELECT
	4	+ ODS_D_PROVINCE.PROVINCE_ID as province_id,
	5	+ ODS_D_PROVINCE.PROVINCE as province_name,
	6	+ ODS_D_DIM_DATE.YEAR_1 as year,
	7	+ COUNT(ODS_F_GRAVIDA_RECORD.RECORD_ID) as val
	8	+FROM
	9	+ ODS_D_PROVINCE,
	10	+ ODS_D_DIM_DATE,
	11	+ ODS_F_GRAVIDA_RECORD,
	12	+ ODS_D_HOSPITAL,
	13	+ ODS_D_CITY
	14	+WHERE
	15	+ ( ODS_F_GRAVIDA_RECORD.HOSPITAL_NO=ODS_D_HOSPITAL.HOSPITAL_NO )
	16	+ AND ( ODS_D_CITY.PROVINCE_ID=ODS_D_PROVINCE.PROVINCE_ID )
	17	+ AND ( ODS_F_GRAVIDA_RECORD.INSERT_DATE=ODS_D_DIM_DATE.DATE_1 )
	18	+ AND ( ODS_D_HOSPITAL.CITY_ID=ODS_D_CITY.CITY_ID(+) )
	19	+ AND ODS_D_DIM_DATE.YEAR_1=2016
	20	+GROUP BY
	21	+ ODS_D_PROVINCE.PROVINCE_ID,
	22	+ ODS_D_PROVINCE.PROVINCE,
	23	+ ODS_D_DIM_DATE.YEAR_1
	24	+
	25	+ ---------------------------------------------------
	26	+ 这个就是每个省份每年的高危孕妇数
	27	+
	28	+ SELECT
	29	+ ODS_D_PROVINCE.PROVINCE_ID as province_id,
	30	+ ODS_D_PROVINCE.PROVINCE as province_name,
	31	+ ODS_D_DIM_DATE.YEAR_1 as year,
	32	+ COUNT(ODS_F_GRAVIDA_RECORD.RECORD_ID) as val
	33	+ FROM
	34	+ ODS_D_PROVINCE,
	35	+ ODS_D_DIM_DATE,
	36	+ ODS_F_GRAVIDA_RECORD,
	37	+ ODS_F_EXAMINE_HISTORY,
	38	+ ODS_D_HOSPITAL,
	39	+ ODS_D_CITY
	40	+ WHERE
	41	+ ( ODS_F_GRAVIDA_RECORD.RECORD_ID=ODS_F_EXAMINE_HISTORY.RECORD_ID(+) )
	42	+ AND ( ODS_F_GRAVIDA_RECORD.HOSPITAL_NO=ODS_D_HOSPITAL.HOSPITAL_NO )
	43	+ AND ( ODS_D_CITY.PROVINCE_ID=ODS_D_PROVINCE.PROVINCE_ID )
	44	+ AND ( ODS_F_GRAVIDA_RECORD.INSERT_DATE=ODS_D_DIM_DATE.DATE_1 )
	45	+ AND ( ODS_D_HOSPITAL.CITY_ID=ODS_D_CITY.CITY_ID(+) )
	46	+ AND
	47	+ (
	48	+ ODS_F_EXAMINE_HISTORY.EXAMINE_HISTORY_NUM = 1
	49	+ AND
	50	+ ODS_F_EXAMINE_HISTORY.HIGH_RISK_FACTOR NOT IN ( '健康','健康,无' )
	51	+ )
	52	+ AND ODS_D_DIM_DATE.YEAR_1=2016
	53	+ GROUP BY
	54	+ ODS_D_PROVINCE.PROVINCE_ID,
	55	+ ODS_D_PROVINCE.PROVINCE,
	56	+ ODS_D_DIM_DATE.YEAR_1

...	...	@@ -15,4 +15,9 @@
15	15	mysql.db.password=platform123
16	16	mysql.driver=com.mysql.jdbc.Driver
17	17	mysql.jdbcurl=jdbc:mysql://192.168.5.250:3306/platform?autoReconnect=true&useUnicode=true&characterEncoding=UTF-8
	18	+
	19	+
	20	+report.db.jdbcurl=jdbc:oracle:thin:@192.168.1.32:1521:orcl
	21	+report.db.username=LYMS_ODS
	22	+report.db.password=Welcome1

...	...	@@ -32,4 +32,8 @@
32	32
33	33	login.typeId=2
34	34	login.token=265a841b-9bb5-434a-8c2b-e78df86fc45d
	35	+
	36	+report.db.jdbcurl=jdbc:oracle:thin:@192.168.1.32:1521:orcl
	37	+report.db.username=LYMS_ODS
	38	+report.db.password=Welcome1

...	...	@@ -23,4 +23,9 @@
23	23	mysql.initialpoolsize=2
24	24	mysql.minpoolsize=2
25	25	redis.servers=localhost:6379
	26	+
	27	+
	28	+report.db.jdbcurl=jdbc:oracle:thin:@192.168.1.32:1521:orcl
	29	+report.db.username=LYMS_ODS
	30	+report.db.password=Welcome1

...	...	@@ -25,6 +25,7 @@
25	25	<!---->
26	26	<module>platform-job-index</module>
27	27	<module>platform-report-api</module>
	28	+ <module>platform-reportData</module>
28	29	</modules>
29	30
30	31	<properties>