去除dao下jpa多余目录

src/main/java/com/yihu/quota/dao/jpa/RsResourceQuotaDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa;
package com.yihu.quota.dao;
import com.yihu.quota.model.jpa.RsResourceQuota;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/TjQuotaDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa;
package com.yihu.quota.dao;
import com.yihu.quota.model.jpa.TjQuota;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/TjQuotaGovProvisionDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa;
package com.yihu.quota.dao;
import com.yihu.quota.model.jpa.TjQuotaGovProvision;
import org.springframework.data.jpa.repository.Query;

src/main/java/com/yihu/quota/dao/jpa/TjQuotaLogDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa;
package com.yihu.quota.dao;
import com.yihu.quota.model.jpa.TjQuotaLog;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dict/SystemDictDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dict;
package com.yihu.quota.dao.dict;
import com.yihu.quota.model.jpa.dict.SystemDict;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dict/SystemDictListDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dict;
package com.yihu.quota.dao.dict;
import com.yihu.quota.model.jpa.dict.SystemDictList;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dimension/TjDimensionMainDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dimension;
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.jpa.dimension.TjDimensionMain;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dimension/TjDimensionSlaveDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dimension;
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.jpa.dimension.TjDimensionSlave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dimension/TjQuotaDimensionMainDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dimension;
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/dimension/TjQuotaDimensionSlaveDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.dimension;
package com.yihu.quota.dao.dimension;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/save/TjDataSaveDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.save;
package com.yihu.quota.dao.save;
import com.yihu.quota.model.jpa.save.TjDataSave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/save/TjQuotaDataSaveDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.save;
package com.yihu.quota.dao.save;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/source/TjDataSourceDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.source;
package com.yihu.quota.dao.source;
import com.yihu.quota.model.jpa.source.TjDataSource;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/dao/jpa/source/TjQuotaDataSourceDao.java

@@ -1,4 +1,4 @@
package com.yihu.quota.dao.jpa.source;
package com.yihu.quota.dao.source;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;

src/main/java/com/yihu/quota/etl/extract/solr/SolrExtract.java

@@ -5,7 +5,7 @@ import com.yihu.ehr.elasticsearch.ElasticSearchUtil;
import com.yihu.ehr.query.common.model.SolrGroupEntity;
import com.yihu.ehr.query.services.SolrQuery;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.quota.dao.jpa.save.TjQuotaDataSaveDao;
import com.yihu.quota.dao.save.TjQuotaDataSaveDao;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.ExtractConverUtil;
import com.yihu.quota.etl.extract.ExtractUtil;

src/main/java/com/yihu/quota/job/EsQuotaJob.java

@@ -1,7 +1,7 @@
package com.yihu.quota.job;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.quota.dao.jpa.TjQuotaLogDao;
import com.yihu.quota.dao.TjQuotaLogDao;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.extract.ExtractHelper;
import com.yihu.quota.etl.extract.solr.SolrExtract;

src/main/java/com/yihu/quota/job/EsQuotaPercentJob.java

@@ -1,6 +1,6 @@
package com.yihu.quota.job;
import com.yihu.quota.dao.jpa.TjQuotaLogDao;
import com.yihu.quota.dao.TjQuotaLogDao;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.extract.ExtractHelper;
import com.yihu.quota.etl.extract.ExtractPercentHelper;

src/main/java/com/yihu/quota/service/dict/DictService.java

@@ -1,7 +1,7 @@
package com.yihu.quota.service.dict;
import com.yihu.quota.dao.jpa.dict.SystemDictDao;
import com.yihu.quota.dao.jpa.dict.SystemDictListDao;
import com.yihu.quota.dao.dict.SystemDictDao;
import com.yihu.quota.dao.dict.SystemDictListDao;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

src/main/java/com/yihu/quota/service/job/JobService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.job;
import com.yihu.quota.dao.jpa.TjQuotaDao;
import com.yihu.quota.dao.TjQuotaDao;
import com.yihu.quota.etl.extract.es.EsResultExtract;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.util.QuartzHelper;

src/main/java/com/yihu/quota/service/quota/BaseStatistsService.java

@@ -2,8 +2,8 @@ package com.yihu.quota.service.quota;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.quota.dao.jpa.TjQuotaDao;
import com.yihu.quota.dao.jpa.TjQuotaGovProvisionDao;
import com.yihu.quota.dao.TjQuotaDao;
import com.yihu.quota.dao.TjQuotaGovProvisionDao;
import com.yihu.quota.etl.extract.es.EsResultExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.util.ElasticsearchUtil;

src/main/java/com/yihu/quota/service/quota/QuotaService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.quota;
import com.yihu.quota.dao.jpa.TjQuotaDao;
import com.yihu.quota.dao.TjQuotaDao;
import com.yihu.quota.etl.extract.es.EsResultExtract;
import com.yihu.quota.model.jpa.TjQuota;
import org.apache.commons.lang.StringUtils;

src/main/java/com/yihu/quota/service/resource/ResourceQuotaService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.resource;
import com.yihu.quota.dao.jpa.RsResourceQuotaDao;
import com.yihu.quota.dao.RsResourceQuotaDao;
import com.yihu.quota.model.jpa.RsResourceQuota;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

src/main/java/com/yihu/quota/service/source/TjDataSourceService.java

@@ -1,7 +1,7 @@
package com.yihu.quota.service.source;
import com.yihu.quota.dao.jpa.source.TjDataSourceDao;
import com.yihu.quota.dao.jpa.source.TjQuotaDataSourceDao;
import com.yihu.quota.dao.source.TjDataSourceDao;
import com.yihu.quota.dao.source.TjQuotaDataSourceDao;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;