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 indexGroupId;
     private List<Integer> indexIdList;
 
     public Integer getClassifyType() {
@@ -56,4 +57,12 @@ public class IndexQO extends PageQO implements Serializable {
     public List<Integer> getIndexIdList() {
         return indexIdList;
     }
+
+    public Integer getIndexGroupId() {
+        return indexGroupId;
+    }
+
+    public void setIndexGroupId(Integer indexGroupId) {
+        this.indexGroupId = indexGroupId;
+    }
 }

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

@@ -83,6 +83,12 @@ public class IndexController {
         return ResultControllerUtils.commonResult(serviceResponse);
     }
 
+    @RequestMapping("/list-all-index")
+    public RestResponse listAllIndex(IndexQO indexQO) {
+        ServiceResponse<List<IndexDTO>> serviceResponse = indexApiService.listAllIndex();
+        return ResultControllerUtils.commonResult(serviceResponse);
+    }
+
     @RequestMapping("/index-log")
     public RestResponse indexLog(Integer indexId) {
         ServiceResponse<List<IndexLogDTO>> serviceResponse = indexLogApiService.listIndexLog(indexId);

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

@@ -375,6 +375,9 @@
     <if test="search != null and search != '' ">
         and name like concat('%', #{search}, '%')
     </if>
+    <if test="indexGroupId != null ">
+        and (index_group_id = #{indexGroupId} or index_group_id is null)
+    </if>
     <if test="null != indexIdList and indexIdList.size > 0">
       and index_id in
       <foreach collection="indexIdList" index="index" item="item" open="(" separator="," close=")">