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

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

 package com.pms.ocp.controller;
 
-
 import com.pms.ocp.common.utils.ExcelUtils;
 import com.pms.ocp.common.utils.FileExport;
 import com.pms.ocp.common.utils.FileUtil;
@@ -15,22 +14,15 @@ import com.pms.ocp.service.ApiDetailsService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
-
 import org.apache.commons.lang3.StringUtils;
-
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
-
-
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
-import java.io.*;
-import java.net.URLEncoder;
 import java.sql.Timestamp;
 import java.time.LocalDate;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 @Slf4j
@@ -45,15 +37,15 @@ public class ApiBasicManagementController {
 
     @ApiOperation("条件查询")
     @GetMapping("/queryOcpApiBaseDto")
-    public ResponseVO queryOcpApiBaseDto(@RequestParam(required = false) String apiCode,
+    public ResponseVO<List<OcpApiBaseVo>> queryOcpApiBaseDto(@RequestParam(required = false) String apiCode,
                                          @RequestParam(required = false) String keyword,
                                          @RequestParam(required = false) String apiUnits,
                                          @RequestParam(required = false) Timestamp startTime,
                                          @RequestParam(required = false) Timestamp endTime,
-                                         @RequestParam(required = false) int pageSize,
-                                         @RequestParam(required = false) int pageNum
+                                         @RequestParam(required = false) Integer pageSize,
+                                         @RequestParam(required = false) Integer pageNum
     ) {
-       List<OcpApiBaseVo> list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
+        List<OcpApiBaseVo> list = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize
                 , pageNum);
         return ResponseVO.ok(list);
     }
@@ -68,7 +60,6 @@ public class ApiBasicManagementController {
         System.out.println(file);//用来检查前端是否把文件传过来
         //解析excel，
         List<OcpApiBaseVo> personList = FileUtil.importExcel(file, 0, 1, OcpApiBaseVo.class);
-        //也可以使用FileUtil.importExcel(filePath,1,1,FileEntity.class) 导入
         System.out.println("导入数据一共【" + personList.size() + "】行");
         apiBasicManagementService.apiImport(personList);
         return ResponseVO.ok();
@@ -91,12 +82,10 @@ public class ApiBasicManagementController {
         //导出excel
         ExcelUtils.exportExcel(response, excelFileName + LocalDate.now(), ocpApiBaseVoList, OcpApiBaseVo.class);
 
-
-
         return ResponseVO.ok();
     }
 
-//        @ApiOperation("下载模板")
+    //        @ApiOperation("下载模板")
 ////    @GetMapping("/download")
 //    @GetMapping(value = "/download", produces = "text/plain;charset=UTF-8")
 //    public void ApiDownload(HttpServletResponse response) throws IOException {
@@ -187,8 +176,8 @@ public class ApiBasicManagementController {
         if (StringUtils.isEmpty(apiPromotion) || apiPromotion.equals("0")) {
             return ResponseVO.error("统招");
         } else {
-            apiBasicManagementService.apiIssue(apiCodes);
-            return ResponseVO.ok();
+            return apiBasicManagementService.apiIssue(apiCodes);
+
         }
 
     }

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

@@ -7,13 +7,12 @@ import com.pms.ocp.service.TenantBasicManagementService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 @Slf4j
 @RequestMapping("/tenant/basic")
@@ -22,18 +21,59 @@ import java.sql.Timestamp;
 public class TenantBasicManagementController {
     @Autowired
     private TenantBasicManagementService tenantBasicManagementService;
+
     @ApiOperation("条件查询")
     @GetMapping("/queryOcpTenantBaseDto")
-    public ResponseVO queryOcpTenantBaseDto(
+    public ResponseVO<List<OcpTenantBaseDto>> queryOcpTenantBaseDto(
+            @RequestParam(required = false) String tenantCode,
             @RequestParam(required = false) String keyword,
-                                         @RequestParam(required = false) String tenantUnits,
+            @RequestParam(required = false) String tenantUnit,
             @RequestParam(required = false) Timestamp startTime,
             @RequestParam(required = false) Timestamp endTime,
-                                         @RequestParam(required = false) int pageSize,
-                                         @RequestParam(required = false) int pageNum
+            @RequestParam(required = false) Integer pageSize,
+            @RequestParam(required = false) Integer pageNum
     ) {
-        OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize
+        List<OcpTenantBaseDto> ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto(tenantCode, keyword, tenantUnit, startTime, endTime, pageSize
                 , pageNum);
         return ResponseVO.ok(ocpTenantBaseDto);
     }
+
+    @ApiOperation("应用发布")
+    @PostMapping("/issue")
+    public ResponseVO TenantIssue(@RequestParam(required = false) String tenantPromotion,
+                                  @RequestParam(required = false) String tenantCodes) {
+        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
+            return ResponseVO.error("统招");
+        } else {
+            return tenantBasicManagementService.tenantIssue(tenantCodes);
+        }
+    }
+
+    @ApiOperation("应用订阅")
+    @PostMapping("/login")
+    public ResponseVO TenantLogin(@RequestParam(required = false) String tenantPromotion,
+                                  @RequestParam(required = false) String tenantCodes) {
+        if (StringUtils.isEmpty(tenantPromotion) || tenantPromotion.equals("0")) {
+            return ResponseVO.error("统招");
+        } else {
+            tenantBasicManagementService.tenantLogin(tenantCodes);
+            return ResponseVO.ok();
+        }
+
+    }
+
+    @ApiOperation("应用下线")
+    @PostMapping("/cancel")
+    public ResponseVO TenantCancel(
+            @RequestParam(required = false) String tenantCodes) {
+        return tenantBasicManagementService.tenantCancel(tenantCodes);
+
+    }
+    @ApiOperation("应用注册")
+    @PostMapping("/apply/register")
+    public ResponseVO TenantRegister(@RequestBody(required = false) OcpTenantBaseDto ocpTenantBaseDto){
+
+        return ResponseVO.ok();
+    }
+
 }

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OcpTenantExtentMapper extends  BaseMapper<OcpTenantExtent>{
+}

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

+package com.pms.ocp.mapper;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.pms.ocp.model.entity.OcpTenantSubs;
+import org.apache.ibatis.annotations.Mapper;
+
+@Mapper
+public interface OcpTenantSubsMapper extends BaseMapper<OcpTenantSubs> {
+}

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

@@ -11,5 +11,7 @@ import java.util.List;
 
 @Mapper
 public interface TenantBasicManagementMapper extends BaseMapper<OcpTenantBase> {
-    OcpTenantBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword, @Param("list") List<String> list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum);
+
+
+   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);
 }

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

