去除model下的jpa目录

readme.MD

@@ -15,6 +15,6 @@ powerdesign:https://192.168.1.103:888/svn/outwindow/基础开发部/doc/i健康2
## 改造点说明
- dao下的jpa目录去除，我们只使用jpa的方式
- dao、model下的jpa目录去除，我们只使用jpa的方式
- util目录做了部分统一，未完全整理
- service和controller目录下新增special目录，表示特例（special case），将一些特殊的查询，如单病种等，

src/main/java/com/yihu/quota/controller/OlapDimensionController.java

@@ -3,14 +3,13 @@ package com.yihu.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.jpa.olap.OlapDimension;
import com.yihu.quota.model.jpa.olap.OlapDimensionMember;
import com.yihu.quota.model.olap.OlapDimension;
import com.yihu.quota.model.olap.OlapDimensionMember;
import com.yihu.quota.service.olap.OlapDimensionMemberService;
import com.yihu.quota.service.olap.OlapDimensionService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestMethod;

src/main/java/com/yihu/quota/controller/OlapDimensionMemberController.java

@@ -3,7 +3,7 @@ package com.yihu.quota.controller;
import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.jpa.olap.OlapDimensionMember;
import com.yihu.quota.model.olap.OlapDimensionMember;
import com.yihu.quota.service.olap.OlapDimensionMemberService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;

src/main/java/com/yihu/quota/controller/QuotaController.java

@@ -7,9 +7,9 @@ import com.yihu.ehr.solr.SolrUtil;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.model.rest.ResultModel;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.service.quota.QuotaService;

src/main/java/com/yihu/quota/controller/QuotaReportController.java

@@ -11,10 +11,10 @@ import com.yihu.ehr.model.resource.MChartInfoModel;
import com.yihu.ehr.model.resource.MRsResources;
import com.yihu.ehr.query.common.model.DataList;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.jpa.RsResourceQuota;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.RsResourceQuota;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;

src/main/java/com/yihu/quota/controller/QuotaReportStatisticsController.java

@@ -5,7 +5,7 @@ import com.yihu.ehr.constants.ApiVersion;
import com.yihu.ehr.constants.ServiceApi;
import com.yihu.ehr.model.dict.MapDict;
import com.yihu.ehr.util.rest.Envelop;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.service.quota.QuotaService;
import com.yihu.quota.util.BasesicUtil;
import com.yihu.quota.vo.SaveModel;

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

@@ -1,13 +1,12 @@
package com.yihu.quota.dao;
import com.yihu.quota.model.jpa.RsResourceQuota;
import com.yihu.quota.model.RsResourceQuota;
import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;
import org.springframework.data.repository.query.Param;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2017/12/19.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

src/main/java/com/yihu/quota/dao/olap/OlapDimensionDao.java

