Browse Source

数据解析 增加 数据关联查询

jkzlzhoujie 6 years ago
parent
commit
a54d4adb52

+ 1 - 2
src/main/java/com/yihu/quota/service/cube/ElasticSearchDataProcessService.java

@ -284,9 +284,8 @@ public class ElasticSearchDataProcessService {
                    objChildMap = extendDivisionData(objChildMap, cloumnCode, algorithmParm, baseCloumnValue);
                }
                source.put(parentCode,objChildMap);
                //其他算法 统一改为反射的方式 计算 TODO
            }else {
                objChildMap.put(cloumnCode,baseCloumnValue);
                objChildMap.put(cloumnCode,dataConver(dataType,baseCloumnValue));
            }
            source.put(parentCode,objChildMap);
        }else if(childSaveType == 2 ){//nested 方式

+ 94 - 0
src/main/java/com/yihu/quota/vo/DataSourcesTableModel.java

@ -0,0 +1,94 @@
package com.yihu.quota.vo;
import org.hibernate.annotations.Formula;
import javax.persistence.*;
/**
 * Created by janseny on 2018/11/01.
 * @author janseny.
 */
public class DataSourcesTableModel {
    private Integer id;
    private Integer tableId;
    private String fieldName;
    private String fieldCode;
    private String fieldType;
    private String note;
    private String tableName;
    private String tableCode;
    private String databaseName;
    public Integer getId() {
        return id;
    }
    public void setId(Integer id) {
        this.id = id;
    }
    public Integer getTableId() {
        return tableId;
    }
    public void setTableId(Integer tableId) {
        this.tableId = tableId;
    }
    public String getFieldName() {
        return fieldName;
    }
    public void setFieldName(String fieldName) {
        this.fieldName = fieldName;
    }
    public String getFieldCode() {
        return fieldCode;
    }
    public void setFieldCode(String fieldCode) {
        this.fieldCode = fieldCode;
    }
    public String getFieldType() {
        return fieldType;
    }
    public void setFieldType(String fieldType) {
        this.fieldType = fieldType;
    }
    public String getNote() {
        return note;
    }
    public void setNote(String note) {
        this.note = note;
    }
    public String getTableName() {
        return tableName;
    }
    public void setTableName(String tableName) {
        this.tableName = tableName;
    }
    public String getTableCode() {
        return tableCode;
    }
    public void setTableCode(String tableCode) {
        this.tableCode = tableCode;
    }
    public String getDatabaseName() {
        return databaseName;
    }
    public void setDatabaseName(String databaseName) {
        this.databaseName = databaseName;
    }
}