@@ -14,12 +14,14 @@ import java.io.Serializable;
 @NoArgsConstructor
 @ApiModel(value = "应用信息表dto")
 public class OcpTenantBaseDto extends OcpTenantBase implements Serializable {
+
     @ApiModelProperty("应用分类名称")
     private String tenantGroupName;
     @ApiModelProperty("集群名称")
     private String clusterName;
     @ApiModelProperty("命名空间")
     private String spaceName;
-    @ApiModelProperty("部署名称")
-    private String deploymentName;
+    @ApiModelProperty("服务编码字符串")
+    private String apiCodes;
+
 }

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

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

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

@@ -78,7 +78,7 @@ public class OcpTenantExtent implements Serializable {
     /**
      * 应用状态 0:已发布 1:未发布
      */
-    @ApiModelProperty("应用状态 0:已发布 1:未发布")
+    @ApiModelProperty("应用状态 0:已发布 1:未发布 2:已下线")
     private Short tenantState;
 
     /**

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

@@ -6,6 +6,7 @@ import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiExtent;
 import com.pms.ocp.model.vo.OcpApiBaseVo;
+import com.pms.ocp.model.vo.ResponseVO;
 
 import java.sql.Timestamp;
 import java.util.List;
@@ -53,7 +54,7 @@ public interface ApiBasicManagementService extends IService<OcpApiBase> {
      * 服务发布
      * @param apiCodes
      */
-    void apiIssue(String apiCodes);
+    ResponseVO apiIssue(String apiCodes);
 
 
 }

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+
+public interface OcpTenantExtentService extends IService<OcpTenantExtent> {
+}

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

