Merge branch 'dev' of chenweida/patient-co-management into dev

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/etl/extract/db/Data2Save.java

@@ -13,7 +13,6 @@ import org.springframework.jdbc.core.BeanPropertyRowMapper;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import java.lang.reflect.InvocationTargetException;
import java.util.*;
/**
@@ -77,6 +76,7 @@ public class Data2Save {
            }
            savelist.add(saveModel);
        }
        //如果有维度的数据就设置维度的数据
        if (dimensionQuotas!=null && dimensionQuotas.size()>0){
            //如果有维度就设置维度的数据
            for (int i = 0; i < dimensionQuotas.size(); i++) {
@@ -91,10 +91,8 @@ public class Data2Save {
    private List<SaveModel> setSlaveKey(int savleKeyNum, List<SaveModel> savelist, List<DictModel> dictModels,Map<String, DataModel> dataModelMap,int dimensize) {
        List<SaveModel> newSavelist = new ArrayList<>();
//        savelist.stream().forEach(one -> {
        for(SaveModel one:savelist) {
            for(DictModel dict:dictModels){
//            dictModels.stream().forEach(dict -> {
            SaveModel newSaveModel = new SaveModel();
            BeanUtils.copyProperties(one, newSaveModel);
            try {
@@ -117,8 +115,6 @@ public class Data2Save {
            } catch (Exception e) {
                e.printStackTrace();
            }
//            });
//        });
        }
        }
        return newSavelist;

patient-co/patient-co-statistics-es/src/main/java/com/yihu/wlyy/statistics/job/business/EsToEsQuotaJob.java

@@ -64,11 +64,7 @@ public class EsToEsQuotaJob implements Job {
    @Autowired
    private QuartzJobLogDao quartzJobLogDao;//执行日志Dao
    @Autowired
    private WlyyDimensionQuotaDao dimensionQuotaDao;
    @Autowired
    private QuartzJobConfigDao quartzJobConfigDao;
    @Autowired
    private JdbcTemplate jdbcTemplate;
    @Autowired
    private ElasticFactory elasticFactory;
@@ -153,17 +149,6 @@ public class EsToEsQuotaJob implements Job {
            deleteData(quotaDate, wlyyJobCongId, timeLevel);
            // 1..抽取数据 如果是累加就是 List<DataModel>  如果是相除 Map<String,List<DataModel>>
            List<DataModel> dataModels = extract();
//            //扩展 有维度的统计
//
            //兼容旧代码，封装
//            FilterModel filterModel = new FilterModel(dataModels,new ArrayList<ErrModel>());
//            //得到该指标的维度
//            List<WlyyDimensionQuota> dimensionQuotas = dimensionQuotaDao.findDimensionQuotasByQuotaCode(wlyyJobCongId);
//            //2.1.从维度的key转换
//            if (dimensionQuotas != null && dimensionQuotas.size() > 0) {
//                filterModel = convert(filterModel, dimensionQuotas);
//            }
            // 2 DataModel 转SaveModel即可
            List<SaveModel> saveModels = data2Save.data2save(dataModels,quartzJobConfig,quotaDate,timeLevel);
            // 3.保存数据