服务库服务基础管理接口-修改版

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

@@ -33,6 +33,7 @@ public class TenantBasicManagementController {
     @ApiOperation("条件查询")
     @GetMapping("/queryOcpTenantBaseDto")
     public ResponseVO<List<OcpTenantBaseDto>> queryOcpTenantBaseDto(
+            @RequestParam(required = false) String tenantGroupCode,
             @RequestParam(required = false) String tenantCode,
             @RequestParam(required = false) String keyword,
             @RequestParam(required = false) String tenantUnit,
@@ -41,27 +42,27 @@ public class TenantBasicManagementController {
             @RequestParam(required = false) Integer pageSize,
             @RequestParam(required = false) Integer pageNum
     ) {
-        List<OcpTenantBaseDto> ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto(tenantCode, keyword, tenantUnit, startTime, endTime, pageSize
-                , pageNum);
+
+
+        List<OcpTenantBaseDto> ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto(tenantGroupCode,tenantCode, keyword, tenantUnit, startTime, endTime, pageSize, pageNum);
         return ResponseVO.ok(ocpTenantBaseDto);
     }
 
     @ApiOperation("应用发布")
     @PostMapping("/issue")
     public ResponseVO TenantIssue(
-                                  @RequestParam(required = false) String tenantCodes) {
+            @RequestParam(required = false) String tenantCodes) {
 
-            return tenantBasicManagementService.tenantIssue(tenantCodes);
+        return tenantBasicManagementService.tenantIssue(tenantCodes);
     }
 
     @ApiOperation("应用订阅")
     @PostMapping("/login")
     public ResponseVO TenantLogin(
-                                  @RequestParam(required = false) String tenantCodes,
-                                  @RequestParam(required = false) String companyCode) {
-
-        return   tenantBasicManagementService.tenantLogin(tenantCodes,companyCode);
+            @RequestParam(required = false) String tenantCodes,
+            @RequestParam(required = false) String companyCode) {
 
+        return tenantBasicManagementService.tenantLogin(tenantCodes, companyCode);
 
     }
 
@@ -74,23 +75,32 @@ public class TenantBasicManagementController {
     }
 
     @ApiOperation("应用注册")
-        @PostMapping("/apply/register")
+    @PostMapping("/apply/register")
     public ResponseVO TenantRegister(@RequestBody(required = false) OcpTenantBaseDto ocpTenantBaseDto) {
         return tenantBasicManagementService.applyRegister(ocpTenantBaseDto);
 
     }
+
     @ApiOperation("应用树层级")
     @GetMapping("/tenantBaseTreeOther")
-        public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) {
-        List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode);
+    public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) {
+        List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
         return ResponseVO.ok(ocpApiGroups);
     }
 
     @ApiOperation("应用列表")
-        @GetMapping("/tenantListQuery")
+    @GetMapping("/tenantListQuery")
     public ResponseVO<PageInfo<OcpTenantBaseDto>> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) {
 
-        return  tenantBasicManagementService.getBaseByGroupCode(tenantDto);
+        return tenantBasicManagementService.getBaseByGroupCode(tenantDto);
+    }
+
+    @ApiOperation("应用树层级2")
+    @GetMapping("/baseTreeOther")
+    public ResponseVO<List<GroupDto>> baseTreeOther(@RequestParam(required = false) String tenantGroupCode) {
+        List<GroupDto> list = tenantBasicManagementService.baseTreeOther(tenantGroupCode);
+        return ResponseVO.ok(list);
+
     }
 
 

src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java

@@ -6,6 +6,7 @@ import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
 import com.pms.ocp.model.entity.OcpTenantGroup;
+import com.pms.ocp.model.vo.ResponseVO;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -16,4 +17,6 @@ public interface OcpTenantGroupMapper extends BaseMapper<OcpTenantGroup> {
     List<GroupDto> tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode);
 
     List<OcpTenantBaseDto> selectPageLists(TenantDto tenantDto);
+
+    List<GroupDto> selectAll();
 }

src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java

 package com.pms.ocp.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.dto.GroupDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
 import org.apache.ibatis.annotations.Mapper;
@@ -13,5 +14,7 @@ import java.util.List;
 public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
 
 
-   List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
+   List<OcpTenantBaseDto> queryOcpTenantBaseDto(@Param("keyword") String keyword,@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantUnit") String tenantUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("tenantCode") String tenantCode, @Param("pageSize") Integer pageSize, @Param("pageNum") Integer pageNum);
+
+    List<GroupDto> select(String tenantGroupCode);
 }

