Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java

src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java

@@ -4,8 +4,12 @@ import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.common.utils.FileExport;
 import com.pms.ocp.common.utils.FileUtil;
 
-
+import com.pms.ocp.model.QueryResponseResult;
+import com.pms.ocp.model.dto.ApiBaseDto;
+import com.pms.ocp.model.dto.ApiTreeGroupDto;
+import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
+import com.pms.ocp.model.entity.OcpApiGroup;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 
@@ -182,4 +186,29 @@ public class ApiBasicManagementController {
 
     }
 
+    @ApiOperation("服务列表")
+    @GetMapping("/apiListQuery")
+    public QueryResponseResult apiListQuery(HttpServletRequest request, ApiBaseDto ApiBaseReq) {
+            QueryResponseResult apiBaseList=  apiBasicManagementService.getBaseByGroupCode(ApiBaseReq);
+      return apiBaseList;
+    }
+    //@ApiOperation("服务树一级")
+    //@GetMapping("/apiBaseTree")
+    public ResponseVO<List<OcpApiGroup>> apiBaseTree(String apiGroupCompanyCode) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTree(apiGroupCompanyCode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
+
+    @ApiOperation("服务树层级")
+    @GetMapping("/apiBaseTreeOther")
+    public ResponseVO<List<OcpApiGroup>> apiBaseTreeOther(String apiGroupCompanyCode,String apiGroupPcode) {
+        List<OcpApiGroup> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupPcode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
+    @ApiOperation("服务列表树最低级")
+    @GetMapping("/apiBaseTreeApiList")
+    public ResponseVO<List<OcpApiBase>> apiBaseTreeApiList(String apiGroupCompanyCode,String apiGroupPcode) {
+        List<OcpApiBase> apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode,apiGroupPcode);
+        return ResponseVO.ok(apiTreeGroupDtos);
+    }
 }

src/main/resources/mapper/OcpApiGroupMapper.xml

@@ -19,7 +19,14 @@
     </resultMap>
 
     <select id="selectTreeList" resultType="com.pms.ocp.model.entity.OcpApiGroup">
-        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where api_group_pcode is null
+        select api_group_code,api_group_name,api_group_pcode,api_group_level from ocp_api_group where where is_delete = 0
+
+        <if test="apiGroupPcode == null">
+            and  api_group_pcode is null
+        </if>
+        <if test="apiGroupPcode!=null and apiGroupPcode!=''">
+            and api_group_pcode = #{apiGroupPcode}
+        </if>
         <if test="apiGroupCompanyCode!=null and apiGroupCompanyCode!=''">
             and api_group_company_code =#{apiGroupCompanyCode}
         </if>