Merge remote-tracking branch 'origin/developer' into developer

gic-data-cloud-api/src/main/java/com/gic/cloud/qo/IndexQO.java

@@ -19,6 +19,112 @@ public class IndexQO extends PageQO implements Serializable {
     private Integer indexGroupId;
     private List<Integer> indexIdList;
 
+    /**
+     * 指标id
+     */
+    private Integer indexId;
+
+    /**
+     * 分类名
+     */
+    private String classifyName;
+
+    /**
+     * 关联应用指标
+     */
+    private String relAppIndex;
+
+    /**
+     *
+     */
+    private String code;
+
+    /**
+     *
+     */
+    private String name;
+
+    /**
+     * 指标级别
+     */
+    private String indexLevelName;
+
+    /**
+     * 关联一级指标 ‘,’ 隔开
+     */
+    private String relTopLevel;
+
+    /**
+     * 单位
+     */
+    private Integer unitCode;
+
+    /**
+     * 单位
+     */
+    private String unitName;
+
+    /**
+     * 小数位数
+     */
+    private Integer decimalSize;
+
+    /**
+     * 数据类型   1流量   2存量
+     */
+    private Integer dataType;
+
+    /**
+     * 指标类型   1基础   2计算
+     */
+    private Integer indexType;
+
+    /**
+     * 基础组织维度
+     */
+    private String baseOrganized;
+
+    /**
+     * 基础时间维度
+     */
+    private String baseTime;
+
+    /**
+     * 更新频率  高/中/低
+     */
+    private String updateRate;
+
+    /**
+     * 更新频率 补充说明
+     */
+    private String updateRateRemark;
+
+    /**
+     * 口径/文案编辑
+     */
+    private String indexRemark;
+
+    /**
+     * 补充说明
+     */
+    private String complement;
+
+    private Integer showStatus;
+
+    private List<String> relModuleIdList;
+
+    /**
+     * 操作人id
+     */
+    private Integer optUserId;
+    /**
+     * 操作人name
+     */
+    private String optUserName;
+
+    private String indexGroupName;
+
+
     public Integer getClassifyType() {
         return classifyType;
     }
@@ -74,4 +180,188 @@ public class IndexQO extends PageQO implements Serializable {
     public void setIndexLevel(Integer indexLevel) {
         this.indexLevel = indexLevel;
     }
+
+    public Integer getIndexId() {
+        return indexId;
+    }
+
+    public void setIndexId(Integer indexId) {
+        this.indexId = indexId;
+    }
+
+    public String getClassifyName() {
+        return classifyName;
+    }
+
+    public void setClassifyName(String classifyName) {
+        this.classifyName = classifyName;
+    }
+
+    public String getRelAppIndex() {
+        return relAppIndex;
+    }
+
+    public void setRelAppIndex(String relAppIndex) {
+        this.relAppIndex = relAppIndex;
+    }
+
+    public String getCode() {
+        return code;
+    }
+
+    public void setCode(String code) {
+        this.code = code;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getIndexLevelName() {
+        return indexLevelName;
+    }
+
+    public void setIndexLevelName(String indexLevelName) {
+        this.indexLevelName = indexLevelName;
+    }
+
+    public String getRelTopLevel() {
+        return relTopLevel;
+    }
+
+    public void setRelTopLevel(String relTopLevel) {
+        this.relTopLevel = relTopLevel;
+    }
+
+    public Integer getUnitCode() {
+        return unitCode;
+    }
+
+    public void setUnitCode(Integer unitCode) {
+        this.unitCode = unitCode;
+    }
+
+    public String getUnitName() {
+        return unitName;
+    }
+
+    public void setUnitName(String unitName) {
+        this.unitName = unitName;
+    }
+
+    public Integer getDecimalSize() {
+        return decimalSize;
+    }
+
+    public void setDecimalSize(Integer decimalSize) {
+        this.decimalSize = decimalSize;
+    }
+
+    public Integer getDataType() {
+        return dataType;
+    }
+
+    public void setDataType(Integer dataType) {
+        this.dataType = dataType;
+    }
+
+    public Integer getIndexType() {
+        return indexType;
+    }
+
+    public void setIndexType(Integer indexType) {
+        this.indexType = indexType;
+    }
+
+    public String getBaseOrganized() {
+        return baseOrganized;
+    }
+
+    public void setBaseOrganized(String baseOrganized) {
+        this.baseOrganized = baseOrganized;
+    }
+
+    public String getBaseTime() {
+        return baseTime;
+    }
+
+    public void setBaseTime(String baseTime) {
+        this.baseTime = baseTime;
+    }
+
+    public String getUpdateRate() {
+        return updateRate;
+    }
+
+    public void setUpdateRate(String updateRate) {
+        this.updateRate = updateRate;
+    }
+
+    public String getUpdateRateRemark() {
+        return updateRateRemark;
+    }
+
+    public void setUpdateRateRemark(String updateRateRemark) {
+        this.updateRateRemark = updateRateRemark;
+    }
+
+    public String getIndexRemark() {
+        return indexRemark;
+    }
+
+    public void setIndexRemark(String indexRemark) {
+        this.indexRemark = indexRemark;
+    }
+
+    public String getComplement() {
+        return complement;
+    }
+
+    public void setComplement(String complement) {
+        this.complement = complement;
+    }
+
+    public Integer getShowStatus() {
+        return showStatus;
+    }
+
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
+    }
+
+    public List<String> getRelModuleIdList() {
+        return relModuleIdList;
+    }
+
+    public void setRelModuleIdList(List<String> relModuleIdList) {
+        this.relModuleIdList = relModuleIdList;
+    }
+
+    public Integer getOptUserId() {
+        return optUserId;
+    }
+
+    public void setOptUserId(Integer optUserId) {
+        this.optUserId = optUserId;
+    }
+
+    public String getOptUserName() {
+        return optUserName;
+    }
+
+    public void setOptUserName(String optUserName) {
+        this.optUserName = optUserName;
+    }
+
+    public String getIndexGroupName() {
+        return indexGroupName;
+    }
+
+    public void setIndexGroupName(String indexGroupName) {
+        this.indexGroupName = indexGroupName;
+    }
 }

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/controller/IndexController.java

@@ -12,6 +12,7 @@ import com.gic.cloud.operation.web.vo.IndexVO;
 import com.gic.cloud.qo.IndexQO;
 import com.gic.cloud.service.IndexApiService;
 import com.gic.cloud.service.IndexLogApiService;
+import com.gic.commons.util.EntityUtil;
 import com.gic.commons.webapi.reponse.RestResponse;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.utils.ResultControllerUtils;
@@ -41,7 +42,8 @@ public class IndexController {
 
 
     @RequestMapping("/save-index")
-    public RestResponse saveIndex(IndexDTO indexDTO, String relModuleIds) {
+    public RestResponse saveIndex(IndexQO indexQO, String relModuleIds) {
+        IndexDTO indexDTO = EntityUtil.changeEntityByJSON(IndexDTO.class, indexQO);
         if (indexDTO.getClassifyType() == null ||
                 StringUtils.isBlank(indexDTO.getCode()) ||
                 StringUtils.isBlank(indexDTO.getName()) ||

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

@@ -162,5 +162,6 @@
     <if test="search != null and search != '' ">
         and ( data_name like concat('%', #{search}, '%') or data_classify like concat('%', #{search}, '%') )
     </if>
+    order by create_time desc
   </select>
 </mapper>
\ No newline at end of file

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

@@ -164,13 +164,13 @@
   </select>
   <select id="listBusinessIdByModuleId" resultType="int">
     select
-    module_id
+    business_id
     from tab_index_module_rel
     where status = 1 and module_id = #{moduleId}
   </select>
   <select id="listBusinessIdByModuleIds" resultType="int">
     select
-    module_id
+    business_id
     from tab_index_module_rel
     where status = 1
     <if test="null != ids and ids.size > 0">