调整格式

readme.MD

@@ -1,10 +1,10 @@
## 包结构
- config:配置
- controller:控制器
- dao.jpa：dao层
- dao：dao层
- etl:etl相关
- job：执行的job
- model.jpa：数据库的映射
- model：数据库的映射
- service:服务层
- util：工具类
- vo：modelvo

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

@@ -13,7 +13,8 @@ import java.util.List;
import java.util.Map;
/**
 * Created by janseny on 2018/5/9.
 * @author janseny
 * @date 2018/5/9
 * 维度的key值转换器
 */
@Component
@@ -24,7 +25,8 @@ public class ConvertHelper {
    /**
     * 维度的key清洗到对应的slaveKey中
     * @param filterModel     过滤之后的model
     *
     * @param filterModel           过滤之后的model
     * @param tjQuotaDimensionSlave 维度
     * @return
     * @throws Exception

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

@@ -7,10 +7,10 @@ import com.yihu.quota.etl.extract.ExtractHelper;
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.TjQuotaLog;
import com.yihu.quota.model.source.TjQuotaDataSource;
import com.yihu.quota.service.source.TjDataSourceService;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;

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

@@ -6,7 +6,6 @@ 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.util.ElasticsearchUtil;
import com.yihu.quota.model.TjQuota;
import com.yihu.quota.model.dimension.TjQuotaDimensionMain;
import com.yihu.quota.model.dimension.TjQuotaDimensionSlave;
@@ -14,11 +13,12 @@ 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;
import com.yihu.quota.service.save.TjDataSaveService;
import com.yihu.quota.service.special.singledisease.SingleDiseaseService;
import com.yihu.quota.service.source.TjDataSourceService;
import com.yihu.quota.service.special.org.OrgHealthCategoryStatisticsService;
import com.yihu.quota.service.special.singledisease.SingleDiseaseService;
import com.yihu.quota.util.BasesicUtil;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.vo.DictModel;
import com.yihu.quota.vo.SaveModel;
import net.sf.json.JSONObject;
@@ -121,7 +121,7 @@ public class BaseStatistsService {
            if (tjQuota.getResultGetType().equals("2")) {//二次统计
                TjQuotaDataSource quotaDataSorce = dataSourceService.findSourceByQuotaCode(quotaCode);
                if (quotaDataSorce != null) {
                    JSONObject obj = new JSONObject().fromObject(quotaDataSorce.getConfigJson());
                    JSONObject obj = JSONObject.fromObject(quotaDataSorce.getConfigJson());
                    EsConfig esConfig = (EsConfig) JSONObject.toBean(obj, EsConfig.class);
                    if (StringUtils.isNotEmpty(esConfig.getSuperiorBaseQuotaCode()) && StringUtils.isEmpty(esConfig.getEspecialType())) {
                        code = esConfig.getSuperiorBaseQuotaCode();

src/main/java/com/yihu/quota/util/SpringUtil.java

@@ -5,6 +5,9 @@ import org.springframework.context.ApplicationContext;
import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
/**
 * @author administartor
 */
@Component
public class SpringUtil implements ApplicationContextAware {
@@ -30,9 +33,7 @@ public class SpringUtil implements ApplicationContextAware {
    //通过name获取 Bean.
    public static Object
    getBean(String name) {
    public static Object getBean(String name) {
        return getApplicationContext().getBean(name);