Merge branch 'dev' of yeshijie/wlyy2.0 into dev

common/common-entity/src/main/java/com/yihu/jw/entity/job/QuartzJobConfig.java

@@ -134,6 +134,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.del = del;
	}
	@Column(name = "sql")
	public String getSql() {
		return sql;
	}
@@ -142,6 +143,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.sql = sql;
	}
	@Column(name = "sql_count")
	public String getSqlCount() {
		return sqlCount;
	}
@@ -150,6 +152,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.sqlCount = sqlCount;
	}
	@Column(name = "sql_day")
	public String getSqlDay() {
		return sqlDay;
	}
@@ -158,6 +161,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.sqlDay = sqlDay;
	}
	@Column(name = "sql_year")
	public String getSqlYear() {
		return sqlYear;
	}
@@ -166,6 +170,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.sqlYear = sqlYear;
	}
	@Column(name = "cache_key")
	public String getCacheKey() {
		return cacheKey;
	}
@@ -174,6 +179,7 @@ public class QuartzJobConfig implements java.io.Serializable {
		this.cacheKey = cacheKey;
	}
	@Column(name = "extract_type")
	public String getExtractType() {
		return extractType;
	}

svr/svr-statistics-es/doc/sql/初始统计数据.txt

@@ -0,0 +1,14 @@
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f6fd9c0001', NULL, 'quota_org_type', '28', '4', '', '1', NULL, '2021-06-10 16:08:18.076', '123', NULL, '2021-06-10 16:08:18.076', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f729170002', NULL, 'quota_org_type', '29', '4', '', '2', NULL, '2021-06-10 16:08:29.207', '123', NULL, '2021-06-10 16:08:29.207', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f754fc0003', NULL, 'quota_org_type', '30', '4', '', '3', NULL, '2021-06-10 16:08:40.444', '123', NULL, '2021-06-10 16:08:40.444', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f7ab640004', NULL, 'quota_org_type', '31', '3', '', '4', NULL, '2021-06-10 16:09:02.564', '123', NULL, '2021-06-10 16:09:02.564', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f7d0ec0005', NULL, 'quota_org_type', '32', '3', '', '5', NULL, '2021-06-10 16:09:12.172', '123', NULL, '2021-06-10 16:09:12.172', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f7f09e0006', NULL, 'quota_org_type', '33', '3', '', '6', NULL, '2021-06-10 16:09:20.286', '123', NULL, '2021-06-10 16:09:20.286', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f837f30007', NULL, 'quota_org_type', '34', '4', '', '7', NULL, '2021-06-10 16:09:38.547', '123', NULL, '2021-06-10 16:09:38.547', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f856d40008', NULL, 'quota_org_type', '35', '4', '', '8', NULL, '2021-06-10 16:09:46.452', '123', NULL, '2021-06-10 16:09:46.452', '123', NULL, '', '统计机构类型');
INSERT INTO `base`.`wlyy_hospital_sys_dict` (`id`, `saas_id`, `dict_name`, `dict_code`, `dict_value`, `py_code`, `sort`, `hospital`, `create_time`, `create_user`, `create_user_name`, `update_time`, `update_user`, `update_user_name`, `img_url`, `model_name`) VALUES ('808080eb79f4d23c0179f4f884be0009', NULL, 'quota_org_type', '36', '4', '', '9', NULL, '2021-06-10 16:09:58.205', '123', NULL, '2021-06-10 16:09:58.205', '123', NULL, '', '统计机构类型');

svr/svr-statistics-es/pom.xml

@@ -308,23 +308,11 @@
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-actuator-docs</artifactId>
        </dependency>
        <!--<dependency>-->
        <!--<groupId>org.springframework.boot</groupId>-->
        <!--<artifactId>spring-boot-devtools</artifactId>-->
        <!--<version>${version.spring-boot}</version>-->
        <!--</dependency>-->
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-actuator</artifactId>
        </dependency>
        <dependency>
            <groupId>org.springframework.boot</groupId>
            <artifactId>spring-boot-starter-aop</artifactId>
@@ -418,37 +406,88 @@
        <!--<artifactId>spring-boot-starter-data-elasticsearch</artifactId>-->
        <!--<version>1.3.5.RELEASE</version>-->
        <!--</dependency>-->
        <!--oracle驱动-->
        <dependency>
            <groupId>com.oracle</groupId>
            <artifactId>ojdbc6</artifactId>
            <version>11.2.0.3</version>
        </dependency>
    </dependencies>
    <build>
        <finalName>svr-statistics-es</finalName>
        <plugins>
            <!--打成war包需要的配置-->
            <plugin>
                <groupId>org.springframework.boot</groupId>
                <artifactId>spring-boot-maven-plugin</artifactId>
            </plugin>
            <plugin>
                <artifactId>maven-war-plugin</artifactId>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <failOnMissingWebXml>false</failOnMissingWebXml>
                    <archive>
                        <!-- 生成的jar中，不要包含pom.xml和pom.properties这两个文件 -->
                        <addMavenDescriptor>false</addMavenDescriptor>
                        <manifest>
                            <!-- 是否要把第三方jar加入到类构建路径 -->
                            <addClasspath>true</addClasspath>
                            <!-- 外部依赖jar包的最终位置 -->
                            <classpathPrefix>lib/</classpathPrefix>
                            <mainClass>com.yihu.wlyy.Application</mainClass>
                        </manifest>
                    </archive>
                </configuration>
            </plugin>
            <!--拷贝依赖到jar外面的lib目录-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-compiler-plugin</artifactId>
                <artifactId>maven-dependency-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-lib</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-dependencies</goal>
                        </goals>
                        <configuration>
                            <!-- 依赖包输出目录，将来不打进jar包里 -->
                            <outputDirectory>${project.build.directory}/lib</outputDirectory>
                            <excludeTransitive>false</excludeTransitive>
                            <stripVersion>false</stripVersion>
                            <includeScope>runtime</includeScope>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
            <!--指定配置文件，将resources打成外部resource-->
            <plugin>
                <groupId>org.apache.maven.plugins</groupId>
                <artifactId>maven-jar-plugin</artifactId>
                <configuration>
                    <source>1.8</source>
                    <target>1.8</target>
                    <archive>
                        <!-- 指定配置文件目录，这样jar运行时会去找到同目录下的resources文件夹下查找 -->
                        <manifestEntries>
                            <Class-Path>resources/</Class-Path>
                        </manifestEntries>
                    </archive>
                    <!-- 打包时忽略的文件（也就是不打进jar包里的文件） -->
                    <excludes>
                        <exclude>**/*.yml</exclude>
                        <exclude>**/*.xml</exclude>
                    </excludes>
                </configuration>
                <version>3.1</version>
            </plugin>
            <!-- 拷贝资源文件 外面的resource目录-->
            <plugin>
                <artifactId>maven-resources-plugin</artifactId>
                <executions>
                    <execution>
                        <id>copy-dependencies</id>
                        <phase>package</phase>
                        <goals>
                            <goal>copy-resources</goal>
                        </goals>
                        <configuration>
                            <!-- 资源文件输出目录 -->
                            <outputDirectory>${project.build.directory}/resources</outputDirectory>
                            <resources>
                                <resource>
                                    <directory>src/main/resources</directory>
                                </resource>
                            </resources>
                        </configuration>
                    </execution>
                </executions>
            </plugin>
        </plugins>
    </build>