@@ -1,6 +1,6 @@
package com.yihu.quota.dao.olap;
import com.yihu.quota.model.jpa.olap.OlapDimension;
import com.yihu.quota.model.olap.OlapDimension;
import org.springframework.data.repository.PagingAndSortingRepository;
/**

src/main/java/com/yihu/quota/dao/olap/OlapDimensionMemberDao.java

@@ -1,6 +1,6 @@
package com.yihu.quota.dao.jpa.olap;
import com.yihu.quota.model.jpa.olap.OlapDimensionMember;
import com.yihu.quota.model.olap.OlapDimensionMember;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.PagingAndSortingRepository;

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

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

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

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

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

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

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

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

src/main/java/com/yihu/quota/etl/ExtractConverUtil.java

@@ -1,7 +1,7 @@
package com.yihu.quota.etl;
import com.yihu.quota.etl.convert.ConvertHelper;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.FilterModel;
import org.slf4j.Logger;

src/main/java/com/yihu/quota/etl/convert/AgeConvert.java

@@ -1,7 +1,7 @@
package com.yihu.quota.etl.convert;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.ArrayList;

src/main/java/com/yihu/quota/etl/convert/Convert.java

@@ -1,7 +1,7 @@
package com.yihu.quota.etl.convert;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import org.springframework.jdbc.core.JdbcTemplate;
import java.util.List;

src/main/java/com/yihu/quota/etl/convert/ConvertHelper.java

@@ -1,6 +1,6 @@
package com.yihu.quota.etl.convert;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.vo.FilterModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;

src/main/java/com/yihu/quota/etl/extract/ExtractHelper.java

@@ -4,11 +4,11 @@ import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.etl.extract.mysql.MysqlExtract;
import com.yihu.quota.etl.extract.solr.SolrExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.jpa.source.TjDataSource;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.model.source.TjDataSource;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.save.TjDataSaveService;

src/main/java/com/yihu/quota/etl/extract/ExtractPercentHelper.java

@@ -5,10 +5,10 @@ import com.yihu.quota.etl.extract.es.EsExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.quota.QuotaService;

src/main/java/com/yihu/quota/etl/extract/ExtractUtil.java

@@ -5,8 +5,8 @@ import com.yihu.ehr.query.services.SolrQuery;
import com.yihu.ehr.solr.SolrUtil;
import com.yihu.ehr.util.datetime.DateUtil;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.util.BasesicUtil;
import com.yihu.quota.vo.DictModel;
import com.yihu.quota.vo.OrgHealthCategoryShowModel;

src/main/java/com/yihu/quota/etl/extract/es/EsExtract.java

@@ -7,8 +7,8 @@ import com.yihu.quota.etl.extract.ExtractUtil;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.quota.BaseStatistsService;
import com.yihu.quota.vo.QuotaVo;

src/main/java/com/yihu/quota/etl/extract/es/EsResultExtract.java

@@ -5,9 +5,9 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import com.yihu.ehr.elasticsearch.ElasticSearchPool;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.save.TjDataSave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.save.TjDataSave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.service.save.TjDataSaveService;
import net.sf.json.JSONObject;
import org.apache.commons.lang.StringUtils;

src/main/java/com/yihu/quota/etl/extract/mysql/MysqlExtract.java

@@ -5,8 +5,8 @@ import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.ExtractConverUtil;
import com.yihu.quota.etl.extract.ExtractUtil;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.vo.FilterModel;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;

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

@@ -10,9 +10,9 @@ import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.ExtractConverUtil;
import com.yihu.quota.etl.extract.ExtractUtil;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.vo.FilterModel;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;

src/main/java/com/yihu/quota/etl/save/ExtractDataWithRunnable.java

@@ -2,7 +2,7 @@ package com.yihu.quota.etl.save;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.job.EsQuotaJob;
import com.yihu.quota.model.jpa.TjQuotaLog;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;
import org.slf4j.Logger;

src/main/java/com/yihu/quota/etl/save/SaveHelper.java

@@ -2,7 +2,7 @@ package com.yihu.quota.etl.save;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.save.es.ElastricSearchSave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.service.save.TjDataSaveService;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;

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

@@ -8,8 +8,8 @@ import com.yihu.quota.etl.extract.solr.SolrExtract;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.SaveHelper;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuotaLog;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.service.source.TjDataSourceService;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;

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

@@ -8,7 +8,7 @@ import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.SaveHelper;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.jpa.TjQuotaLog;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;

src/main/java/com/yihu/quota/model/jpa/RsResourceQuota.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa;
package com.yihu.quota.model;
import javax.persistence.*;
import java.util.List;

src/main/java/com/yihu/quota/model/jpa/TjQuota.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa;// default package
package com.yihu.quota.model;// default package
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/TjQuotaGovProvision.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa;
package com.yihu.quota.model;
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/TjQuotaLog.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa;
package com.yihu.quota.model;
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/dict/SystemDict.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dict;// default package
package com.yihu.quota.model.dict;// default package
import javax.persistence.*;

src/main/java/com/yihu/quota/model/jpa/dict/SystemDictList.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dict;// default package
package com.yihu.quota.model.dict;// default package
import javax.persistence.Column;
import javax.persistence.Entity;

src/main/java/com/yihu/quota/model/jpa/dimension/TjDimensionMain.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dimension;// default package
package com.yihu.quota.model.dimension;// default package
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/dimension/TjDimensionSlave.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dimension;// default package
package com.yihu.quota.model.dimension;// default package
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/dimension/TjQuotaDimensionMain.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dimension;// default package
package com.yihu.quota.model.dimension;// default package
import javax.persistence.*;

src/main/java/com/yihu/quota/model/jpa/dimension/TjQuotaDimensionSlave.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.dimension;// default package
package com.yihu.quota.model.dimension;// default package
import javax.persistence.*;

src/main/java/com/yihu/quota/model/jpa/olap/OlapDimension.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.olap;
package com.yihu.quota.model.olap;
import javax.persistence.*;

src/main/java/com/yihu/quota/model/jpa/olap/OlapDimensionMember.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.olap;
package com.yihu.quota.model.olap;
import javax.persistence.*;

src/main/java/com/yihu/quota/model/rest/QuotaReport.java

@@ -1,6 +1,6 @@
package com.yihu.quota.model.rest;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.TjQuota;
import java.util.List;

src/main/java/com/yihu/quota/model/rest/QuotaTreeModel.java

@@ -1,6 +1,6 @@
package com.yihu.quota.model.rest;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.TjQuota;
import java.util.List;
import java.util.Map;

src/main/java/com/yihu/quota/model/jpa/save/TjDataSave.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.save;// default package
package com.yihu.quota.model.save;// default package
import com.fasterxml.jackson.annotation.JsonFormat;

src/main/java/com/yihu/quota/model/jpa/save/TjQuotaDataSave.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.save;// default package
package com.yihu.quota.model.save;// default package
import javax.persistence.*;

src/main/java/com/yihu/quota/model/jpa/source/TjDataSource.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.source;// default package
package com.yihu.quota.model.source;// default package
import javax.persistence.*;
import java.util.Date;

src/main/java/com/yihu/quota/model/jpa/source/TjQuotaDataSource.java

@@ -1,4 +1,4 @@
package com.yihu.quota.model.jpa.source;// default package
package com.yihu.quota.model.source;// default package
import javax.persistence.*;

src/main/java/com/yihu/quota/service/dimension/TjDimensionMainService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.dimension;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;

src/main/java/com/yihu/quota/service/dimension/TjDimensionSlaveService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.dimension;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;

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

@@ -2,7 +2,7 @@ package com.yihu.quota.service.job;
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.model.TjQuota;
import com.yihu.quota.util.QuartzHelper;
import com.yihu.quota.vo.QuotaVo;
import org.quartz.ObjectAlreadyExistsException;

src/main/java/com/yihu/quota/service/olap/OlapDimensionMemberService.java

@@ -2,7 +2,7 @@ package com.yihu.quota.service.olap;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.jpa.olap.OlapDimensionMemberDao;
import com.yihu.quota.model.jpa.olap.OlapDimensionMember;
import com.yihu.quota.model.olap.OlapDimensionMember;
import org.springframework.stereotype.Service;
/**

src/main/java/com/yihu/quota/service/olap/OlapDimensionService.java

@@ -3,7 +3,7 @@ package com.yihu.quota.service.olap;
import com.yihu.ehr.query.BaseJpaService;
import com.yihu.quota.dao.olap.OlapDimensionDao;
import com.yihu.quota.dao.jpa.olap.OlapDimensionMemberDao;
import com.yihu.quota.model.jpa.olap.OlapDimension;
import com.yihu.quota.model.olap.OlapDimension;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

@@ -7,11 +7,11 @@ 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.util.ElasticsearchUtil;
import com.yihu.quota.model.jpa.TjQuota;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.jpa.source.TjQuotaDataSource;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.service.dimension.TjDimensionMainService;
import com.yihu.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;

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

@@ -2,7 +2,7 @@ package com.yihu.quota.service.quota;
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.model.TjQuota;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

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

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

src/main/java/com/yihu/quota/service/save/TjDataSaveService.java

@@ -1,6 +1,6 @@
package com.yihu.quota.service.save;
import com.yihu.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.quota.model.save.TjQuotaDataSave;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;

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

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