bug提交

svr/svr-quota/src/main/java/com/yihu/jw/quota/etl/dimenconvert/ConvertHelper.java

@@ -33,7 +33,7 @@ public class ConvertHelper {
        List<TjQuotaDimensionSlave> tj = dimensionSlaveService.findTjQuotaDimensionSlaveByQuotaCode(quotaVO.getCode());
        for (int i = 0; i < tj.size(); i++) {
            TjQuotaDimensionSlave temp = tj.get(i);
            if (!StringUtils.isEmpty(temp)) {
            if (!StringUtils.isEmpty(temp.getConvertClazz())) {
                if (Contant.compute.add.equals(quotaVO.getComputeType())) {
                    //判断是否是累加计算 如果强转成list类型
                    List<DataModel> oneList = (List<DataModel>) filterModel.getData();

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

@@ -23,7 +23,8 @@ public class ElasticFactory {
        factory.setHttpClientConfig(new HttpClientConfig
                .Builder(hostAddress)
                .multiThreaded(true)
                .readTimeout(30)
                .discoveryEnabled(true)
                .readTimeout(30000)//30秒
                .build());
        return factory.getObject();
    }

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

@@ -43,6 +43,8 @@ public class ElastricSearchSave {
                bulk.addAction(index);
            }
            BulkResult br = jestClient.execute(bulk.build());
            //关闭链接
            jestClient.shutdownClient();
            return br.isSucceeded();
        } catch (Exception e) {
            logger.error(" save error ：" + e.getMessage());

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

@@ -138,10 +138,15 @@ public class QuotaJob implements Job {
            tjQuotaLog.setStatus(success ? Contant.save_status.success : Contant.save_status.fail);
            tjQuotaLog.setEndTime(new Date());
            tjQuotaLog.setContent(JSONObject.fromObject(jobLogModel).toString());
            saveLog(tjQuotaLog);
        } catch (Exception e) {
            e.printStackTrace();
        }
    }
    @Transactional
    private void saveLog(TjQuotaLog tjQuotaLog) {
        tjQuotaLogDao.save(tjQuotaLog);
    }
    private FilterModel convert(FilterModel dataModels) {
        try{

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

@@ -1,7 +1,10 @@
package com.yihu.jw.quota.model.jpa.dimension;// default package
import com.sun.xml.internal.ws.api.message.ExceptionHasMessage;
import com.yihu.jw.quota.etl.Contant;
import net.sf.json.JSONObject;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import javax.persistence.*;
@@ -13,120 +16,146 @@ import static javax.persistence.GenerationType.IDENTITY;
@Entity
@Table(name = "tj_quota_dimension_slave")
public class TjQuotaDimensionSlave implements java.io.Serializable {
	// Fields
	private Integer id;
	private String quotaCode;
	private String slaveCode;
	private String dictSql;//字典的sql
	private String convertClazz;//转换的类
	private String type;
	private String getOneDictSql;//得到分子的
	private String getTwoDictSql;//得到分母的
	private String getOneConvertClazz;//得到分子的
	private String getTwoConvertClazz;//得到分母的
	// Constructors
	/** default constructor */
	public TjQuotaDimensionSlave() {
	}
	/** full constructor */
	public TjQuotaDimensionSlave(String quotaCode, String slaveCode) {
		this.quotaCode = quotaCode;
		this.slaveCode = slaveCode;
	}
	// Property accessors
	@Id
	@GeneratedValue(strategy = IDENTITY)
	@Column(name = "id", unique = true, nullable = false)
	public Integer getId() {
		return this.id;
	}
	public void setId(Integer id) {
		this.id = id;
	}
	@Column(name = "quota_code", length = 100)
	public String getQuotaCode() {
		return this.quotaCode;
	}
	public void setQuotaCode(String quotaCode) {
		this.quotaCode = quotaCode;
	}
	@Column(name = "slave_code", length = 100)
	public String getSlaveCode() {
		return this.slaveCode;
	}
	public void setSlaveCode(String slaveCode) {
		this.slaveCode = slaveCode;
	}
	public String getDictSql() {
		return dictSql;
	}
	public void setDictSql(String dictSql) {
		this.dictSql = dictSql;
	}
	@Transient
	public String getType() {
		return type;
	}
	public void setType(String type) {
		this.type = type;
	}
	public String getConvertClazz() {
		return convertClazz;
	}
	public void setConvertClazz(String convertClazz) {
		this.convertClazz = convertClazz;
	}
	@Transient
	public String getGetOneDictSql() {
		return JSONObject.fromObject(dictSql).getString(Contant.slave_dimension_key.one);
	}
	public void setGetOneDictSql(String getOneDictSql) {
		this.getOneDictSql = getOneDictSql;
	}
	@Transient
	public String getGetTwoDictSql() {
		return JSONObject.fromObject(dictSql).getString(Contant.slave_dimension_key.two);
	}
	public void setGetTwoDictSql(String getTwoDictSql) {
		this.getTwoDictSql = getTwoDictSql;
	}
	@Transient
	public String getGetOneConvertClazz() {
		return JSONObject.fromObject(convertClazz).getString(Contant.slave_dimension_key.one);
	}
	public void setGetOneConvertClazz(String getOneConvertClazz) {
		this.getOneConvertClazz = getOneConvertClazz;
	}
	@Transient
	public String getGetTwoConvertClazz() {
		return JSONObject.fromObject(convertClazz).getString(Contant.slave_dimension_key.two);
	}
	public void setGetTwoConvertClazz(String getTwoConvertClazz) {
		this.getTwoConvertClazz = getTwoConvertClazz;
	}
    private Logger logger= LoggerFactory.getLogger(TjQuotaDimensionSlave.class);
    // Fields
    private Integer id;
    private String quotaCode;
    private String slaveCode;
    private String dictSql;//字典的sql
    private String convertClazz;//转换的类
    private String type;
    private String getOneDictSql;//得到分子的
    private String getTwoDictSql;//得到分母的
    private String getOneConvertClazz;//得到分子的
    private String getTwoConvertClazz;//得到分母的
    // Constructors
    /**
     * default constructor
     */
    public TjQuotaDimensionSlave() {
    }
    /**
     * full constructor
     */
    public TjQuotaDimensionSlave(String quotaCode, String slaveCode) {
        this.quotaCode = quotaCode;
        this.slaveCode = slaveCode;
    }
    // Property accessors
    @Id
    @GeneratedValue(strategy = IDENTITY)
    @Column(name = "id", unique = true, nullable = false)
    public Integer getId() {
        return this.id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    @Column(name = "quota_code", length = 100)
    public String getQuotaCode() {
        return this.quotaCode;
    }
    public void setQuotaCode(String quotaCode) {
        this.quotaCode = quotaCode;
    }
    @Column(name = "slave_code", length = 100)
    public String getSlaveCode() {
        return this.slaveCode;
    }
    public void setSlaveCode(String slaveCode) {
        this.slaveCode = slaveCode;
    }
    public String getDictSql() {
        return dictSql;
    }
    public void setDictSql(String dictSql) {
        this.dictSql = dictSql;
    }
    @Transient
    public String getType() {
        return type;
    }
    public void setType(String type) {
        this.type = type;
    }
    public String getConvertClazz() {
        return convertClazz;
    }
    public void setConvertClazz(String convertClazz) {
        this.convertClazz = convertClazz;
    }
    @Transient
    public String getGetOneDictSql() {
        try {
            return JSONObject.fromObject(dictSql).getString(Contant.slave_dimension_key.one);
        } catch (Exception e) {
            logger.warn("OneDictSql error");
        }
        return null;
    }
    public void setGetOneDictSql(String getOneDictSql) {
        this.getOneDictSql = getOneDictSql;
    }
    @Transient
    public String getGetTwoDictSql() {
        try {
            return JSONObject.fromObject(dictSql).getString(Contant.slave_dimension_key.two);
        } catch (Exception e) {
            logger.warn("GetTwoDictSql error");
        }
        return null;
    }
    public void setGetTwoDictSql(String getTwoDictSql) {
        this.getTwoDictSql = getTwoDictSql;
    }
    @Transient
    public String getGetOneConvertClazz() {
        try {
            return JSONObject.fromObject(convertClazz).getString(Contant.slave_dimension_key.one);
        } catch (Exception e) {
            logger.warn("GetOneConvertClazz error");
        }
        return null;
    }
    public void setGetOneConvertClazz(String getOneConvertClazz) {
        this.getOneConvertClazz = getOneConvertClazz;
    }
    @Transient
    public String getGetTwoConvertClazz() {
        try {
            return JSONObject.fromObject(convertClazz).getString(Contant.slave_dimension_key.two);
        } catch (Exception e) {
            logger.warn("TwoConvertClazz error");
        }
        return null;
    }
    public void setGetTwoConvertClazz(String getTwoConvertClazz) {
        this.getTwoConvertClazz = getTwoConvertClazz;
    }
}