添加分组

gic-data-cloud-api/src/main/java/com/gic/cloud/dto/IndexDTO.java

@@ -140,6 +140,8 @@ public class IndexDTO implements Serializable {
      */
     private String optUserName;
 
+    private Integer indexGroupId;
+
     public Integer getIndexId() {
         return indexId;
     }
@@ -355,4 +357,12 @@ public class IndexDTO implements Serializable {
     public void setShowStatus(Integer showStatus) {
         this.showStatus = showStatus;
     }
+
+    public Integer getIndexGroupId() {
+        return indexGroupId;
+    }
+
+    public void setIndexGroupId(Integer indexGroupId) {
+        this.indexGroupId = indexGroupId;
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/entity/TabIndex.java

@@ -12,7 +12,7 @@ public class TabIndex {
     private Integer indexId;
 
     /**
-     * 分类类型
+     * 分类类型 1指标  2维度  3说明
      */
     private Integer classifyType;
 
@@ -72,6 +72,11 @@ public class TabIndex {
     private Integer decimalSize;
 
     /**
+     * 
+     */
+    private Integer indexGroupId;
+
+    /**
      * 数据类型   1流量   2存量
      */
     private Integer dataType;
@@ -235,6 +240,14 @@ public class TabIndex {
         this.decimalSize = decimalSize;
     }
 
+    public Integer getIndexGroupId() {
+        return indexGroupId;
+    }
+
+    public void setIndexGroupId(Integer indexGroupId) {
+        this.indexGroupId = indexGroupId;
+    }
+
     public Integer getDataType() {
         return dataType;
     }

gic-data-cloud-service/src/main/resources/mapper/TabIndexMapper.xml

@@ -15,6 +15,7 @@
     <result column="unit_code" jdbcType="INTEGER" property="unitCode" />
     <result column="unit_name" jdbcType="VARCHAR" property="unitName" />
     <result column="decimal_size" jdbcType="INTEGER" property="decimalSize" />
+    <result column="index_group_id" jdbcType="INTEGER" property="indexGroupId" />
     <result column="data_type" jdbcType="INTEGER" property="dataType" />
     <result column="index_type" jdbcType="INTEGER" property="indexType" />
     <result column="base_organized" jdbcType="VARCHAR" property="baseOrganized" />
@@ -31,8 +32,8 @@
   <sql id="Base_Column_List">
     index_id, classify_type, classify_name, is_app_index, rel_app_index, code, name, 
     index_level, index_level_name, rel_top_level, unit_code, unit_name, decimal_size, 
-    data_type, index_type, base_organized, base_time, update_rate, update_rate_remark, 
-    index_remark, `show_status`, complement, create_time, update_time, status
+    index_group_id, data_type, index_type, base_organized, base_time, update_rate, update_rate_remark, 
+    index_remark, show_status, complement, create_time, update_time, status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -49,20 +50,20 @@
       is_app_index, rel_app_index, code, 
       name, index_level, index_level_name, 
       rel_top_level, unit_code, unit_name, 
-      decimal_size, data_type, index_type, 
-      base_organized, base_time, update_rate, 
-      update_rate_remark, index_remark, `show_status`,
-      complement, create_time, update_time, 
-      status)
+      decimal_size, index_group_id, data_type, 
+      index_type, base_organized, base_time, 
+      update_rate, update_rate_remark, index_remark, 
+      show_status, complement, create_time, 
+      update_time, status)
     values (#{indexId,jdbcType=INTEGER}, #{classifyType,jdbcType=INTEGER}, #{classifyName,jdbcType=VARCHAR}, 
       #{isAppIndex,jdbcType=INTEGER}, #{relAppIndex,jdbcType=VARCHAR}, #{code,jdbcType=VARCHAR}, 
       #{name,jdbcType=VARCHAR}, #{indexLevel,jdbcType=INTEGER}, #{indexLevelName,jdbcType=VARCHAR}, 
       #{relTopLevel,jdbcType=VARCHAR}, #{unitCode,jdbcType=INTEGER}, #{unitName,jdbcType=VARCHAR}, 
-      #{decimalSize,jdbcType=INTEGER}, #{dataType,jdbcType=INTEGER}, #{indexType,jdbcType=INTEGER}, 
-      #{baseOrganized,jdbcType=VARCHAR}, #{baseTime,jdbcType=VARCHAR}, #{updateRate,jdbcType=VARCHAR}, 
-      #{updateRateRemark,jdbcType=VARCHAR}, #{indexRemark,jdbcType=VARCHAR}, #{showStatus,jdbcType=INTEGER},
-      #{complement,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
-      #{status,jdbcType=INTEGER})
+      #{decimalSize,jdbcType=INTEGER}, #{indexGroupId,jdbcType=INTEGER}, #{dataType,jdbcType=INTEGER}, 
+      #{indexType,jdbcType=INTEGER}, #{baseOrganized,jdbcType=VARCHAR}, #{baseTime,jdbcType=VARCHAR}, 
+      #{updateRate,jdbcType=VARCHAR}, #{updateRateRemark,jdbcType=VARCHAR}, #{indexRemark,jdbcType=VARCHAR}, 
+      #{showStatus,jdbcType=INTEGER}, #{complement,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, 
+      #{updateTime,jdbcType=TIMESTAMP}, #{status,jdbcType=INTEGER})
   </insert>
   <insert id="insertSelective" parameterType="com.gic.cloud.entity.TabIndex">
     <selectKey keyProperty="indexId" order="AFTER" resultType="java.lang.Integer">
@@ -109,6 +110,9 @@
       <if test="decimalSize != null">
         decimal_size,
       </if>
+      <if test="indexGroupId != null">
+        index_group_id,
+      </if>
       <if test="dataType != null">
         data_type,
       </if>
@@ -186,6 +190,9 @@
       <if test="decimalSize != null">
         #{decimalSize,jdbcType=INTEGER},
       </if>
+      <if test="indexGroupId != null">
+        #{indexGroupId,jdbcType=INTEGER},
+      </if>
       <if test="dataType != null">
         #{dataType,jdbcType=INTEGER},
       </if>
@@ -263,6 +270,9 @@
       <if test="decimalSize != null">
         decimal_size = #{decimalSize,jdbcType=INTEGER},
       </if>
+      <if test="indexGroupId != null">
+        index_group_id = #{indexGroupId,jdbcType=INTEGER},
+      </if>
       <if test="dataType != null">
         data_type = #{dataType,jdbcType=INTEGER},
       </if>
@@ -316,6 +326,7 @@
       unit_code = #{unitCode,jdbcType=INTEGER},
       unit_name = #{unitName,jdbcType=VARCHAR},
       decimal_size = #{decimalSize,jdbcType=INTEGER},
+      index_group_id = #{indexGroupId,jdbcType=INTEGER},
       data_type = #{dataType,jdbcType=INTEGER},
       index_type = #{indexType,jdbcType=INTEGER},
       base_organized = #{baseOrganized,jdbcType=VARCHAR},