svr/svr-statistics-es/src/main/java/com/yihu/jw/Application.java

@@ -1,4 +1,4 @@
package com.yihu.jw;
package com.yihu.wlyy;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/AsyncConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config;
package com.yihu.wlyy.statistics.config;
import java.util.concurrent.Executor;
import org.apache.tomcat.util.threads.ThreadPoolExecutor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/DataSourceConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config;
package com.yihu.wlyy.statistics.config;
import com.alibaba.druid.filter.stat.StatFilter;
import com.alibaba.druid.pool.DruidDataSource;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/MVCConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config;
package com.yihu.wlyy.statistics.config;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.databind.ObjectMapper;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/SwaggerConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config;
package com.yihu.wlyy.statistics.config;
import org.springframework.context.annotation.Bean;
import org.springframework.context.annotation.Configuration;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/WebSecurityConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config;
package com.yihu.wlyy.statistics.config;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/jpa/HibernateProperties.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config.jpa;
package com.yihu.wlyy.statistics.config.jpa;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Component;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/jpa/WlyyJpa.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config.jpa;
package com.yihu.wlyy.statistics.config.jpa;
import org.springframework.beans.factory.annotation.Autowired;
@@ -24,7 +24,7 @@ import javax.sql.DataSource;
@EnableJpaRepositories(
        entityManagerFactoryRef = "wlyyEntityManagerFactory",
        transactionManagerRef = "wlyyTransactionManager",
        basePackages = {"com.yihu.jw.statistics.dao"})   //设置Repository所在位置
        basePackages = {"com.yihu.wlyy.statistics.dao"})   //设置Repository所在位置
