From 7054c353d400b2f917076ddafdeaa6696fea350e Mon Sep 17 00:00:00 2001 From: itcast Date: Wed, 9 Mar 2022 22:41:58 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E5=BA=93=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=AE=A1=E7=90=86=E6=8E=A5=E5=8F=A3-?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 4 +- .../ocp/controller/AppArrangeController.java | 6 +-- .../TenantBasicManagementController.java | 39 ++++++++++++++++++ .../ocp/mapper/ApiBasicManagementMapper.java | 2 +- .../mapper/TenantBasicManagementMapper.java | 15 +++++++ .../pms/ocp/model/dto/OcpTenantBaseDto.java | 2 + .../service/ApiBasicManagementService.java | 4 +- .../service/TenantBasicManagementService.java | 21 ++++++++++ .../impl/ApiBasicManagementServiceImpl.java | 20 ++++++---- .../TenantBasicManagementServiceImpl.java | 39 ++++++++++++++++++ .../mapper/ApiBasicManagementMapper.xml | 33 +++++++++------ .../mapper/TenantBasicManagementMapper.xml | 40 +++++++++++++++++++ 12 files changed, 199 insertions(+), 26 deletions(-) create mode 100644 src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java create mode 100644 src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java create mode 100644 src/main/java/com/pms/ocp/service/TenantBasicManagementService.java create mode 100644 src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java create mode 100644 src/main/resources/mapper/TenantBasicManagementMapper.xml diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 905fc22..8f90ecf 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -53,9 +53,9 @@ public class ApiBasicManagementController { @RequestParam(required = false) int pageSize, @RequestParam(required = false) int pageNum ) { - OcpApiBaseDto ocpApiBaseDto = apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize + List list=apiBasicManagementService.queryOcpApiBaseDto(apiCode, keyword, apiUnits, startTime, endTime, pageSize , pageNum); - return ResponseVO.ok(ocpApiBaseDto); + return ResponseVO.ok(list); } @ApiOperation("导入功能") diff --git a/src/main/java/com/pms/ocp/controller/AppArrangeController.java b/src/main/java/com/pms/ocp/controller/AppArrangeController.java index 097df82..5a30143 100644 --- a/src/main/java/com/pms/ocp/controller/AppArrangeController.java +++ b/src/main/java/com/pms/ocp/controller/AppArrangeController.java @@ -14,9 +14,9 @@ import org.springframework.web.bind.annotation.RestController; /** * @className: AppArrangeController - * @Description:应用分类管理接口 - * @atuthor: pei-chenxi - * @DateTime: 2022/3/9 14:15 + * @Dscription:应用分类管理接口 + * * @atuthor: pei-chenxi + * * @DateTime: 2022/3/9 14:15e */ @Slf4j @RestController diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java new file mode 100644 index 0000000..a5b6713 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -0,0 +1,39 @@ +package com.pms.ocp.controller; + +import com.pms.ocp.model.dto.OcpApiBaseDto; +import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.TenantBasicManagementService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +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 java.sql.Timestamp; + +@Slf4j +@RequestMapping("/tenant/basic") +@RestController +@Api(tags = "应用库服务基础管理接口") +public class TenantBasicManagementController { + @Autowired + private TenantBasicManagementService tenantBasicManagementService; + @ApiOperation("条件查询") + @GetMapping("/queryOcpTenantBaseDto") + public ResponseVO queryOcpTenantBaseDto( + @RequestParam(required = false) String keyword, + @RequestParam(required = false) String tenantUnits, + @RequestParam(required = false) Timestamp startTime, + @RequestParam(required = false) Timestamp endTime, + @RequestParam(required = false) int pageSize, + @RequestParam(required = false) int pageNum + ) { + OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementService.queryOcpTenantBaseDto( keyword, tenantUnits, startTime, endTime, pageSize + , pageNum); + return ResponseVO.ok(ocpTenantBaseDto); + } +} diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 28d247d..2c5dfa8 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -14,5 +14,5 @@ import java.util.List; public interface ApiBasicManagementMapper extends BaseMapper { List selectApiExport(List list); - OcpApiBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("list") List list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); + List queryOcpApiBaseDto(@Param("keyword") String keyword,@Param("apiUnit") String apiUnit, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("apiCode") String apiCode, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); } diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java new file mode 100644 index 0000000..068ea21 --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java @@ -0,0 +1,15 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.entity.OcpTenantBase; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.sql.Timestamp; +import java.util.List; + +@Mapper +public interface TenantBasicManagementMapper extends BaseMapper { + OcpTenantBaseDto queryOcpApiBaseDto(@Param("keyword") String keyword, @Param("list") List list, @Param("startTime") Timestamp startTime, @Param("endTime") Timestamp endTime, @Param("pageSize") int pageSize, @Param("pageNum") int pageNum); +} diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java index ca71b79..d7434b9 100644 --- a/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantBaseDto.java @@ -20,4 +20,6 @@ public class OcpTenantBaseDto extends OcpTenantBase implements Serializable { private String clusterName; @ApiModelProperty("命名空间") private String spaceName; + @ApiModelProperty("部署名称") + private String deploymentName; } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 672e46f..8ab8ff3 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -42,7 +42,7 @@ public interface ApiBasicManagementService extends IService { * @return */ // OcpApiBaseDto queryOcpApiBaseDto(ApiBaseDto apiBaseDto); - OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime,int pageSize,int pageNum); + List queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); /** * 导入的添加到数据库 * @param personList @@ -54,4 +54,6 @@ public interface ApiBasicManagementService extends IService { * @param apiCodes */ void apiIssue(String apiCodes); + + } diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java new file mode 100644 index 0000000..4572903 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -0,0 +1,21 @@ +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 java.sql.Timestamp; + +public interface TenantBasicManagementService extends IService { + /** + * 应用条件查询 + * @param keyword + * @param tenantUnits + * @param startTime + * @param endTime + * @param pageSize + * @param pageNum + * @return + */ + OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); +} diff --git a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java index de8b6c3..af54d34 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -81,6 +81,12 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl 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); + } + /** * 条件查询 * @@ -91,13 +97,13 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); - pageSize = (pageSize - 1) * pageNum; - OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, list, startTime, endTime, apiCode, pageSize, pageNum); - return ocpApiBaseDto; - } +// public OcpApiBaseDto queryOcpApiBaseDto(String apiCode, String keyword, String apiUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { +// //String[] split = apiUnits.split(","); +//// List list = Arrays.asList(split); +// pageSize = (pageSize - 1) * pageNum; +// OcpApiBaseDto ocpApiBaseDto = apiBasicManagementMapper.queryOcpApiBaseDto(keyword, apiUnits, startTime, endTime, apiCode, pageSize, pageNum); +// return ocpApiBaseDto; +// } /** * 导入添加到数据库 diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java new file mode 100644 index 0000000..3dfee54 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -0,0 +1,39 @@ +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.TenantBasicManagementMapper; +import com.pms.ocp.model.dto.OcpApiBaseDto; +import com.pms.ocp.model.dto.OcpTenantBaseDto; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.service.TenantBasicManagementService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.sql.Timestamp; +import java.util.Arrays; +import java.util.List; + +@Service +public class TenantBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { + @Autowired + private TenantBasicManagementMapper tenantBasicManagementMapper; + /** + * 应用条件查询 + * @param keyword + * @param tenantUnits + * @param startTime + * @param endTime + * @param pageSize + * @param pageNum + * @return + */ + @Override + public OcpTenantBaseDto queryOcpTenantBaseDto(String keyword, String tenantUnits, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { + String[] split = tenantUnits.split(","); + List list = Arrays.asList(split); + pageSize = (pageSize - 1) * pageNum; + OcpTenantBaseDto ocpTenantBaseDto = tenantBasicManagementMapper.queryOcpApiBaseDto(keyword, list, startTime, endTime, pageSize, pageNum); + return ocpTenantBaseDto; + } +} diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml index 1b77744..fc750b1 100644 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ b/src/main/resources/mapper/ApiBasicManagementMapper.xml @@ -1,7 +1,18 @@ - + + + + + + + + + + + + - select oab.obj_id,oab.api_code,oae.api_code,oab.api_name,oae.cluster_name, oae.space_name,oab.api_url,oae.api_state ,oab.api_unit ,oab.api_ctime from ocp_api_base oab join ocp_api_extent oae ON oae.api_code = oab.api_code @@ -27,9 +38,6 @@ and oae.api_code=#{apiCode} - - - = #{startTime} @@ -46,15 +54,16 @@ and oab.api_name like CONCAT('%', #{keyword}::text,'%') - - and oab.api_unit in - - #{apiUnit} - + + and oab.api_unit =#{apiUnit} + + + + + + limit #{pageNum} offset #{pageSize} - - \ No newline at end of file diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml new file mode 100644 index 0000000..39551cf --- /dev/null +++ b/src/main/resources/mapper/TenantBasicManagementMapper.xml @@ -0,0 +1,40 @@ + + + + + + \ No newline at end of file -- 2.26.0