指标修改moduleId取值

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

@@ -65,6 +65,8 @@ public class IndexDescDTO implements Serializable {
     private Integer indexDescEnterpriseId;
 
     private Integer updateTipsId;
+
+    private String remark;
     private int seq;
 
     public Integer getIndexDescId() {
@@ -189,4 +191,12 @@ public class IndexDescDTO implements Serializable {
     public void setUnit(String unit) {
         this.unit = unit;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }

gic-data-cloud-api/src/main/java/com/gic/cloud/service/IndexDescApiService.java

@@ -114,4 +114,14 @@ public interface IndexDescApiService {
      * @throws
      */
     ServiceResponse<Void> eraseUpdateTips(Integer userId, Integer updateTipsId);
+
+    /**
+     * 查询全部
+     * @Title: listAll
+     * @Description:
+     * @author zhiwj
+     * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDescDTO>>
+     * @throws
+     */
+    ServiceResponse<List<IndexDescDTO>> listAllUnRel();
 }

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

 package com.gic.cloud.operation.web.controller;
 
-import com.alibaba.fastjson.JSON;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.authcenter.security.core.dto.UserDetailsVO;
 import com.gic.authcenter.security.core.util.UserUtils;
 import com.gic.cloud.constants.IndexTypeEnum;
 import com.gic.cloud.dto.IndexDTO;
+import com.gic.cloud.dto.IndexDescDTO;
 import com.gic.cloud.dto.IndexLogDTO;
 import com.gic.cloud.operation.web.vo.IndexVO;
+import com.gic.cloud.operation.web.vo.ModuleVO;
 import com.gic.cloud.qo.IndexQO;
 import com.gic.cloud.service.IndexApiService;
+import com.gic.cloud.service.IndexDescApiService;
 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;
-import com.gic.redis.data.util.RedisUtil;
 import com.google.common.collect.Lists;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
@@ -39,6 +41,8 @@ public class IndexController {
     private IndexApiService indexApiService;
     @Autowired
     private IndexLogApiService indexLogApiService;
+    @Autowired
+    private IndexDescApiService indexDescApiService;
 
 
     @RequestMapping("/save-index")
@@ -129,11 +133,16 @@ public class IndexController {
 
     @RequestMapping("/module-list")
     public RestResponse moduleList() {
-        Object cache = RedisUtil.getCache("enterprise:datacloud:moduleList");
-        if (cache != null) {
-            return RestResponse.success(JSON.parseArray(cache.toString()));
+        ServiceResponse<List<IndexDescDTO>> serviceResponse = indexDescApiService.listAllUnRel();
+        List<IndexDescDTO> list = serviceResponse.getResult();
+        List<ModuleVO> moduleVOList = new ArrayList<>();
+        for (IndexDescDTO indexDescDTO : list) {
+            ModuleVO moduleVO = new ModuleVO();
+            moduleVO.setModuleId(indexDescDTO.getIndexDescId().toString());
+            moduleVO.setName(indexDescDTO.getRemark() + "-" + indexDescDTO.getModuleId() + "-" + indexDescDTO.getIndexName());
+            moduleVOList.add(moduleVO);
         }
-        return RestResponse.success();
+        return RestResponse.success(moduleVOList);
     }
 
 }
\ No newline at end of file

gic-data-cloud-operation-web/src/main/java/com/gic/cloud/operation/web/vo/ModuleVO.java

+package com.gic.cloud.operation.web.vo;
+
+import java.io.Serializable;
+
+/**
+ * @author zhiwj
+ * @Description:
+ * @date 2020-08-17 14:42
+ */
+public class ModuleVO implements Serializable {
+    private static final long serialVersionUID = -7673158503429785997L;
+
+    private String name;
+    private String moduleId;
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public String getModuleId() {
+        return moduleId;
+    }
+
+    public void setModuleId(String moduleId) {
+        this.moduleId = moduleId;
+    }
+}

gic-data-cloud-operation-web/src/main/resources/dubbo-gic-data-cloud-operation-web.xml

@@ -94,6 +94,7 @@
     <dubbo:reference interface="com.gic.member.config.api.service.MemberCardApiService" id="memberCardApiService" timeout="6000" />
 
     <dubbo:reference interface="com.gic.cloud.service.IndexApiService" id="indexApiService" timeout="6000" retries="0"/>
+    <dubbo:reference interface="com.gic.cloud.service.IndexDescApiService" id="indexDescApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.IndexLogApiService" id="indexLogApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.IndexGroupApiService" id="indexGroupApiService" timeout="6000" retries="0"/>
     <dubbo:reference interface="com.gic.cloud.service.DataExplainApiService" id="dataExplainApiService" timeout="6000" retries="0"/>

gic-data-cloud-service/src/main/java/com/gic/cloud/dao/mapper/TabIndexDescMapper.java

@@ -61,5 +61,5 @@ public interface TabIndexDescMapper {
 
 //    List<IndexDescDTO> listRecycle(@Param("enterpriseId") Integer enterpriseId, @Param("moduleId") String moduleId, @Param("indexGroupName") String indexGroupName, @Param("userId") Integer userId);
 
-    List<TabIndexDesc> listAll();
+    List<TabIndexDesc> listAllUnRel(@Param("ids") List<Integer> relIndexDescIdList);
 }
\ No newline at end of file

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

@@ -46,6 +46,8 @@ public class TabIndexDesc {
      */
     private Date updateTime;
 
+    private String remark;
+
     public Integer getIndexDescId() {
         return indexDescId;
     }
@@ -109,4 +111,12 @@ public class TabIndexDesc {
     public void setUpdateTime(Date updateTime) {
         this.updateTime = updateTime;
     }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
 }
\ No newline at end of file

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexDescService.java

@@ -22,4 +22,6 @@ public interface IndexDescService {
     void sort(Integer enterpriseId, String moduleId, String indexGroupName, Integer indexDescEnterpriseId, Integer seq);
 
     TabIndexDesc getIndexDesc(Integer enterpriseId, Integer indexDescId);
+
+    List<TabIndexDesc> listAllUnRel(List<Integer> relModuleIdList);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/IndexModuleRelService.java

@@ -20,4 +20,6 @@ public interface IndexModuleRelService {
     void deleteByBusinessId(Integer businessId, Integer type);
 
     Map<Integer, List<String>> groupModuleIdByBusinessIds(List<Integer> indexIdList, Integer type);
+
+    List<String> listRelModuleId(Integer type);
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexDescServiceImpl.java

@@ -51,4 +51,9 @@ public class IndexDescServiceImpl implements IndexDescService {
     public TabIndexDesc getIndexDesc(Integer enterpriseId, Integer indexDescId) {
         return tabIndexDescMapper.selectByPrimaryKey(indexDescId);
     }
+
+    @Override
+    public List<TabIndexDesc> listAllUnRel(List<Integer> relModuleIdList) {
+        return tabIndexDescMapper.listAllUnRel(relModuleIdList);
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/impl/IndexModuleRelServiceImpl.java

@@ -69,4 +69,11 @@ public class IndexModuleRelServiceImpl implements IndexModuleRelService {
                 .collect(Collectors.groupingBy(TabIndexModuleRel::getBusinessId,
                         Collectors.mapping(TabIndexModuleRel::getModuleId, Collectors.toList())));
     }
+
+    @Override
+    public List<String> listRelModuleId(Integer type) {
+        List<TabIndexModuleRel> relList = tabIndexModuleRelMapper.listModuleIdByBusinessIds(null, type);
+        return Optional.ofNullable(relList).orElse(Collections.emptyList())
+                .stream().map(TabIndexModuleRel::getModuleId).collect(Collectors.toList());
+    }
 }

gic-data-cloud-service/src/main/java/com/gic/cloud/service/outer/impl/IndexDescApiServiceImpl.java

 package com.gic.cloud.service.outer.impl;
 
 import com.gic.api.base.commons.ServiceResponse;
+import com.gic.cloud.constants.LogAndUpdateTipsTypeEnum;
 import com.gic.cloud.dto.IndexDTO;
 import com.gic.cloud.dto.IndexDescDTO;
 import com.gic.cloud.entity.TabIndex;
+import com.gic.cloud.entity.TabIndexDesc;
 import com.gic.cloud.service.*;
 import com.gic.commons.util.EntityUtil;
 import com.gic.enterprise.response.EnterpriseServiceResponse;
@@ -12,7 +14,9 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -31,6 +35,8 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
     private IndexService indexService;
     @Autowired
     private UpdateTipService updateTipService;
+    @Autowired
+    private IndexModuleRelService indexModuleRelService;
 
     @Override
     public ServiceResponse<List<IndexDescDTO>> listByEnterpriseAndModule(Integer enterpriseId, String moduleId, String indexGroupName) {
@@ -95,4 +101,14 @@ public class IndexDescApiServiceImpl implements IndexDescApiService {
         updateTipService.erase(userId, updateTipsId, 1);
         return EnterpriseServiceResponse.success();
     }
+
+    @Override
+    public ServiceResponse<List<IndexDescDTO>> listAllUnRel() {
+        List<String> relModuleIdList = indexModuleRelService.listRelModuleId(LogAndUpdateTipsTypeEnum.INDEX.getCode());
+        List<Integer> indexDescIdList = Optional.ofNullable(relModuleIdList).orElse(Collections.emptyList())
+                .stream().map(Integer::valueOf).collect(Collectors.toList());
+        List<TabIndexDesc> indexDescList = this.indexDescService.listAllUnRel(indexDescIdList);
+        List<IndexDescDTO> indexDescDTOList = EntityUtil.changeEntityListByJSON(IndexDescDTO.class, indexDescList);
+        return EnterpriseServiceResponse.success(indexDescDTOList);
+    }
 }

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

@@ -23,7 +23,7 @@
   </resultMap>
   <sql id="Base_Column_List">
     index_desc_id, module_id, index_name, index_code, index_group_name, status, create_time, 
-    update_time
+    update_time, remark
   </sql>
   <sql id="DTO_List" >
     ${alias}.index_desc_id, ${alias}.module_id, ${alias}.index_name, ${alias}.index_code, ${alias}.index_group_name,
@@ -167,7 +167,7 @@
     ,t4.update_tips_id updateTipsId
     from tab_index_desc t1
     left join tab_index_desc_enterprise t2 on t1.index_desc_id = t2.index_desc_id
-    left join tab_index t3 on t1.index_code = t3.code
+    left join tab_index t3 on t1.index_desc_id = t3.module_id
     left join tab_update_tips t4 on t3.index_id = t4.business_id
     where t1.status = 1
     and t2.enterprise_id = #{enterpriseId}
@@ -201,9 +201,16 @@
     and t2.index_status = 0
   </select>-->
 <!--  List<IndexDescDTO> listAll();-->
-  <select id="listAll" resultMap="BaseResultMap">
+  <select id="listAllUnRel" resultMap="BaseResultMap">
     select
     <include refid="Base_Column_List" />
-    from tab_index_desc
+    from tab_index_desc where status = 1 
+    <if test="null != ids and ids.size > 0">
+      and index_desc_id not in
+      <foreach collection="ids" index="index" item="item" open="(" separator="," close=")">
+        #{item}
+      </foreach>
+    </if>
+    order by module_id, id
   </select>
 </mapper>
\ No newline at end of file