调整格式

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

@@ -17,9 +17,9 @@ import java.util.List;
/**
 * Created by janseny on 2018/5/23.
 */
public class LargDataWithRunnable implements Runnable {
public class LargeDataWithRunnable implements Runnable {
    private Logger logger = LoggerFactory.getLogger(LargDataWithRunnable.class);
    private Logger logger = LoggerFactory.getLogger(LargeDataWithRunnable.class);
    private EsClientUtil esClientUtil;
    private String jsonConfig;
    private List<SaveModel> list;//待处理数据
@@ -29,7 +29,7 @@ public class LargDataWithRunnable implements Runnable {
    private int totalCount = 0;//待处理数据总数量
    private int havedCount = 0;//已经处理的数据量
    public LargDataWithRunnable(List<SaveModel> saveModels, String jsonConfig, EsClientUtil esClientUtil) {
    public LargeDataWithRunnable(List<SaveModel> saveModels, String jsonConfig, EsClientUtil esClientUtil) {
        this.list = saveModels;
        int count = saveModels.size() / perCount;
        int remainder = saveModels.size() % perCount;

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

@@ -20,19 +20,20 @@ import java.util.List;
@Scope("prototype")
public class SaveHelper {
    @Autowired
    private TjDataSaveService datsSaveService;
    private TjDataSaveService dataSaveService;
    public Boolean save(List<SaveModel> dataModels, QuotaVo quotaVo) {
        //查看指标保存的数据源
        TjQuotaDataSave quotaDataSave = datsSaveService.findByQuota(quotaVo.getCode());
        TjQuotaDataSave quotaDataSave = dataSaveService.findByQuota(quotaVo.getCode());
        switch (quotaDataSave.getType()) {
            case Contant.save.mysql: {
                return null;
            }
            case Contant.save.es: {
                return SpringUtil.getBean(ElastricSearchSave.class).save(dataModels, quotaDataSave.getConfigJson());
//                return SpringUtil.getBean(ElastricSearchSave.class).saveByMoreThred(dataModels,quotaDataSave.getConfigJson());
            }
            default:
                break;
        }
        return false;
    }

src/main/java/com/yihu/quota/etl/save/es/ElastricSearchSave.java

@@ -2,7 +2,7 @@ package com.yihu.quota.etl.save.es;
import com.yihu.quota.etl.Contant;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.LargDataWithRunnable;
import com.yihu.quota.etl.save.LargeDataWithRunnable;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.vo.SaveModel;
import io.searchbox.client.JestClient;
@@ -58,7 +58,7 @@ public class ElastricSearchSave {
                    }
                    logger.info("data save 这是第" + (i + 1) + "个线程；数据 = " + start + " - " + end);
                    List<SaveModel> list = saveModels.subList(start, end);
                    LargDataWithRunnable dataWithRunnable = new LargDataWithRunnable(list, jsonConfig, esClientUtil);
                    LargeDataWithRunnable dataWithRunnable = new LargeDataWithRunnable(list, jsonConfig, esClientUtil);
                    Thread thread = new Thread(dataWithRunnable);
                    thread.start();
                }

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

@@ -90,7 +90,7 @@ public class EsQuotaJob implements Job {
            if (quotaDataSource == null) {
                throw new Exception("数据源配置错误");
            }
            JSONObject obj = new JSONObject().fromObject(quotaDataSource.getConfigJson());
            JSONObject obj = JSONObject.fromObject(quotaDataSource.getConfigJson());
            EsConfig esConfig = (EsConfig) JSONObject.toBean(obj, EsConfig.class);
            //查询是否已经统计过,如果已统计 先删除后保存
            deleteRecord(quotaVo);
@@ -150,6 +150,7 @@ public class EsQuotaJob implements Job {
                        quotaVof.setRows(perCount);
                    }
                    Thread th = new Thread(new Thread() {
                        @Override
                        public synchronized void run() {
                            logger.warn("启动第 " + (f + 1) + " 个线程。 ");//只能访问外部的final变量。
                            quota(quotaLogf, quotaVof);
@@ -221,6 +222,12 @@ public class EsQuotaJob implements Job {
        }
    }
    @Transactional
    TjQuotaLog saveLog(TjQuotaLog tjQuotaLog) {
        TjQuotaLog log = tjQuotaLogDao.save(tjQuotaLog);
        return log;
    }
    private void deleteRecord(QuotaVo quotaVo) throws Exception {
        EsConfig esConfig = extractHelper.getEsConfig(quotaVo.getCode());
        EsConfig sourceEsConfig = extractHelper.getDataSourceEsConfig(quotaVo.getCode());
@@ -308,12 +315,6 @@ public class EsQuotaJob implements Job {
        }
    }
    @Transactional
    private TjQuotaLog saveLog(TjQuotaLog tjQuotaLog) {
        TjQuotaLog log = tjQuotaLogDao.save(tjQuotaLog);
        return log;
    }
    /**
     * 保存数据
     *

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

@@ -6,9 +6,9 @@ import com.yihu.quota.etl.extract.ExtractHelper;
import com.yihu.quota.etl.extract.ExtractPercentHelper;
import com.yihu.quota.etl.model.EsConfig;
import com.yihu.quota.etl.save.SaveHelper;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.util.ElasticsearchUtil;
import com.yihu.quota.util.EsClientUtil;
import com.yihu.quota.model.TjQuotaLog;
import com.yihu.quota.util.SpringUtil;
import com.yihu.quota.vo.QuotaVo;
import com.yihu.quota.vo.SaveModel;
@@ -34,11 +34,13 @@ import java.util.Date;
import java.util.List;
/**
 * Created by janseny on 2017/8/22.
 * @author janseny
 * @date 2017/8/22
 * DisallowConcurrentExecution 防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
 */
@Component
@Scope("prototype")
@DisallowConcurrentExecution//防止到了执行时间点前一任务还在执行中，但是这时有空闲的线程，那么马上又会执行，这样一来就会存在同一job被并行执行
@DisallowConcurrentExecution
public class EsQuotaPercentJob implements Job {
    @Autowired
    ElasticsearchUtil elasticsearchUtil;

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

@@ -1,47 +0,0 @@
package com.yihu.quota.model.rest;
import java.io.Serializable;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2018/1/16.
 */
public class HospitalComposeModel implements Serializable {
    private String x1;
    private String x2;
    private String name;
    private List<Map<String, Object>> children;
    public String getX1() {
        return x1;
    }
    public void setX1(String x1) {
        this.x1 = x1;
    }
    public String getX2() {
        return x2;
    }
    public void setX2(String x2) {
        this.x2 = x2;
    }
    public String getName() {
        return name;
    }
    public void setName(String name) {
        this.name = name;
    }
    public List<Map<String, Object>> getChildren() {
        return children;
    }
    public void setChildren(List<Map<String, Object>> children) {
        this.children = children;
    }
}

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

@@ -1,30 +0,0 @@
package com.yihu.quota.model.rest;
import com.yihu.quota.model.TjQuota;
import java.util.List;
/**
 * Created by janseny on 2017/6/30.
 */
public class QuotaReport {
    private TjQuota tjQuota;
    private List<ResultModel> reultModelList;
    public TjQuota getTjQuota() {
        return tjQuota;
    }
    public void setTjQuota(TjQuota tjQuota) {
        this.tjQuota = tjQuota;
    }
    public List<ResultModel> getReultModelList() {
        return reultModelList;
    }
    public void setReultModelList(List<ResultModel> reultModelList) {
        this.reultModelList = reultModelList;
    }
}

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

@@ -1,39 +0,0 @@
package com.yihu.quota.model.rest;
import com.yihu.quota.model.TjQuota;
import java.util.List;
import java.util.Map;
/**
 * Created by Administrator on 2017/12/19.
 */
public class QuotaTreeModel {
    private TjQuota tjQuota;
    private List<Map<String, Object>> mapList;
    private List<TjQuota> childern;
    public TjQuota getTjQuota() {
        return tjQuota;
    }
    public void setTjQuota(TjQuota tjQuota) {
        this.tjQuota = tjQuota;
    }
    public List<Map<String, Object>> getMapList() {
        return mapList;
    }
    public void setMapList(List<Map<String, Object>> mapList) {
        this.mapList = mapList;
    }
    public List<TjQuota> getChildern() {
        return childern;
    }
    public void setChildern(List<TjQuota> childern) {
        this.childern = childern;
    }
}

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

@@ -3,11 +3,15 @@ package com.yihu.quota.model.rest;
import java.util.List;
/**
 * Created by janseny on 2017/7/2.
 * @author janseny
 * @date 2017/7/2
 */
public class ResultModel {
    private List<String> cloumns;//维度对应的字典项名称 如：维度为org时 值为 余干县人民医院 ：维度为town时 值为 余干县
    /**
     * 维度对应的字典项名称 如：维度为org时 值为 余干县人民医院 ：维度为town时 值为 余干县
     */
    private List<String> cloumns;
    private Object value;
    public List<String> getCloumns() {