+package com.pms.ocp.service;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.pms.ocp.model.entity.OcpTenantSubs;
+
+public interface OcpTenantSubsService extends IService<OcpTenantSubs> {
+}

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

@@ -3,19 +3,41 @@ package com.pms.ocp.service;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.vo.ResponseVO;
 
 import java.sql.Timestamp;
+import java.util.List;
 
 public interface TenantBasicManagementService extends IService<OcpTenantBase> {
     /**
-     * 应用条件查询
+     * 条件查询
+     * @param tenantCode
      * @param keyword
-     * @param tenantUnits
+     * @param tenantUnit
      * @param startTime
      * @param endTime
      * @param pageSize
      * @param pageNum
      * @return
      */
-    OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+    List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum);
+
+    /**
+     * 应用发布 改变其应用状态
+     * @param tenantCodes 应用代码
+     * @return
+     */
+    ResponseVO tenantIssue(String tenantCodes);
+
+    /**
+     * 应用订阅
+     * @param tenantCodes
+     */
+    void tenantLogin(String tenantCodes);
+
+    /**
+     * 应用下线
+     * @param tenantCodes
+     */
+    ResponseVO tenantCancel(String tenantCodes);
 }

src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.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.extension.service.impl.ServiceImpl;
-import com.pms.ocp.common.exception.BeagleException;
 import com.pms.ocp.mapper.ApiBasicManagementMapper;
 import com.pms.ocp.mapper.OcpApiExtentMapper;
-import com.pms.ocp.model.dto.ApiBaseDto;
-import com.pms.ocp.model.dto.OcpApiBaseDto;
+import com.pms.ocp.mapper.OcpApiSubsMapper;
 import com.pms.ocp.model.entity.OcpApiBase;
 import com.pms.ocp.model.entity.OcpApiExtent;
 import com.pms.ocp.model.entity.OcpApiSubs;
@@ -33,7 +30,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
     @Autowired
     private ApiBasicManagementMapper apiBasicManagementMapper;
     @Autowired
-    private OcpApiSubsService ocpApiSubsService;
+    private OcpApiSubsMapper ocpApiSubsMapper;
     @Autowired
     private OcpApiExtentService ocpApiExtentService;
     @Autowired
@@ -77,26 +74,26 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
             ocpApiSubs.setSubsLogApiUserId(null);
             ocpApiSubs.setSubsLogApiAtime(Timestamp.valueOf(LocalDateTime.now()));
             ocpApiSubs.setSubsCompanyCode(null);
-           // ocpApiSubsService.save(ocpApiSubs);
+            ocpApiSubsMapper.insert(ocpApiSubs);
         }
     }
-
-    @Override
-    public List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
-        pageSize = (pageSize - 1) * pageNum;
-        return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum);
-    }
-
     /**
      * 条件查询
      *
      * @param apiCode
      * @param keyword
-     * @param apiUnits
+     * @param apiUnit
      * @param startTime
      * @param endTime
      * @return
      */
+    @Override
+    public List<OcpApiBaseVo> queryOcpApiBaseDto(String apiCode, String keyword, String apiUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
+        pageSize = (pageSize - 1) * pageNum;
+        return apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnit, startTime, endTime, apiCode, pageSize, pageNum);
+    }
+
+
 //    public OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
 //        //String[] split = apiUnits.split(",");
 ////        List<String> list = Arrays.asList(split);
@@ -143,7 +140,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
      *
      * @param apiCodes
      */