public class WlyyJpa {
    @Autowired
@@ -37,7 +37,7 @@ public class WlyyJpa {
        LocalContainerEntityManagerFactoryBean emfb = new LocalContainerEntityManagerFactoryBean();
        emfb.setDataSource(dataSource);
        emfb.setPackagesToScan("com.yihu.jw");
        emfb.setPackagesToScan("com.yihu");
        emfb.setPersistenceUnitName("wlyy");
        JpaVendorAdapter vendorAdapter = new HibernateJpaVendorAdapter();
        emfb.setJpaVendorAdapter(vendorAdapter);

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/quartz/JobFactory.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config.quartz;
package com.yihu.wlyy.statistics.config.quartz;
import org.quartz.spi.TriggerFiredBundle;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/quartz/SchedulerConfig.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.config.quartz;
package com.yihu.wlyy.statistics.config.quartz;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/config/war/ServletInitializer.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.config.war;
package com.yihu.wlyy.statistics.config.war;
import com.yihu.jw.Application;
import com.yihu.wlyy.Application;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/controller/BaseController.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.controller;
package com.yihu.wlyy.statistics.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.jw.entity.iot.gateway.IdEntity;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/controller/ExtractDataController.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.controller;
package com.yihu.wlyy.statistics.controller;
import com.yihu.jw.statistics.service.ExtractDataService;
import com.yihu.wlyy.statistics.service.ExtractDataService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/controller/JobController.java

@@ -1,7 +1,7 @@
package com.yihu.jw.statistics.controller;
package com.yihu.wlyy.statistics.controller;
import com.yihu.jw.statistics.service.JobService;
import com.yihu.jw.statistics.util.hibernate.HibenateDemo;
import com.yihu.wlyy.statistics.service.JobService;
import com.yihu.wlyy.statistics.util.hibernate.HibenateDemo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/controller/QueryController.java

@@ -1,10 +1,10 @@
package com.yihu.jw.statistics.controller;
package com.yihu.wlyy.statistics.controller;
import com.yihu.jw.statistics.etl.cache.Cache;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.util.ElasticsearchUtil;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.ElasticsearchUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import io.swagger.annotations.Api;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/JobConfigDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobConfig;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/QuartzJobConfigDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobConfig;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/QuartzJobLogDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.job.QuartzJobLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/QuotaDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.quota.WlyyQuota;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/WlyyDimensionQuotaDao.java

@@ -1,7 +1,7 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/dao/WlyyQuotaResultDao.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.dao;
package com.yihu.wlyy.statistics.dao;
import com.yihu.jw.entity.quota.WlyyQuotaResult;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/cache/Cache.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.etl.cache;
package com.yihu.wlyy.statistics.etl.cache;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.DataModel;
import java.util.HashMap;
import java.util.List;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/compute/ComputeHelper.java

@@ -1,8 +1,11 @@
package com.yihu.jw.statistics.etl.compute;
package com.yihu.wlyy.statistics.etl.compute;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.vo.*;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.BaseDoctorDO;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
@@ -22,6 +25,11 @@ public class ComputeHelper {
    @Autowired
    private JdbcTemplate jdbcTemplate;
    public String findOrgType(String wlyyJobCongId){
        String sql = "SELECT IFNULL(dict_value,'') from wlyy_hospital_sys_dict WHERE dict_name = 'quota_org_type' and dict_code = '"+wlyyJobCongId+"'";
        String orgType = jdbcTemplate.queryForObject(sql,String.class);
        return orgType;
    }
    /**
     * @param dataModels      过滤之后的数据
@@ -32,8 +40,10 @@ public class ComputeHelper {
     */
    public List<SaveModel> compute(List<DataModel> dataModels, List<BaseDimensionQuota> dimensionQuotas, String wlyyJobCongId, String endTime, String timeLevel) {
        try {
            //得到机构类型
            String orgType = findOrgType(wlyyJobCongId);
            //得到全部团队
            List<BaseDoctorDO> doctors = findAllDoctor();
            List<BaseDoctorDO> doctors = findAllDoctor(orgType);
            //计算数据 返回map key 根据团队和维度拼凑在map中的key   1-2-1  如果维度是长度是0返回团队id 1
            Map<String, List<DataModel>> computeMap = computeDataModel(dimensionQuotas, dataModels);
            //初始化map并且设置统计出来的数目
@@ -99,7 +109,7 @@ public class ComputeHelper {
     *
     * @return
     */
    private List<BaseDoctorDO> findAllDoctor() {
    private List<BaseDoctorDO> findAllDoctor(String orgType) {
        String sql = "SELECT " +
                "bd.id AS code , " +
                "bd.name ," +
@@ -117,15 +127,14 @@ public class ComputeHelper {
                " WHERE bdh.doctor_code = bd.id  " +
                "AND hd.code= bdh.dept_code " +
                "AND o.code = bdh.org_code " +
                "AND bdh.del=1 AND hd.CONSULT_DEPT_FLAG='1' AND bd.job_title_code IN('1201','1301','1401','1101','066','067','061','1310','061','065','1','2','3','4')";
                "AND bdh.del=1 and o.code not in('fxty')";
        if(StringUtils.isNotBlank(orgType)){
            sql += " and o.type = '"+orgType+"'";
        }
        List<BaseDoctorDO> doctorDOS = jdbcTemplate.query(sql, new BeanPropertyRowMapper(BaseDoctorDO.class));
        return doctorDOS;
    }
    public static void main(String[] args) {
        System.out.println("3502060200".substring(0, 8));
    }
    /**
     * 初始化map
     */
@@ -137,34 +146,30 @@ public class ComputeHelper {
        for (int i = 0; i < doctors.size(); i++) {
            BaseDoctorDO one = doctors.get(i);
            //排除测试机构
            if (one.getOrgCode().length() >= 11) {
                SaveModel saveModel = new SaveModel();
                saveModel.setCity("350200");
                saveModel.setCityName("厦门市");
                saveModel.setTown(one.getTownCode());
                saveModel.setTownName(one.getTownName());
                //把末尾不是00的机构转换成00
                String orgCode = one.getOrgCode();
                saveModel.setHospital(orgCode);
                saveModel.setHospitalName(one.getOrgName());
                saveModel.setDoctor(one.getCode());
                saveModel.setDoctorName(one.getName());
                saveModel.setDept(one.getDeptCode());
                saveModel.setDeptName(one.getDeptName());
                saveModel.setQuotaCode(wlyyJobCongId);
                saveModel.setCreateTime(new Date());
                saveModel.setTimeLevel(timeLevel);
                saveModel.setAreaLevel("6");//医生
                saveModel.setQuotaDate(DateUtil.strToDate(endTime, "yyyy-MM-dd"));
                lastMaps.put(one.getCode(), saveModel);
            }
            SaveModel saveModel = new SaveModel();
            saveModel.setCity("330100");
            saveModel.setCityName("杭州市");
            saveModel.setTown(one.getTownCode());
            saveModel.setTownName(one.getTownName());
            String orgCode = one.getOrgCode();
            saveModel.setHospital(orgCode);
            saveModel.setHospitalName(one.getOrgName());
            saveModel.setDoctor(one.getCode());
            saveModel.setDoctorName(one.getName());
            saveModel.setDept(one.getDeptCode());
            saveModel.setDeptName(one.getDeptName());
            saveModel.setQuotaCode(wlyyJobCongId);
            saveModel.setCreateTime(new Date());
            saveModel.setTimeLevel(timeLevel);
            saveModel.setAreaLevel("6");//医生
            saveModel.setQuotaDate(DateUtil.strToDate(endTime, "yyyy-MM-dd"));
            lastMaps.put(one.getCode(), saveModel);
        }
        //根据维度初始化数据
            for (int i = 0; i < dimensionQuotas.size(); i++) {
                Map<String, SaveModel> mapTemp = new HashMap<>();
                BaseDimensionQuota dimensionQuota = dimensionQuotas.get(i);
//                List<DictModel> dictModels = jdbcTemplate.query(dimensionQuota.getDictSql(), new BeanPropertyRowMapper(DictModel.class));
                List<Map<String, Object>> listMap = jdbcTemplate.queryForList(dimensionQuota.getDictSql());
                for (Map.Entry<String, SaveModel> oneSaveModel : lastMaps.entrySet()) {
                    for (int j = 0; j < listMap.size(); j++) {
@@ -185,29 +190,6 @@ public class ComputeHelper {
            }
            lastMaps = mapTemp;
        }
//        for (int i = 0; i < dimensionQuotas.size(); i++) {
//            Map<String, SaveModel> mapTemp = new HashMap<>();
//            BaseDimensionQuota dimensionQuota = dimensionQuotas.get(i);
//            List<DictModel> dictModels = jdbcTemplate.query(dimensionQuota.getDictSql(), new BeanPropertyRowMapper(DictModel.class));
//            for (Map.Entry<String, SaveModel> oneSaveModel : lastMaps.entrySet()) {
//                for (int j = 0; j < dictModels.size(); j++) {
//                    SaveModel saveModelTemp = new SaveModel();
//                    DictModel dictModel = dictModels.get(j);
//
//                    BeanUtils.copyProperties(oneSaveModel.getValue(), saveModelTemp);
//                    SaveModel.class.getMethod("setSlaveKey" + (i + 1) + "Name", String.class).invoke(saveModelTemp, dictModel.getName());
//                    SaveModel.class.getMethod("setSlaveKey" + (i + 1), String.class).invoke(saveModelTemp, dictModel.getCode());
//                    //根据维度生成新的key
//                    StringBuffer strKey = new StringBuffer(oneSaveModel.getKey() + "-" + dictModel.getCode());
//                    mapTemp.put(strKey.toString(), saveModelTemp);
//                }
//            }
//            //如果字典长度是0 抛出异常
//            if (dictModels.size() == 0) {
//                throw new Exception("dict size:0,sql:" + dimensionQuota.getDictSql());
//            }
//            lastMaps = mapTemp;
//        }
        //设置值
        for (Map.Entry<String, SaveModel> one : lastMaps.entrySet()) {

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/Convert.java

@@ -1,9 +1,9 @@
package com.yihu.jw.statistics.etl.convert;
package com.yihu.wlyy.statistics.etl.convert;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.List;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/ConvertHelper.java

@@ -1,8 +1,10 @@
package com.yihu.jw.statistics.etl.convert;
package com.yihu.wlyy.statistics.etl.convert;
import com.yihu.jw.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.jw.statistics.vo.*;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.JdbcTemplate;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/ConsultTypeConvert.java

@@ -1,9 +1,9 @@
package com.yihu.jw.statistics.etl.convert.wlyy;
package com.yihu.wlyy.statistics.etl.convert.wlyy;
import com.yihu.jw.statistics.etl.convert.Convert;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.etl.convert.Convert;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.ArrayList;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/HealthLable.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.etl.convert.wlyy.model;
package com.yihu.wlyy.statistics.etl.convert.wlyy.model;
/**
 * Created by chenweida on 2017/7/1.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/PrescriptionDisease.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.etl.convert.wlyy.model;
package com.yihu.wlyy.statistics.etl.convert.wlyy.model;
/**
 * Created by zhangdan on 2017/10/26.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/ServerType.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.etl.convert.wlyy.model;
package com.yihu.wlyy.statistics.etl.convert.wlyy.model;
/**
 * Created by chenweida on 2017/10/18.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/extract/ExtractHelper.java

@@ -1,10 +1,10 @@
package com.yihu.jw.statistics.etl.extract;
package com.yihu.wlyy.statistics.etl.extract;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.statistics.etl.extract.db.DBExtract;
import com.yihu.jw.statistics.etl.extract.db.ESExtract;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.etl.extract.db.DBExtract;
import com.yihu.wlyy.statistics.etl.extract.db.ESExtract;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.DataModel;
import org.apache.commons.collections.map.HashedMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/extract/db/DBExtract.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.util.SpringUtil;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/extract/db/DBPageExtract.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.statistics.util.hibernate.HibenateUtils;
import com.yihu.wlyy.statistics.util.hibernate.HibenateUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
import org.springframework.jdbc.core.JdbcTemplate;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/extract/db/Data2Save.java

@@ -1,9 +1,9 @@
package com.yihu.jw.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.jw.statistics.vo.*;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.vo.*;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/extract/db/ESExtract.java

@@ -1,11 +1,11 @@
package com.yihu.jw.statistics.etl.extract.db;
package com.yihu.wlyy.statistics.etl.extract.db;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.jw.statistics.util.ElasticsearchUtil;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.util.ElasticsearchUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Scope;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/filter/FilterHelper.java

@@ -1,8 +1,8 @@
package com.yihu.jw.statistics.etl.filter;
package com.yihu.wlyy.statistics.etl.filter;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.jw.statistics.vo.ErrModel;
import com.yihu.jw.statistics.vo.FilterModel;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.ErrModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;
import org.springframework.util.StringUtils;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/filter/filter/NotNullFilter.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.etl.filter.filter;
package com.yihu.wlyy.statistics.etl.filter.filter;
import com.yihu.jw.statistics.vo.FilterModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.context.annotation.Scope;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/save/SaveHelper.java

@@ -1,8 +1,8 @@
package com.yihu.jw.statistics.etl.save;
package com.yihu.wlyy.statistics.etl.save;
import com.yihu.jw.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.context.annotation.Scope;
import org.springframework.stereotype.Component;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/save/es/ElasticFactory.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.etl.save.es;
package com.yihu.wlyy.statistics.etl.save.es;
import io.searchbox.client.JestClient;
import io.searchbox.client.JestClientFactory;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/etl/save/es/ElastricSearchSave.java

@@ -1,7 +1,7 @@
package com.yihu.jw.statistics.etl.save.es;
package com.yihu.wlyy.statistics.etl.save.es;
import com.alibaba.fastjson.JSONObject;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.Bulk;
import io.searchbox.core.BulkResult;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/job/business/CacheCleanJob.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import org.quartz.Job;
import org.quartz.JobExecutionContext;
import org.quartz.JobExecutionException;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/job/business/CurrentMysqlToEsQuotaJob.java

@@ -1,24 +1,24 @@
package com.yihu.jw.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.statistics.dao.QuartzJobConfigDao;
import com.yihu.jw.statistics.dao.QuartzJobLogDao;
import com.yihu.jw.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.jw.statistics.etl.cache.Cache;
import com.yihu.jw.statistics.etl.compute.ComputeHelper;
import com.yihu.jw.statistics.etl.convert.ConvertHelper;
import com.yihu.jw.statistics.etl.extract.ExtractHelper;
import com.yihu.jw.statistics.etl.extract.db.Data2Save;
import com.yihu.jw.statistics.etl.filter.FilterHelper;
import com.yihu.jw.statistics.etl.save.SaveHelper;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.jw.statistics.vo.FilterModel;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.etl.compute.ComputeHelper;
import com.yihu.wlyy.statistics.etl.convert.ConvertHelper;
import com.yihu.wlyy.statistics.etl.extract.ExtractHelper;
import com.yihu.wlyy.statistics.etl.extract.db.Data2Save;
import com.yihu.wlyy.statistics.etl.filter.FilterHelper;
import com.yihu.wlyy.statistics.etl.save.SaveHelper;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.Search;
import io.searchbox.core.SearchResult;
@@ -80,7 +80,7 @@ public class CurrentMysqlToEsQuotaJob implements Job {
    private Data2Save data2Save;
    private String incrementInterval;//增量的时间间隔（天）
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try {
@@ -89,7 +89,9 @@ public class CurrentMysqlToEsQuotaJob implements Job {
            //初始化参数
            initParams(context);
            //统计指标
            computequota();
            if(Integer.valueOf(wlyyJobCongId)>27){
                computequota();
            }
        } catch (Exception e) {
            //如果出錯立即重新執行
            JobExecutionException e2 = new JobExecutionException(e);
@@ -134,7 +136,6 @@ public class CurrentMysqlToEsQuotaJob implements Job {
        } else {
            //增量
            if (StringUtils.isEmpty(startTime)) {
//                startTime = new LocalDate(new DateTime().minusDays(2)).toString("yyyy-MM-dd") + " 17:00:00"; //2017-06-01 17:00:00
                getStartTime();
            } else {
                startTime = startTime + " 23:59:59";
@@ -183,7 +184,6 @@ public class CurrentMysqlToEsQuotaJob implements Job {
        }
        this.quotaDate = DateUtil.strToDate(endTime, "yyyy-MM-dd");
        one.setStartTime(startTime);
        one.setEndTime(endTime);
        logger.info("========================quotaCode:" + one.getQuotaId() + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + ",timeLevel:" + timeLevel + " start========================");
@@ -199,7 +199,6 @@ public class CurrentMysqlToEsQuotaJob implements Job {
        tjQuotaLog.setJobType(success ? "1" : "0");
        tjQuotaLog.setJobEndTime(new Date());
        //tjQuotaLog.setJobContent(JSONArray.fromObject(filterModel.getErrorModels()).toString());
        saveLog(tjQuotaLog);
        logger.info("========================quotaCode:" +  one.getQuotaId() + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + " end========================");
@@ -420,36 +419,15 @@ public class CurrentMysqlToEsQuotaJob implements Job {
        }
    }
    public static void main(String[] args) {
        SimpleDateFormat s=new SimpleDateFormat("");
        System.out.println(s.format(new Date()));
    }
//    public void getStartTime() throws Exception{
//        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
//        if("1".equals(this.incrementInterval)){//日
//            startTime = new LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd") + " 17:00:00";
//        }else if("2".equals(this.incrementInterval)){//周
//            Date monday = DateUtil.getMondayOfThisDayToDate(sf.parse(endTime));
////            startTime =sf.format(monday)+ " 17:00:00";
//            startTime =DateUtil.getNextDay(monday,-1)+ " 17:00:00";
//        }else if("3".equals(this.incrementInterval)){//月
//            Date fristDay = DateUtil.getFristDayOfMonthToDate(sf.parse(endTime));
////            startTime = sf.format(fristDay)+ " 17:00:00";
//            startTime =DateUtil.getNextDay(fristDay,-1)+ " 17:00:00";
//        }
//    }
    public void getStartTime() throws Exception{
        SimpleDateFormat sf = new SimpleDateFormat("yyyy-MM-dd");
        if("1".equals(this.incrementInterval)){//日
            startTime = new LocalDate(new DateTime().minusDays(1)).toString("yyyy-MM-dd") + " 23:59:59";
        }else if("2".equals(this.incrementInterval)){//周
            Date monday = DateUtil.getMondayOfThisDayToDate(sf.parse(endTime));
    //            startTime =sf.format(monday)+ " 17:00:00";
            startTime =DateUtil.getNextDay(monday,-1)+ " 23:59:59";
        }else if("3".equals(this.incrementInterval)){//月
            Date fristDay = DateUtil.getFristDayOfMonthToDate(sf.parse(endTime));
    //            startTime = sf.format(fristDay)+ " 17:00:00";
            startTime =DateUtil.getNextDay(fristDay,-1)+ " 23:59:59";
        }
    }

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/job/business/EsToEsQuotaJob.java

@@ -1,22 +1,22 @@
package com.yihu.jw.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.statistics.dao.QuartzJobConfigDao;
import com.yihu.jw.statistics.dao.QuartzJobLogDao;
import com.yihu.jw.statistics.etl.compute.ComputeHelper;
import com.yihu.jw.statistics.etl.convert.ConvertHelper;
import com.yihu.jw.statistics.etl.extract.ExtractHelper;
import com.yihu.jw.statistics.etl.extract.db.Data2Save;
import com.yihu.jw.statistics.etl.filter.FilterHelper;
import com.yihu.jw.statistics.etl.save.SaveHelper;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.jw.statistics.vo.FilterModel;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.etl.compute.ComputeHelper;
import com.yihu.wlyy.statistics.etl.convert.ConvertHelper;
import com.yihu.wlyy.statistics.etl.extract.ExtractHelper;
import com.yihu.wlyy.statistics.etl.extract.db.Data2Save;
import com.yihu.wlyy.statistics.etl.filter.FilterHelper;
import com.yihu.wlyy.statistics.etl.save.SaveHelper;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import org.elasticsearch.index.query.BoolQueryBuilder;
@@ -71,6 +71,7 @@ public class EsToEsQuotaJob implements Job {
    @Autowired
    private Data2Save data2Save;
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try {
@@ -79,7 +80,9 @@ public class EsToEsQuotaJob implements Job {
            //初始化参数
            initParams(context);
            //统计指标
            computequota();
            if(Integer.valueOf(wlyyJobCongId)>27){
                computequota();
            }
        } catch (Exception e) {
            //如果出錯立即重新執行
            JobExecutionException e2 = new JobExecutionException(e);
@@ -122,7 +125,6 @@ public class EsToEsQuotaJob implements Job {
            }
        }
        this.quotaDate = DateUtil.strToDate(endTime, "yyyy-MM-dd");
        this.wlyyJobCongId = map.getString("jobConfig");
        this.quartzJobConfig = quartzJobConfigDao.findById(wlyyJobCongId);
@@ -152,7 +154,6 @@ public class EsToEsQuotaJob implements Job {
            tjQuotaLog.setJobType(success ? "1" : "0");
            tjQuotaLog.setJobEndTime(new Date());
            //tjQuotaLog.setJobContent(JSONArray.fromObject(filterModel.getErrorModels()).toString());
            saveLog(tjQuotaLog);
            logger.info("========================quotaCode:" + wlyyJobCongId + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + " end========================");
        } catch (Exception e) {

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/job/business/MysqlToEsQuotaJob.java

@@ -1,24 +1,24 @@
package com.yihu.jw.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.entity.job.QuartzJobLog;
import com.yihu.jw.statistics.dao.QuartzJobConfigDao;
import com.yihu.jw.statistics.dao.QuartzJobLogDao;
import com.yihu.jw.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.jw.statistics.etl.cache.Cache;
import com.yihu.jw.statistics.etl.compute.ComputeHelper;
import com.yihu.jw.statistics.etl.convert.ConvertHelper;
import com.yihu.jw.statistics.etl.extract.ExtractHelper;
import com.yihu.jw.statistics.etl.filter.FilterHelper;
import com.yihu.jw.statistics.etl.save.SaveHelper;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.util.SpringUtil;
import com.yihu.jw.statistics.vo.BaseDimensionQuota;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.jw.statistics.vo.FilterModel;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.dao.QuartzJobLogDao;
import com.yihu.wlyy.statistics.dao.WlyyDimensionQuotaDao;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.etl.compute.ComputeHelper;
import com.yihu.wlyy.statistics.etl.convert.ConvertHelper;
import com.yihu.wlyy.statistics.etl.extract.ExtractHelper;
import com.yihu.wlyy.statistics.etl.filter.FilterHelper;
import com.yihu.wlyy.statistics.etl.save.SaveHelper;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.SpringUtil;
import com.yihu.wlyy.statistics.vo.BaseDimensionQuota;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.FilterModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import net.sf.json.JSONArray;
@@ -75,6 +75,7 @@ public class MysqlToEsQuotaJob implements Job {
    @Value("${es.index}")
    private String esIndex;
    @Override
    public void execute(JobExecutionContext context)
            throws JobExecutionException {
        try {
@@ -83,7 +84,9 @@ public class MysqlToEsQuotaJob implements Job {
            //初始化参数
            initParams(context);
            //统计指标
            computequota();
            if(Integer.valueOf(wlyyJobCongId)>27){
                computequota();
            }
        } catch (Exception e) {
            //如果出錯立即重新執行
            JobExecutionException e2 = new JobExecutionException(e);
@@ -128,7 +131,6 @@ public class MysqlToEsQuotaJob implements Job {
        } else {
            //增量
            if (StringUtils.isEmpty(startTime)) {
//                startTime = new LocalDate(new DateTime().minusDays(2)).toString("yyyy-MM-dd") + " 17:00:00"; //2017-06-01 17:00:00
                getStartTime();
            } else {
                startTime = startTime + " 23:59:59";
@@ -152,8 +154,6 @@ public class MysqlToEsQuotaJob implements Job {
            // 0 删除这天的数据
            deleteData(quotaDate, wlyyJobCongId, timeLevel);
            //1..抽取数据 如果是累加就是 List<DataModel>  如果是相除 Map<String,List<DataModel>>
        /*    if (quotaDate.equals(DateUtil.strToDate("2018-12-16", "yyyy-MM-dd"))){
*/
            List<DataModel> dataModels = extract();
            //2..根据规则过滤数据
            FilterModel filterModel = filter(dataModels);
@@ -173,7 +173,7 @@ public class MysqlToEsQuotaJob implements Job {
            tjQuotaLog.setJobContent(JSONArray.fromObject(filterModel.getErrorModels()).toString());
            saveLog(tjQuotaLog);
            logger.info("========================quotaCode:" + wlyyJobCongId + "," + DateUtil.dateToStr(quotaDate, "yyyy-MM-dd") + " end========================");
    /*        }*/
        } catch (Exception e) {
            e.printStackTrace();
        }
@@ -340,11 +340,9 @@ public class MysqlToEsQuotaJob implements Job {
            startTime = new LocalDate(new DateTime().minusDays(2)).toString("yyyy-MM-dd") + " 23:59:59";
        }else if("2".equals(this.incrementInterval)){//周
            Date monday = DateUtil.getMondayOfThisDayToDate(sf.parse(endTime));
//            startTime =sf.format(monday)+ " 17:00:00";
            startTime =DateUtil.getNextDay(monday,-1)+ " 23:59:59";
        }else if("3".equals(this.incrementInterval)){//月
            Date fristDay = DateUtil.getFristDayOfMonthToDate(sf.parse(endTime));
//            startTime = sf.format(fristDay)+ " 17:00:00";
            startTime =DateUtil.getNextDay(fristDay,-1)+ " 23:59:59";
        }
    }

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/job/business/ScheduleStatictisJob.java

@@ -1,8 +1,8 @@
package com.yihu.jw.statistics.job.business;
package com.yihu.wlyy.statistics.job.business;
import com.yihu.jw.statistics.service.JobService;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.service.JobService;
import com.yihu.wlyy.statistics.util.DateUtil;
import org.quartz.DisallowConcurrentExecution;
import org.quartz.Job;
import org.quartz.JobExecutionContext;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/service/ElasticsearchService.java

@@ -1,7 +1,7 @@
package com.yihu.jw.statistics.service;
package com.yihu.wlyy.statistics.service;
import com.yihu.jw.statistics.util.ElasticsearchUtil;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.util.ElasticsearchUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/service/ExtractDataService.java

@@ -1,10 +1,10 @@
package com.yihu.jw.statistics.service;
package com.yihu.wlyy.statistics.service;
import com.yihu.jw.entity.quota.WlyyQuotaResult;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.etl.save.es.ElastricSearchSave;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.vo.SaveModel;
import io.searchbox.client.JestClient;
import io.searchbox.core.*;
import org.elasticsearch.index.query.BoolQueryBuilder;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/service/JobService.java

@@ -1,12 +1,12 @@
package com.yihu.jw.statistics.service;
package com.yihu.wlyy.statistics.service;
import com.yihu.jw.entity.job.QuartzJobConfig;
import com.yihu.jw.statistics.dao.QuartzJobConfigDao;
import com.yihu.jw.statistics.etl.cache.Cache;
import com.yihu.jw.statistics.job.business.CacheCleanJob;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.jw.statistics.util.QuartzHelper;
import com.yihu.jw.statistics.vo.WlyyJobConfigVO;
import com.yihu.wlyy.statistics.dao.QuartzJobConfigDao;
import com.yihu.wlyy.statistics.etl.cache.Cache;
import com.yihu.wlyy.statistics.job.business.CacheCleanJob;
import com.yihu.wlyy.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.QuartzHelper;
import com.yihu.wlyy.statistics.vo.WlyyJobConfigVO;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/task/PushMsgTask.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.task;
package com.yihu.wlyy.statistics.task;
import com.yihu.jw.statistics.util.ImUtill;
import com.yihu.wlyy.statistics.util.ImUtill;
import net.sf.json.JSONArray;
import net.sf.json.JSONObject;
import org.slf4j.Logger;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/Contant.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
/**
 * Created by chenweida on 2017/6/1.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/DateUtil.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import org.apache.commons.lang3.StringUtils;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/ElasticsearchUtil.java

@@ -1,11 +1,11 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import com.alibaba.druid.sql.ast.SQLExpr;
import com.alibaba.druid.sql.ast.expr.SQLQueryExpr;
import com.alibaba.druid.sql.parser.SQLExprParser;
import com.yihu.jw.statistics.etl.save.es.ElasticFactory;
import com.yihu.jw.statistics.vo.DataModel;
import com.yihu.jw.statistics.vo.SaveModel;
import com.yihu.wlyy.statistics.etl.save.es.ElasticFactory;
import com.yihu.wlyy.statistics.vo.DataModel;
import com.yihu.wlyy.statistics.vo.SaveModel;
import org.elasticsearch.action.search.SearchResponse;
import org.elasticsearch.client.Client;
import org.nlpcn.es4sql.domain.Select;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/HttpClientUtil.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import org.apache.http.HttpEntity;
import org.apache.http.NameValuePair;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/IdCardUtil.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import java.text.SimpleDateFormat;
import java.util.Calendar;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/ImUtill.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import org.json.JSONObject;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/JsonDateValueProcessor.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import net.sf.json.JsonConfig;
import net.sf.json.processors.JsonValueProcessor;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/MD5.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import java.security.MessageDigest;
import java.security.NoSuchAlgorithmException;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/QuartzHelper.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import org.quartz.*;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/SpringUtil.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util;
package com.yihu.wlyy.statistics.util;
import org.springframework.beans.BeansException;
import org.springframework.context.ApplicationContext;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/hibernate/HibenateDemo.java

@@ -1,6 +1,6 @@
package com.yihu.jw.statistics.util.hibernate;
package com.yihu.wlyy.statistics.util.hibernate;
import com.yihu.jw.statistics.util.DateUtil;
import com.yihu.wlyy.statistics.util.DateUtil;
import org.apache.commons.collections.map.HashedMap;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/util/hibernate/HibenateUtils.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.util.hibernate;
package com.yihu.wlyy.statistics.util.hibernate;
import org.hibernate.SQLQuery;
import org.hibernate.Session;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/BaseDimension.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import com.yihu.jw.entity.iot.gateway.IdEntity;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/BaseDimensionQuota.java

@@ -1,8 +1,9 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import com.yihu.jw.entity.iot.gateway.IdEntity;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Table;
@@ -20,6 +21,7 @@ public class BaseDimensionQuota extends IdEntity {
    private String convertClazz;
    private String key;
    @Column(name = "quota_code")
    public String getQuotaCode() {
        return quotaCode;
    }
@@ -28,6 +30,7 @@ public class BaseDimensionQuota extends IdEntity {
        this.quotaCode = quotaCode;
    }
    @Column(name = "dimension_code")
    public String getDimensionCode() {
        return dimensionCode;
    }
@@ -36,6 +39,7 @@ public class BaseDimensionQuota extends IdEntity {
        this.dimensionCode = dimensionCode;
    }
    @Column(name = "dict_sql")
    public String getDictSql() {
        return dictSql;
    }
@@ -44,6 +48,7 @@ public class BaseDimensionQuota extends IdEntity {
        this.dictSql = dictSql;
    }
    @Column(name = "sort")
    public Integer getSort() {
        return sort;
    }
@@ -52,6 +57,7 @@ public class BaseDimensionQuota extends IdEntity {
        this.sort = sort;
    }
    @Column(name = "convert_clazz")
    public String getConvertClazz() {
        return convertClazz;
    }
@@ -60,6 +66,7 @@ public class BaseDimensionQuota extends IdEntity {
        this.convertClazz = convertClazz;
    }
    @Column(name = "key")
    public String getKey() {
        return key;
    }

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/BaseDoctorDO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import com.yihu.jw.entity.UuidIdentityEntity;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/DataModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import org.springframework.util.StringUtils;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/DictModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
/**
 * Created by chenweida on 2017/6/1.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/ErrModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
/**
 * Created by chenweida on 2017/6/1.

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/FilterModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import java.util.ArrayList;
import java.util.List;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/JobLogModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import java.util.ArrayList;
import java.util.List;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/SaveModel.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.fasterxml.jackson.annotation.JsonFormat;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/WlyyJobConfigVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import java.io.Serializable;

svr/svr-statistics-es/src/main/java/com/yihu/jw/statistics/vo/WlyyQuotaVO.java

@@ -1,4 +1,4 @@
package com.yihu.jw.statistics.vo;
package com.yihu.wlyy.statistics.vo;
import java.io.Serializable;
import java.util.Date;

svr/svr-statistics-es/src/main/resources/application-devtest.yml

@@ -1,69 +0,0 @@
spring:
  profiles: devtest
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg@jkzl2019
    primaryRead:
      url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg@jkzl2019
    im: #im库
      url: jdbc:mysql://172.26.0.104/base?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
      username: ssgg
      password: ssgg@jkzl2019
#    primaryReadWrite:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    primaryRead:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    im: #im库
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
fv:
  jdbc:
    driver: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.17.110.160/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 2 # 1需要密码，0不需要密码
  index: hlw_quota_test
  type: hlw_quota_test
  host:  http://172.26.0.112:9200
  tHost: 172.26.0.112:9300
  clusterName: jkzl
  securityUser: elastic:changeme
wlyy:
  im:
    databaseName: im_new
quartz:
  name: schedulerFactoryBean_cwd
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

svr/svr-statistics-es/src/main/resources/application-jwOracleProd.yml

@@ -1,75 +0,0 @@
spring:
  profiles: jwOracleProd
  datasource:
    driverClassName: oracle.jdbc.driver.OracleDriver
    primaryReadWrite:
      url: jdbc:oracle:thin:@10.10.10.16:1521/rac
      username: HLWYY
      password: Xmykzxhlwyy963
    primaryRead:
      url: jdbc:oracle:thin:@10.10.10.16:1521/rac
      username: HLWYY
      password: Xmykzxhlwyy963
    im: #im库
      url: jdbc:oracle:thin:@10.10.10.16:1521/rac
      username: HLWYY
      password: Xmykzxhlwyy963
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.Oracle10gDialect
        show_sql: true
    database: oracle
#    primaryReadWrite:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    primaryRead:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    im: #im库
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
  redis:
    host: 192.168.33.198 # Redis server host.
    port: 6380 # Redis server port.
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
#fv:
#  jdbc:
#    driver: com.mysql.jdbc.Driver
#    url: jdbc:mysql://172.17.110.160/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://192.168.33.198:9200
  tHost: 192.168.33.198:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im_new
quartz:
  name: schedulerFactoryBean_cwd
hibernate:
  dialect: org.hibernate.dialect.Oracle10gDialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

svr/svr-statistics-es/src/main/resources/application-jwprod.yml

@@ -1,52 +0,0 @@
spring:
  profiles: jwprod
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
    primaryRead:
      url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
    im: #im库:
      url: jdbc:mysql://59.61.92.90:9409/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
  redis:
    host: 59.61.92.90 # Redis server host.
    port: 9206 # Redis server port.
    password: jkzlehr
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://59.61.92.90:9208
  tHost: 59.61.92.90:9209
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im
quartz:
  name: schedulerFactoryBean_es_prod
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

svr/svr-statistics-es/src/main/resources/application-orctest.yml

@@ -1,67 +0,0 @@
spring:
  profiles: orctest
  datasource:
    driver-class-name: oracle.jdbc.driver.OracleDriver
    url: jdbc:oracle:thin:@172.26.0.141:1521:helowin
    username: normal
    password: normal
  jpa:
    properties:
      hibernate:
        dialect: org.hibernate.dialect.Oracle10gDialect
        show_sql: true
    database: oracle
#    primaryReadWrite:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    primaryRead:
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
#    im: #im库
#      url: jdbc:mysql://172.19.103.77/wlyy_quota?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#      username: root
#      password: 123456
  redis:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
#fv:
#  jdbc:
#    driver: com.mysql.jdbc.Driver
#    url: jdbc:mysql://172.17.110.160/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
#    username: ssgg
#    password: ssgg
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_test
  type: hlw_quota_test
  host: http://172.26.0.55:9200
  tHost: 172.26.0.55:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im_new
quartz:
  name: schedulerFactoryBean_cwd
hibernate:
  dialect: org.hibernate.dialect.Oracle10gDialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

svr/svr-statistics-es/src/main/resources/application-test.yml

@@ -20,26 +20,15 @@ spring:
    host: 172.26.0.253 # Redis server host.
    port: 6379 # Redis server port.
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
fv:
  jdbc:
    driver: com.mysql.jdbc.Driver
    url: jdbc:mysql://172.17.110.160/fv?useUnicode=true&characterEncoding=utf-8&autoReconnect=true
    username: ssgg
    password: ssgg
systemConfig:
  msg_push_server: http://127.0.0.1:3000
  msg_push_server: http://127.:3000
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_test
  type: hlw_quota_test
  host: http://172.26.0.55:9000
  tHost: 172.26.0.55:9300
  host: http://172.26.0.112:9200
  tHost: 172.26.0.112:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
@@ -47,10 +36,10 @@ es:
wlyy:
  im:
    databaseName: im_new
    databaseName: im_internet_hospital
quartz:
  name: schedulerFactoryBean_cwd
  name: schedulerFactoryBean_care
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect

svr/svr-statistics-es/src/main/resources/application-tnJwprod.yml

@@ -1,52 +0,0 @@
spring:
  profiles: tnJwprod
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://10.9.1.247:3310/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
    primaryRead:
      url: jdbc:mysql://10.9.1.247:3310/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
    im: #im库:
      url: jdbc:mysql://10.9.1.247:3310/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: wlyy
      password: qY#j2n5O
  redis:
    host: 10.9.1.247 # Redis server host.
    port: 6380 # Redis server port.
    password: Kb6wKDQP1W4
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 0 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://10.9.1.247:9200
  tHost: 10.9.1.247:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im
quartz:
  name: schedulerFactoryBean_es_prod
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy

svr/svr-statistics-es/src/main/resources/application-xzprod.yml

@@ -1,53 +0,0 @@
spring:
  profiles: xzprod
  datasource:
    driverClassName: com.mysql.jdbc.Driver
    primaryReadWrite:
      url: jdbc:mysql://172.16.100.240:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: jkzl
      password: jkzl@2020
    primaryRead:
      url: jdbc:mysql://172.16.100.240:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: jkzl
      password: jkzl@2020
    im: #im库:
      url: jdbc:mysql://172.16.100.240:7306/base?useUnicode:true&characterEncoding=utf-8&autoReconnect=true&useSSL=false
      username: jkzl
      password: jkzl@2020
  redis:
    host: 172.16.100.240 # Redis server host.
    port: 6380 # Redis server port.
    password: q4YaQemf
  followupMessage:
    cron : 0 5 0 * * ?
    jobId : FOLLOWUP_PLAN_JOB
systemConfig:
  msg_push_server: http://127.0.0.1:3000
es:
  pwflag: 1 # 1需要密码，0不需要密码
  index: hlw_quota_prod
  type: hlw_quota_prod
  host:  http://172.16.100.240:9200
  tHost: 172.16.100.240:9300
  clusterName: jkzl
  securityUser: lion:jkzlehr
  user: lion
  password: jkzlehr
wlyy:
  im:
    databaseName: im
quartz:
  name: schedulerFactoryBean_es_prod
hibernate:
  dialect: org.hibernate.dialect.MySQL5Dialect
  show_sql: true
  ejb:
    naming_strategy: org.hibernate.cfg.ImprovedNamingStrategy