Bläddra i källkod

es mapping 数据逻辑处理保存

jkzlzhoujie 6 år sedan
förälder
incheckning
a9f35c0aac

+ 0 - 4
src/main/java/com/yihu/quota/controller/CubeController.java

@ -103,10 +103,6 @@ public class CubeController  extends BaseController {
                                fieldInfo.setDataType("object");
                            }else if(cubeMappingModel.getChildSaveType().equals(2)){
                                fieldInfo.setDataType("nested");
                                FieldInfo subRowKeyFieldInfo =  new FieldInfo();
                                subRowKeyFieldInfo.setField("subRowkey");
                                subRowKeyFieldInfo.setDataType("String");
                                childFieldiList.add(subRowKeyFieldInfo);
                            }
                        }
                        for(CubeMemberMappingModel cubeMemberMappingModel : cubeMemberMappingModels){

+ 6 - 0
src/main/java/com/yihu/quota/model/cube/Cube.java

@ -32,6 +32,7 @@ public class Cube {
        this.id = id;
    }
    @Column(name = "name")
    public String getName() {
        return name;
    }
@ -40,6 +41,7 @@ public class Cube {
        this.name = name;
    }
    @Column(name = "code")
    public String getCode() {
        return code;
    }
@ -48,6 +50,7 @@ public class Cube {
        this.code = code;
    }
    @Column(name = "data_source_type")
    public Integer getDataSourceType() {
        return dataSourceType;
    }
@ -56,6 +59,7 @@ public class Cube {
        this.dataSourceType = dataSourceType;
    }
    @Column(name = "index_name")
    public String getIndexName() {
        return indexName;
    }
@ -64,6 +68,7 @@ public class Cube {
        this.indexName = indexName;
    }
    @Column(name = "index_type")
    public String getIndexType() {
        return indexType;
    }
@ -72,6 +77,7 @@ public class Cube {
        this.indexType = indexType;
    }
    @Column(name = "note")
    public String getNote() {
        return note;
    }

+ 6 - 8
src/main/java/com/yihu/quota/model/cube/CubeMapping.java

@ -20,7 +20,6 @@ public class CubeMapping {
    private String dimensionCode;    //维度编码
    private String fieldName;        //字段名称
    private Integer childSaveType; //子集映射格式类型 1 对象 2 子集
    private String childPrimaryKay; //子集唯一字段
    @Id
    @GeneratedValue(strategy = GenerationType.IDENTITY)
@ -33,6 +32,7 @@ public class CubeMapping {
        this.id = id;
    }
    @Column(name = "cube_id")
    public Integer getCubeId() {
        return cubeId;
    }
@ -41,6 +41,7 @@ public class CubeMapping {
        this.cubeId = cubeId;
    }
    @Column(name = "data_field_id")
    public Integer getDataFieldId() {
        return dataFieldId;
    }
@ -49,6 +50,7 @@ public class CubeMapping {
        this.dataFieldId = dataFieldId;
    }
    @Column(name = "dimension_id")
    public Integer getDimensionId() {
        return dimensionId;
    }
@ -57,6 +59,7 @@ public class CubeMapping {
        this.dimensionId = dimensionId;
    }
    @Column(name = "dimension_code")
    public String getDimensionCode() {
        return dimensionCode;
    }
@ -65,6 +68,7 @@ public class CubeMapping {
        this.dimensionCode = dimensionCode;
    }
    @Column(name = "field_name")
    public String getFieldName() {
        return fieldName;
    }
@ -73,6 +77,7 @@ public class CubeMapping {
        this.fieldName = fieldName;
    }
    @Column(name = "child_save_type")
    public Integer getChildSaveType() {
        return childSaveType;
    }
@ -81,11 +86,4 @@ public class CubeMapping {
        this.childSaveType = childSaveType;
    }
    public String getChildPrimaryKay() {
        return childPrimaryKay;
    }
    public void setChildPrimaryKay(String childPrimaryKay) {
        this.childPrimaryKay = childPrimaryKay;
    }
}

+ 15 - 0
src/main/java/com/yihu/quota/model/cube/CubeMemberMapping.java

@ -19,6 +19,7 @@ public class CubeMemberMapping {
    private Integer dimensionMemberId;//维度成员ID
    private String dimensionCode;    //维度编码
    private String fieldName;        //字段名称
    private Integer isPrimarykey;  //是否指定唯一字段 1是 0 否
    @Id
@ -32,6 +33,7 @@ public class CubeMemberMapping {
        this.id = id;
    }
    @Column(name = "cube_mapping_id")
    public Integer getCubeMappingId() {
        return cubeMappingId;
    }
@ -40,6 +42,7 @@ public class CubeMemberMapping {
        this.cubeMappingId = cubeMappingId;
    }
    @Column(name = "data_field_id")
    public Integer getDataFieldId() {
        return dataFieldId;
    }
@ -48,6 +51,7 @@ public class CubeMemberMapping {
        this.dataFieldId = dataFieldId;
    }
    @Column(name = "dimension_member_id")
    public Integer getDimensionMemberId() {
        return dimensionMemberId;
    }
@ -56,6 +60,7 @@ public class CubeMemberMapping {
        this.dimensionMemberId = dimensionMemberId;
    }
    @Column(name = "dimension_code")
    public String getDimensionCode() {
        return dimensionCode;
    }
@ -64,6 +69,7 @@ public class CubeMemberMapping {
        this.dimensionCode = dimensionCode;
    }
    @Column(name = "field_name")
    public String getFieldName() {
        return fieldName;
    }
@ -71,4 +77,13 @@ public class CubeMemberMapping {
    public void setFieldName(String fieldName) {
        this.fieldName = fieldName;
    }
    @Column(name = "is_primarykey")
    public Integer getIsPrimarykey() {
        return isPrimarykey;
    }
    public void setIsPrimarykey(Integer isPrimarykey) {
        this.isPrimarykey = isPrimarykey;
    }
}

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

@ -37,7 +37,7 @@ public class ElasticSearchDataProcessService {
    private static String table_k = "table";
    private static String id_k = "_id";
    private static String rowKey_k = "rowkey";
    private static String profileId_k = "profileId";
    private static String profileId_k = "profile_id";
    private static String subRowKey_k = "subRowkey";
    private static String action_k = "action";

+ 0 - 9
src/main/java/com/yihu/quota/vo/CubeMappingModel.java

@ -16,7 +16,6 @@ public class CubeMappingModel {
    private String parm;             //中间算法参数
    private String dataType;        //数据类型
    private Integer childSaveType; //子集映射格式类型 1 对象 2 子集
    private String childPrimaryKay; //子集唯一字段
    private String fieldCode;        //字段编码
    private String indexName;
    private String indexType;
@ -85,14 +84,6 @@ public class CubeMappingModel {
        this.dataType = dataType;
    }
    public String getChildPrimaryKay() {
        return childPrimaryKay;
    }
    public void setChildPrimaryKay(String childPrimaryKay) {
        this.childPrimaryKay = childPrimaryKay;
    }
    public Integer getChildSaveType() {
        return childSaveType;
    }

+ 9 - 0
src/main/java/com/yihu/quota/vo/CubeMemberMappingModel.java

@ -20,6 +20,7 @@ public class CubeMemberMappingModel {
    private Integer childSaveType;
    private String indexName;
    private String indexType;
    private Integer isPrimarykey;  //是否指定唯一字段 1是 0 否
    public Integer getId() {
        return id;
@ -140,4 +141,12 @@ public class CubeMemberMappingModel {
    public void setIndexType(String indexType) {
        this.indexType = indexType;
    }
    public Integer getIsPrimarykey() {
        return isPrimarykey;
    }
    public void setIsPrimarykey(Integer isPrimarykey) {
        this.isPrimarykey = isPrimarykey;
    }
}