-    public void apiIssue(String apiCodes) {
+    public ResponseVO apiIssue(String apiCodes) {
         String[] split = apiCodes.split(",");
         List<String> list = Arrays.asList(split);
         LambdaQueryWrapper<OcpApiExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
@@ -151,13 +148,13 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl<ApiBasicManagemen
         List<OcpApiExtent> ocpApiExtents = ocpApiExtentMapper.selectList(lambdaQueryWrapper);
         for (OcpApiExtent ocpApiExtent : ocpApiExtents) {
             if (ocpApiExtent.getApiState().equals("1")) {
-                throw new BeagleException("已发布");
+                return ResponseVO.error("已发布");
             } else {
                 ocpApiExtent.setApiState("1");
                 ocpApiExtentMapper.updateById(ocpApiExtent);
             }
         }
-
+        return ResponseVO.ok();
     }
 
 }

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

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.IService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantExtentMapper;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+import com.pms.ocp.service.OcpTenantExtentService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OcpTenantExtentServiceImpl extends ServiceImpl<OcpTenantExtentMapper, OcpTenantExtent> implements OcpTenantExtentService {
+}

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

+package com.pms.ocp.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantSubsMapper;
+import com.pms.ocp.model.entity.OcpTenantSubs;
+import com.pms.ocp.service.OcpTenantExtentService;
+import com.pms.ocp.service.OcpTenantSubsService;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OcpTenantSubsServiceImpl extends ServiceImpl<OcpTenantSubsMapper, OcpTenantSubs> implements OcpTenantSubsService {
+}

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.extension.service.impl.ServiceImpl;
+import com.pms.ocp.mapper.OcpTenantExtentMapper;
 import com.pms.ocp.mapper.TenantBasicManagementMapper;
 import com.pms.ocp.model.dto.OcpApiBaseDto;
 import com.pms.ocp.model.dto.OcpTenantBaseDto;
+import com.pms.ocp.model.entity.OcpApiExtent;
 import com.pms.ocp.model.entity.OcpTenantBase;
+import com.pms.ocp.model.entity.OcpTenantExtent;
+import com.pms.ocp.model.entity.OcpTenantSubs;
+import com.pms.ocp.model.vo.ResponseVO;
+import com.pms.ocp.service.OcpTenantExtentService;
+import com.pms.ocp.service.OcpTenantSubsService;
 import com.pms.ocp.service.TenantBasicManagementService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.sql.Timestamp;
+import java.time.LocalDateTime;
 import java.util.Arrays;
 import java.util.List;
 
@@ -18,10 +27,17 @@ import java.util.List;
 public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicManagementMapper, OcpTenantBase> implements TenantBasicManagementService {
     @Autowired
     private TenantBasicManagementMapper tenantBasicManagementMapper;
+    @Autowired
+    private OcpTenantExtentMapper ocpTenantExtentMapper;
+    @Autowired
+    private OcpTenantSubsService ocpTenantSubsService;
+
     /**
-     * 应用条件查询
+     * 条件查询
+     *
+     * @param tenantCode
      * @param keyword
-     * @param tenantUnits
+     * @param tenantUnit
      * @param startTime
      * @param endTime
      * @param pageSize
@@ -29,11 +45,76 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
      * @return
      */
     @Override
-    public OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
-        String[] split = tenantUnits.split(",");
-        List<String> list = Arrays.asList(split);
+    public List<OcpTenantBaseDto> queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) {
         pageSize = (pageSize - 1) * pageNum;
-        OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementMapper.queryOcpApiBaseDto(keyword, list, startTime, endTime,  pageSize, pageNum);
-        return ocpTenantBaseDto;
+        return tenantBasicManagementMapper.queryOcpTenantBaseDto(keyword, tenantUnit, startTime, endTime, tenantCode, pageSize, pageNum);
+    }
+
+    /**
+     * 应用发布  改变其应用状态
+     *
+     * @param tenantCodes 应用代码
+     * @return
+     */
+    @Override
+    public ResponseVO tenantIssue(String tenantCodes) {
+        String[] split = tenantCodes.split(",");
+        List<String> list = Arrays.asList(split);
+        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
+        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+        for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+            if (ocpTenantExtent.getTenantState() == 1) {
+                return ResponseVO.error("已发布");
+            } else {
+                ocpTenantExtent.setTenantState((short) 1);
+                ocpTenantExtentMapper.updateById(ocpTenantExtent);
+            }
+        }
+        return ResponseVO.ok();
+    }
+
+    /**
+     * 应用订阅
+     *
+     * @param tenantCodes
+     */
+    @Override
+    public void tenantLogin(String tenantCodes) {
+        String[] split = tenantCodes.split(",");
+        List<String> tenantCode = Arrays.asList(split);
+        for (String s : tenantCode) {
+            OcpTenantSubs ocpTenantSubs = new OcpTenantSubs();
+            ocpTenantSubs.setTenantCode(s);
+            ocpTenantSubs.setSubsCompanyCode(null);
+            ocpTenantSubs.setSubsLogTenantAtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpTenantSubs.setSubsLogTenantCtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpTenantSubs.setSubsLogTenantMtime(Timestamp.valueOf(LocalDateTime.now()));
+            ocpTenantSubsService.save(ocpTenantSubs);
+        }
+    }
+
+    /**
+     * 应用下线
+     *
+     * @param tenantCodes
+     */
+    @Override
+    public ResponseVO tenantCancel(String tenantCodes) {
+        String[] split = tenantCodes.split(",");
+        List<String> list = Arrays.asList(split);
+        LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
+        lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
+        List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
+        for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
+            if (ocpTenantExtent.getTenantState() == 2) {
+                return ResponseVO.error("已下线");
+            } else {
+                ocpTenantExtent.setTenantState((short) 2);
+                ocpTenantExtentMapper.updateById(ocpTenantExtent);
             }
+        }
+        return ResponseVO.ok();
+    }
+
 }

