瀏覽代碼
Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev
svr/svr-statistics/src/main/java/com/yihu/wlyy/Application.java → svr/svr-statistics/src/main/java/com/yihu/jw/Application.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/AsyncConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/AsyncConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/DataSourceConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/DataSourceConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/MVCConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/MVCConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/SwaggerConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/SwaggerConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/WebSecurityConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/WebSecurityConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/jpa/HibernateProperties.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/jpa/HibernateProperties.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/jpa/WlyyJpa.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/jpa/WlyyJpa.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/quartz/JobFactory.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/quartz/JobFactory.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/quartz/SchedulerConfig.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/quartz/SchedulerConfig.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/config/war/ServletInitializer.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/config/war/ServletInitializer.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/controller/JobController.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/controller/JobController.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/controller/QueryController.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/controller/QueryController.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobConfigDao.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/dao/QuartzJobConfigDao.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/dao/QuartzJobLogDao.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/dao/QuartzJobLogDao.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/dao/QuartzQuotaDao.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/dao/QuartzQuotaDao.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/dao/WlyyDimensionQuotaDao.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/dao/WlyyDimensionQuotaDao.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/cache/Cache.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/cache/Cache.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/compute/ComputeHelper.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/compute/ComputeHelper.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/Convert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/Convert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/ConvertHelper.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/ConvertHelper.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/AgeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/AgeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/ConsultTimeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/ConsultTimeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DeviceTypeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/DeviceTypeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DiseaseAndAgeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/DiseaseAndAgeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DiseaseLableConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/DiseaseLableConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/DispensaryTypeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/DispensaryTypeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/HealthGuidanceConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/HealthGuidanceConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/HealthLableConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/HealthLableConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/PrescriptionDiseaseConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/PrescriptionDiseaseConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/PrescriptionPatientDiseaseConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/PrescriptionPatientDiseaseConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/PrescriptionStatusConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/PrescriptionStatusConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/ServerTypeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/ServerTypeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/SexConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/SexConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/SimpleConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/SimpleConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/UseDeviceTypeConvert.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/UseDeviceTypeConvert.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/model/HealthLable.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/HealthLable.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/model/PrescriptionDisease.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/PrescriptionDisease.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/convert/wlyy/model/ServerType.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/convert/wlyy/model/ServerType.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/ExtractHelper.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/extract/ExtractHelper.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/DBExtract.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/extract/db/DBExtract.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/DBPageExtract.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/extract/db/DBPageExtract.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/extract/db/Data2Save.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/ESExtract.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/extract/db/ESExtract.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/filter/FilterHelper.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/filter/FilterHelper.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/filter/filter/NotNullFilter.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/filter/filter/NotNullFilter.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/SaveHelper.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/save/SaveHelper.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/es/ElasticFactory.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/save/es/ElasticFactory.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/etl/save/es/ElastricSearchSave.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/etl/save/es/ElastricSearchSave.java
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CacheCleanJob.java → svr/svr-statistics/src/main/java/com/yihu/jw/statistics/job/business/CacheCleanJob.java
+ 17
- 17
svr/svr-statistics/src/main/java/com/yihu/wlyy/statistics/job/business/CurrentMysqlToEsQuotaJob.java
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||
|
||