发布小红点

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

@@ -18,7 +18,7 @@ public class IndexDTO implements Serializable {
     private Integer indexId;
 
     /**
-     * 分类类型
+     * 分类类型 1指标  2维度  3说明
      */
     private Integer classifyType;
 
@@ -127,6 +127,8 @@ public class IndexDTO implements Serializable {
      */
     private Date updateTime;
 
+    private Integer showStatus;
+
     private List<Integer> relModuleIdList;
 
     /**
@@ -345,4 +347,12 @@ public class IndexDTO implements Serializable {
     public void setOptUserName(String optUserName) {
         this.optUserName = optUserName;
     }
+
+    public Integer getShowStatus() {
+        return showStatus;
+    }
+
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
+    }
 }

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

@@ -35,7 +35,7 @@ public class IndexController {
 
     @RequestMapping("/saveIndex")
     public RestResponse saveIndex(IndexDTO indexDTO) {
-        if (indexDTO.getIsAppIndex() == null ||
+        if (indexDTO.getClassifyType() == null ||
                 StringUtils.isBlank(indexDTO.getCode()) ||
                 StringUtils.isBlank(indexDTO.getName()) ||
                 StringUtils.isBlank(indexDTO.getIndexRemark())) {

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

@@ -109,7 +109,7 @@ public class TabIndex {
     /**
      * 是否展示 1展示 0不展示
      */
-    private Integer show;
+    private Integer showStatus;
 
     /**
      * 补充说明
@@ -291,12 +291,12 @@ public class TabIndex {
         this.indexRemark = indexRemark;
     }
 
-    public Integer getShow() {
-        return show;
+    public Integer getShowStatus() {
+        return showStatus;
     }
 
-    public void setShow(Integer show) {
-        this.show = show;
+    public void setShowStatus(Integer showStatus) {
+        this.showStatus = showStatus;
     }
 
     public String getComplement() {

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

@@ -22,7 +22,7 @@
     <result column="update_rate" jdbcType="VARCHAR" property="updateRate" />
     <result column="update_rate_remark" jdbcType="VARCHAR" property="updateRateRemark" />
     <result column="index_remark" jdbcType="VARCHAR" property="indexRemark" />
-    <result column="show" jdbcType="INTEGER" property="show" />
+    <result column="show_status" jdbcType="INTEGER" property="showStatus" />
     <result column="complement" jdbcType="VARCHAR" property="complement" />
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
     <result column="update_time" jdbcType="TIMESTAMP" property="updateTime" />
@@ -32,7 +32,7 @@
     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`, complement, create_time, update_time, status
+    index_remark, `show_status`, complement, create_time, update_time, status
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select 
@@ -51,7 +51,7 @@
       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`,
+      update_rate_remark, index_remark, `show_status`,
       complement, create_time, update_time, 
       status)
     values (#{indexId,jdbcType=INTEGER}, #{classifyType,jdbcType=INTEGER}, #{classifyName,jdbcType=VARCHAR}, 
@@ -60,7 +60,7 @@
       #{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}, #{show,jdbcType=INTEGER}, 
+      #{updateRateRemark,jdbcType=VARCHAR}, #{indexRemark,jdbcType=VARCHAR}, #{showStatus,jdbcType=INTEGER},
       #{complement,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP}, #{updateTime,jdbcType=TIMESTAMP}, 
       #{status,jdbcType=INTEGER})
   </insert>
@@ -130,8 +130,8 @@
       <if test="indexRemark != null">
         index_remark,
       </if>
-      <if test="show != null">
-        `show`,
+      <if test="showStatus != null">
+        show_status,
       </if>
       <if test="complement != null">
         complement,
@@ -207,8 +207,8 @@
       <if test="indexRemark != null">
         #{indexRemark,jdbcType=VARCHAR},
       </if>
-      <if test="show != null">
-        #{show,jdbcType=INTEGER},
+      <if test="showStatus != null">
+        #{showStatus,jdbcType=INTEGER},
       </if>
       <if test="complement != null">
         #{complement,jdbcType=VARCHAR},
@@ -284,8 +284,8 @@
       <if test="indexRemark != null">
         index_remark = #{indexRemark,jdbcType=VARCHAR},
       </if>
-      <if test="show != null">
-        `show` = #{show,jdbcType=INTEGER},
+      <if test="showStatus != null">
+        show_status = #{showStatus,jdbcType=INTEGER},
       </if>
       <if test="complement != null">
         complement = #{complement,jdbcType=VARCHAR},
@@ -323,7 +323,7 @@
       update_rate = #{updateRate,jdbcType=VARCHAR},
       update_rate_remark = #{updateRateRemark,jdbcType=VARCHAR},
       index_remark = #{indexRemark,jdbcType=VARCHAR},
-      `show` = #{show,jdbcType=INTEGER},
+      show_status = #{showStatus,jdbcType=INTEGER},
       complement = #{complement,jdbcType=VARCHAR},
       create_time = #{createTime,jdbcType=TIMESTAMP},
       update_time = #{updateTime,jdbcType=TIMESTAMP},

gic-data-cloud-service/src/test/java/com/gic/enterprise/service/outer/EnterpriseApiServiceImplTest.java

 package com.gic.enterprise.service.outer;
 
-import com.gic.cloud.constants.FunctionEnum;
-import com.gic.cloud.dto.AccountGroupDTO;
-import com.gic.cloud.dto.DataAuthDTO;
-import com.gic.cloud.dto.FunctionDTO;
-import com.gic.cloud.service.DataAuthApiService;
-import com.gic.cloud.service.FunctionApiService;
-import org.junit.Test;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.test.context.ContextConfiguration;
 import org.springframework.test.context.junit4.AbstractJUnit4SpringContextTests;
 
-import com.alibaba.fastjson.JSON;
-import com.gic.cloud.service.AccountGroupApiService;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
 /**
  * @author guojx
  * @date 2019/7/16 6:31 PM
  */
 @ContextConfiguration(locations = {"classpath:applicationContext-conf.xml"})
 public class EnterpriseApiServiceImplTest extends AbstractJUnit4SpringContextTests{
-    @Autowired
-    private AccountGroupApiService accountGroupApiService;
-    @Autowired
-    private FunctionApiService functionApiService;
-    @Autowired
-    private DataAuthApiService dataAuthApiService;
-
-    @Test
-    public void saveEnterprise() throws Exception {
-//        EnterpriseDTO dto = new EnterpriseDTO();
-//
-//        ServiceResponse response = enterpriseApiService.saveEnterprise(dto);
-//        if (!response.isSuccess()) {
-//            System.out.println(response.getMessage());
-//        }
-        DataAuthDTO dto = new DataAuthDTO().setEnterpriseId(1129).setDataAuthName("guojx");
-        System.out.println(JSON.toJSONString(dataAuthApiService.pageDataAuth(1129, null, null, null)));
 
 
-    }
 
 }
\ No newline at end of file