src/main/resources/mapper/TenantBasicManagementMapper.xml

 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <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" />
+    </resultMap>
 
-    <select id="queryOcpApiBaseDto" resultType="com.pms.ocp.model.dto.OcpTenantBaseDto">
-        select otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name,
+    <select id="queryOcpTenantBaseDto" resultMap="ctbMap">
+        select
+        otb.obj_id,otb.tenant_code,otb.tenant_name,otg.tenant_group_name,otb.tenant_url,ote.cluster_name,ote.space_name,
         ote.deployment_name,otb.tenant_zone,otb.tenant_ctime,otb.tenant_unit
         from ocp_tenant_base otb
         join ocp_tenant_extent ote on otb.tenant_code=ote.tenant_code
         join ocp_tenant_group otg on otb.tenant_group_code =otg.tenant_group_code
         <where>
+            <if test="tenantCode!=null and tenantCode!=''">
+                and otb.tenant_code=#{tenantCode}
+            </if>
+            <if test="tenantCode!=null and tenantCode!=''">
+                and ote.tenant_code=#{tenantCode}
+            </if>
             <if test="startTime !=null  ">
                 <![CDATA[
                 and otb.tenant_ctime >= #{startTime}
@@ -19,20 +39,17 @@
             and otb.tenant_ctime <= #{endTime}
             ]]>
             </if>
-            <if test="keyword !=null and keyword != '' ">
-                and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')
-            </if>
+            <!--            <if test="keyword !=null and keyword != '' ">-->
+            <!--                and otb.tenant_code like CONCAT('%', #{keyword}::text,'%')-->
+            <!--            </if>-->
             <if test="keyword !=null and keyword != '' ">
                 and ote.tenant_code like CONCAT('%', #{keyword}::text,'%')
             </if>
             <if test="keyword !=null and keyword != '' ">
                 and otb.tenant_name like CONCAT('%', #{keyword}::text,'%')
             </if>
-            <if test="list!=null">
-                and otb.tenant_unit in
-                <foreach collection="list" index="index" item="tenantUnit" open="(" separator="," close=")">
-                    #{tenantUnit}
-                </foreach>
+            <if test="tenantUnit !=null and tenantUnit!=''">
+                and otb.tenant_unit =#{tenantUnit}
             </if>
         </where>
         limit #{pageNum} offset #{pageSize}