src/main/java/com/pms/ocp/model/dto/GroupDto.java

@@ -28,4 +28,28 @@ public class GroupDto extends OcpTenantGroup implements Serializable {
      */
     @ApiModelProperty("应用分类代码")
     private String tenantGroupCode;
+
+    public String getTenantName() {
+        return tenantName;
+    }
+
+    public void setTenantName(String tenantName) {
+        this.tenantName = tenantName;
+    }
+
+    public String getTenantCode() {
+        return tenantCode;
+    }
+
+    public void setTenantCode(String tenantCode) {
+        this.tenantCode = tenantCode;
+    }
+
+    public String getTenantGroupCode() {
+        return tenantGroupCode;
+    }
+
+    public void setTenantGroupCode(String tenantGroupCode) {
+        this.tenantGroupCode = tenantGroupCode;
+    }
 }

src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java

@@ -105,11 +105,11 @@ public class OcpTenantBase implements Serializable {
      */
     @ApiModelProperty("应用状态0:设计态；1:运行态")
     private Short tenantState;
-    /**
-     * 推广类型0:统建；1:自建
-     */
-    @ApiModelProperty("推广类型0:统建；1:自建")
-    private long tenantPromotion;
+//    /**
+//     * 推广类型0:统建；1:自建
+//     */
+//    @ApiModelProperty("推广类型0:统建；1:自建")
+//    private long tenantPromotion;
     /**
      * 建设单位
      */

src/main/java/com/pms/ocp/service/TenantBasicManagementService.java

@@ -26,7 +26,7 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @param pageNum
      * @return
      */
-    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode,String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum);
 
     /**
      * 应用发布 改变其应用状态
@@ -68,4 +68,19 @@ public interface TenantBasicManagementService extends IService<OcpTenantBase> {
      * @return
      */
     ResponseVO<PageInfo<OcpTenantBaseDto>> getBaseByGroupCode(TenantDto tenantDto);
+    /**
+     * 应用树
+     * @param tenantGroupCode
+     * @return
+     */
+    List<GroupDto> baseTreeOther(String tenantGroupCode);
+
+
+
+
+    /**
+     * 应用树
+     * @param tenantGroupCode
+     */
+
 }

src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java

 package com.pms.ocp.service.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
@@ -9,15 +9,12 @@ import com.pms.ocp.mapper.OcpTenantExtentMapper;
 import com.pms.ocp.mapper.OcpTenantGroupMapper;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.model.dto.GroupDto;
-import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.dto.TenantDto;
 import com.pms.ocp.model.entity.*;
-import com.pms.ocp.model.vo.OcpApiBaseVo;
 import com.pms.ocp.model.vo.ResponseVO;
 import com.pms.ocp.service.*;
 import org.apache.commons.lang3.StringUtils;
-import org.apache.poi.util.StringUtil;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -59,9 +56,12 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      * @return
      */
     @Override
