QuotaVO修改

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/extract/ExtractHelper.java

@@ -11,7 +11,7 @@ import com.yihu.jw.quota.service.dimension.TjDimensionSlaveService;
import com.yihu.jw.quota.service.source.TjDataSourceService;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.DictModel;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.SaveModel;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
@@ -47,7 +47,7 @@ public class ExtractHelper {
     * @return
     * @throws Exception
     */
    public List<SaveModel> extractData(QuotaVO quotaVO, String startTime, String endTime,String timeLevel,String saasid) throws Exception {
    public List<SaveModel> extractData(QuotaVo quotaVO, String startTime, String endTime, String timeLevel, String saasid) throws Exception {
        try {
            //得到该指标的数据来源
            TjQuotaDataSource quotaDataSource = dataSourceService.findSourceByQuotaCode(quotaVO.getCode());

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

@@ -11,7 +11,7 @@ import com.yihu.jw.quota.etl.save.es.ElasticFactory;
import com.yihu.jw.quota.model.jpa.dimension.TjQuotaDimensionMain;
import com.yihu.jw.quota.model.jpa.dimension.TjQuotaDimensionSlave;
import com.yihu.jw.quota.vo.DictModel;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.SaveModel;
import net.sf.json.JSONObject;
import org.elasticsearch.action.search.SearchResponse;
@@ -59,7 +59,7 @@ public class EsExtract {
    private String endTime;
    private String timeLevel;
    private String saasid;
    private QuotaVO quotaVO;
    private QuotaVo quotaVO;
    private EsConfig esConfig;
@@ -69,7 +69,7 @@ public class EsExtract {
                                   String endTime, //结束时间
                                   String timeLevel, //时间维度  1日,2 周, 3 月,4 年
                                   String saasid,//saasid
                                   QuotaVO quotaVO,//指标code
                                   QuotaVo quotaVO,//指标code
                                   EsConfig esConfig //es配置
    ) {
        this.startTime = startTime;

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/save/SaveHelper.java

@@ -5,7 +5,7 @@ import com.yihu.jw.quota.etl.save.es.ElastricSearchSave;
import com.yihu.jw.quota.model.jpa.save.TjQuotaDataSave;
import com.yihu.jw.quota.service.save.TjDataSaveService;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.SaveModel;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Scope;
@@ -22,7 +22,7 @@ public class SaveHelper {
    @Autowired
    private TjDataSaveService datsSaveService;
    public Boolean save(List<SaveModel> dataModels, QuotaVO quotaVO) {
    public Boolean save(List<SaveModel> dataModels, QuotaVo quotaVO) {
        //查看指标保存的数据源
        TjQuotaDataSave quotaDataSave = datsSaveService.findByQuota(quotaVO.getCode());
        switch (quotaDataSave.getType()) {

svr/svr-quota/src/main/java/com/yihu/jw/quota/job/EsQuotaJob.java

@@ -6,7 +6,7 @@ import com.yihu.jw.quota.etl.extract.ExtractHelper;
import com.yihu.jw.quota.etl.save.SaveHelper;
import com.yihu.jw.quota.model.jpa.TjQuotaLog;
import com.yihu.jw.quota.util.SpringUtil;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import com.yihu.jw.quota.vo.SaveModel;
import org.joda.time.DateTime;
import org.joda.time.LocalDate;
@@ -33,7 +33,7 @@ public class EsQuotaJob implements Job {
    private Logger logger = LoggerFactory.getLogger(EsQuotaJob.class);
    private String saasid;//saasid
    private QuotaVO quotaVO;//指标对象
    private QuotaVo quotaVO;//指标对象
    private String endTime;//结束时间
    private String startTime;//开始时间
    private String timeLevel;//时间
@@ -115,7 +115,7 @@ public class EsQuotaJob implements Job {
            startTime = Contant.main_dimension_timeLevel.getStartTime(timeLevel);
        }
        this.quotaVO = (QuotaVO) map.get("quota");
        this.quotaVO = (QuotaVo) map.get("quota");
        this.timeLevel = (String) map.get("timeLevel");
        if (StringUtils.isEmpty(this.timeLevel)) {
            this.timeLevel = Contant.main_dimension_timeLevel.day;

svr/svr-quota/src/main/java/com/yihu/jw/quota/service/job/JobService.java

@@ -3,7 +3,7 @@ package com.yihu.jw.quota.service.job;
import com.yihu.jw.quota.dao.jpa.TjQuotaDao;
import com.yihu.jw.quota.model.jpa.TjQuota;
import com.yihu.jw.quota.util.QuartzHelper;
import com.yihu.jw.quota.vo.QuotaVO;
import com.yihu.jw.quota.vo.QuotaVo;
import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Value;
@@ -28,7 +28,7 @@ public class JobService {
    public void startNowById(String id) throws Exception {
        TjQuota tjQuota= quotaDao.findByCode(id);
        QuotaVO quotaVO =new QuotaVO();
        QuotaVo quotaVO =new QuotaVo();
        BeanUtils.copyProperties(tjQuota,quotaVO);
        Map<String, Object> params = new HashMap<String, Object>();

svr/svr-quota/src/main/java/com/yihu/jw/quota/vo/QuotaVo.java

@@ -6,7 +6,7 @@ import java.util.Date;
/**
 * Created by chenweida on 2017/6/1. test
 */
public class QuotaVO implements Serializable{
public class QuotaVo implements Serializable{
    private Integer id;
    private String code;
    private String compute;