Merge branch 'developer' of…

Merge branch 'developer' of http://115.159.76.241/base_platform_enterprise/gic-data-cloud into developer

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

@@ -15,6 +15,7 @@ public class IndexQO extends PageQO implements Serializable {
     private String moduleId;
     private Integer isAppIndex;
     private String search;
+    private Integer indexLevel;
     private Integer indexGroupId;
     private List<Integer> indexIdList;
 
@@ -65,4 +66,12 @@ public class IndexQO extends PageQO implements Serializable {
     public void setIndexGroupId(Integer indexGroupId) {
         this.indexGroupId = indexGroupId;
     }
+
+    public Integer getIndexLevel() {
+        return indexLevel;
+    }
+
+    public void setIndexLevel(Integer indexLevel) {
+        this.indexLevel = indexLevel;
+    }
 }

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

@@ -60,7 +60,7 @@ public interface IndexApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.util.List<com.gic.cloud.dto.IndexDTO>>
      * @throws 
      */
-    ServiceResponse<List<IndexDTO>> listAllIndex();
+    ServiceResponse<List<IndexDTO>> listAllIndex(IndexQO indexQO);
 
     /**
      * @Title: delete

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

@@ -85,7 +85,7 @@ public class IndexController {
 
     @RequestMapping("/list-all-index")
     public RestResponse listAllIndex(IndexQO indexQO) {
-        ServiceResponse<List<IndexDTO>> serviceResponse = indexApiService.listAllIndex();
+        ServiceResponse<List<IndexDTO>> serviceResponse = indexApiService.listAllIndex(indexQO);
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
@@ -110,7 +110,7 @@ public class IndexController {
         String realName = UserUtils.getUser().getRealName();
         List<Integer> indexIdList;
         if ("all".equals(indexIds)) {
-            List<IndexDTO> list = indexApiService.listAllIndex().getResult();
+            List<IndexDTO> list = indexApiService.listAllIndex(new IndexQO()).getResult();
             indexIdList = list.stream().map(IndexDTO::getIndexId).collect(Collectors.toList());
         } else {
             indexIdList = Stream.of(indexIds.split(",")).map(Integer::valueOf).collect(Collectors.toList());

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

@@ -79,7 +79,7 @@ public class IndexServiceImpl implements IndexService {
 
     @Override
     public List<TabIndex> listAllIndex(IndexQO indexQO) {
-        return tabIndexMapper.listIndex(new IndexQO());
+        return tabIndexMapper.listIndex(indexQO);
     }
 
     @Override

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

@@ -133,8 +133,8 @@ public class IndexApiServiceImpl implements IndexApiService {
     }
 
     @Override
-    public ServiceResponse<List<IndexDTO>> listAllIndex() {
-        List<TabIndex> tabIndices = indexService.listAllIndex(new IndexQO());
+    public ServiceResponse<List<IndexDTO>> listAllIndex(IndexQO indexQO) {
+        List<TabIndex> tabIndices = indexService.listAllIndex(indexQO);
         List<IndexDTO> dtoList = EntityUtil.changeEntityListByJSON(IndexDTO.class, tabIndices);
         return EnterpriseServiceResponse.success(dtoList);
     }

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

@@ -378,6 +378,9 @@
     <if test="indexGroupId != null ">
         and (index_group_id = #{indexGroupId} or index_group_id is null)
     </if>
+    <if test="indexLevel != null ">
+        and index_level = #{indexLevel}
+    </if>
     <if test="null != indexIdList and indexIdList.size > 0">
       and index_id in
       <foreach collection="indexIdList" index="index" item="item" open="(" separator="," close=")">