-    public List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
+    public List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantGroupCode,String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, Integer pageSize, Integer pageNum) {
+//        if (pageSize == 0 || pageNum == 0) {
+//            ResponseVO.error("分页参数不能为空");
+//        }
         pageSize = (pageSize - 1) * pageNum;
-        return tenantBasicManagementMapper.queryOcpTenantBaseDto(keyword, tenantUnit, startTime, endTime, tenantCode, pageSize, pageNum);
+        return tenantBasicManagementMapper.queryOcpTenantBaseDto(tenantGroupCode,keyword, tenantUnit, startTime, endTime, tenantCode, pageSize, pageNum);
     }
 
     /**
@@ -241,6 +241,25 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
 
     }
 
+    /**
+     * 应用树2
+     *
+     * @param tenantGroupCode
+     * @return
+     */
+    @Override
+    public List<GroupDto> baseTreeOther(String tenantGroupCode) {
+        List<GroupDto> group = null;
+        if (StringUtils.isBlank(tenantGroupCode)) {
+            group= ocpTenantGroupMapper.selectAll();
+        } else {
+           group= tenantBasicManagementMapper.select(tenantGroupCode);
+            }
+        return group;
+        }
+
+
+
     public void setGroupIdValue(String tenantGroupCompanyCode, String tenantGroupCode) {
         List<String> codes = getIdsByPIdPub(tenantGroupCompanyCode, tenantGroupCode);
         if (codes.size() > 0) {

src/main/resources/mapper/OcpGroup.xml

@@ -17,21 +17,17 @@
 
 
     <select id="tenantBaseTreeOther" resultType="com.pms.ocp.model.dto.GroupDto">
-select otb.tenant_name,
-       otg.tenant_group_code,otg.tenant_group_name,otg.tenant_group_pcode ,otg.tenant_group_level from ocp_tenant_group otg
-       join ocp_tenant_base  otb on otg.tenant_group_code = otb.tenant_group_code
-      otg.is_delete = 0
-        <!--        <if test="tenantGroupCode == null">-->
-        <!--            and tenant_group_pcode is null-->
-        <!--        </if>-->
-        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
-            and otg.tenant_group_company_code=#{tenantGroupCompanyCode}
+        select
+        tenant_group_code,tenant_group_name,tenant_group_pcode ,tenant_group_level from ocp_tenant_group
+        where is_delete = 0
+        <if test="tenantGroupCode == null">
+            and tenant_group_pcode is null
         </if>
-        <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and otg.tenant_group_pcode=#{tenantGroupCode}
+        <if test="tenantGroupCompanyCode !=null and tenantGroupCompanyCode!=''">
+            and tenant_group_company_code=#{tenantGroupCompanyCode}
         </if>
         <if test="tenantGroupCode !=null and tenantGroupCode!=''">
-            and otb.tenant_group_pcode=#{tenantGroupCode}
+            and tenant_group_pcode=#{tenantGroupCode}
         </if>
 
 
@@ -80,5 +76,10 @@ select otb.tenant_name,
             and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
         </if>
     </select>
+    <select id="selectAll" resultType="com.pms.ocp.model.dto.GroupDto">
 
+        <!--    <select id="selectAll" resultType="java.util.List">-->
+        select tenant_group_name ,tenant_group_code from ocp_tenant_group where is_delete = 0
+        <!--    </select>-->
+    </select>
 </mapper>

src/main/resources/mapper/TenantBasicManagementMapper.xml

@@ -3,16 +3,16 @@
 <mapper namespace="com.pms.ocp.mapper.TenantBasicManagementMapper">
     <resultMap id="ctbMap" type="com.pms.ocp.model.dto.OcpTenantBaseDto">
         <result property="objId" column="obj_id"/>
-        <result property="tenantCode" column="api_code" />
-        <result property="tenantName" column="api_name" />
-        <result property="tenantGroupName" column="cluster_name" />
-        <result property="tenantUrl" column="space_name" />
-        <result property="clusterName" column="api_unit" />
-        <result property="spaceName" column="api_ctime" />
-        <result property="deploymentName" column="api_state" />
-        <result property="tenantZone" column="api_url" />
-        <result property="tenantCtime" column="api_code" />
-        <result property="tenantUnit" column="api_code" />
+        <result property="tenantCode" column="api_code"/>
+        <result property="tenantName" column="api_name"/>
+        <result property="tenantGroupName" column="cluster_name"/>
+        <result property="tenantUrl" column="space_name"/>
+        <result property="clusterName" column="api_unit"/>
+        <result property="spaceName" column="api_ctime"/>
+        <result property="deploymentName" column="api_state"/>
+        <result property="tenantZone" column="api_url"/>
+        <result property="tenantCtime" column="api_code"/>
+        <result property="tenantUnit" column="api_code"/>
     </resultMap>
 
     <select id="queryOcpTenantBaseDto" resultMap="ctbMap">
@@ -26,6 +26,10 @@
             <if test="tenantCode!=null and tenantCode!=''">
                 and otb.tenant_code=#{tenantCode}
             </if>
+            <if test="tenantGroupCode!=null and tenantGroupCode!=''">
+                and otg.tenant_group_code=#{tenantGroupCode}
+            </if>
+
             <if test="tenantCode!=null and tenantCode!=''">
                 and ote.tenant_code=#{tenantCode}
             </if>
@@ -54,4 +58,8 @@
         </where>
         limit #{pageNum} offset #{pageSize}
     </select>
+    <select id="select" resultType="com.pms.ocp.model.dto.GroupDto">
+        select tenant_name from ocp_tenant_base
+       where tenant_group_code =#{tenantGroupCode}
+    </select>
 </mapper>
\ No newline at end of file