From b95625cdf0092ec59f9b339fcea8f6f97a04c0a7 Mon Sep 17 00:00:00 2001 From: itcast Date: Sun, 13 Mar 2022 19:56:22 +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 --- .../TenantBasicManagementController.java | 36 ++++++++++++------- .../pms/ocp/mapper/OcpTenantGroupMapper.java | 3 ++ .../mapper/TenantBasicManagementMapper.java | 5 ++- .../java/com/pms/ocp/model/dto/GroupDto.java | 24 +++++++++++++ .../pms/ocp/model/entity/OcpTenantBase.java | 10 +++--- .../service/TenantBasicManagementService.java | 17 ++++++++- .../TenantBasicManagementServiceImpl.java | 31 ++++++++++++---- src/main/resources/mapper/OcpGroup.xml | 25 ++++++------- .../mapper/TenantBasicManagementMapper.xml | 28 +++++++++------ 9 files changed, 131 insertions(+), 48 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index a147dc0..91e6c04 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -33,6 +33,7 @@ public class TenantBasicManagementController { @ApiOperation("条件查询") @GetMapping("/queryOcpTenantBaseDto") public ResponseVO> 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 = tenantBasicManagementService.queryOcpTenantBaseDto(tenantCode, keyword, tenantUnit, startTime, endTime, pageSize - , pageNum); + + + List 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> tenantBaseTreeOther(@RequestParam(required = false)String tenantGroupCode,@RequestParam(required = false)String tenantGroupCompanyCode) { - List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode,tenantGroupCompanyCode); + public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) { + List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); return ResponseVO.ok(ocpApiGroups); } @ApiOperation("应用列表") - @GetMapping("/tenantListQuery") + @GetMapping("/tenantListQuery") public ResponseVO> tenantListQuery(HttpServletRequest request, TenantDto tenantDto) { - return tenantBasicManagementService.getBaseByGroupCode(tenantDto); + return tenantBasicManagementService.getBaseByGroupCode(tenantDto); + } + + @ApiOperation("应用树层级2") + @GetMapping("/baseTreeOther") + public ResponseVO> baseTreeOther(@RequestParam(required = false) String tenantGroupCode) { + List list = tenantBasicManagementService.baseTreeOther(tenantGroupCode); + return ResponseVO.ok(list); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index b70fd25..7e9071b 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java +++ b/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 { List tenantBaseTreeOther(@Param("tenantGroupCode") String tenantGroupCode, @Param("tenantGroupCompanyCode") String tenantGroupCompanyCode); List selectPageLists(TenantDto tenantDto); + + List selectAll(); } diff --git a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java index 719d841..3fd5600 100644 --- a/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/TenantBasicManagementMapper.java @@ -1,6 +1,7 @@ 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 { - List 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 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 select(String tenantGroupCode); } diff --git a/src/main/java/com/pms/ocp/model/dto/GroupDto.java b/src/main/java/com/pms/ocp/model/dto/GroupDto.java index 11010a2..827dc28 100644 --- a/src/main/java/com/pms/ocp/model/dto/GroupDto.java +++ b/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; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java index 0f2c871..a8b45a4 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java +++ b/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; /** * 建设单位 */ diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 06b0596..be3980d 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -26,7 +26,7 @@ public interface TenantBasicManagementService extends IService { * @param pageNum * @return */ - List queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum); + List 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 { * @return */ ResponseVO> getBaseByGroupCode(TenantDto tenantDto); + /** + * 应用树 + * @param tenantGroupCode + * @return + */ + List baseTreeOther(String tenantGroupCode); + + + + + /** + * 应用树 + * @param tenantGroupCode + */ + } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 817b837..77b9140 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -1,7 +1,7 @@ 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 queryOcpTenantBaseDto(String tenantCode, String keyword, String tenantUnit, Timestamp startTime, Timestamp endTime, int pageSize, int pageNum) { + public List 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 baseTreeOther(String tenantGroupCode) { + List group = null; + if (StringUtils.isBlank(tenantGroupCode)) { + group= ocpTenantGroupMapper.selectAll(); + } else { + group= tenantBasicManagementMapper.select(tenantGroupCode); + } + return group; + } + + + public void setGroupIdValue(String tenantGroupCompanyCode, String tenantGroupCode) { List codes = getIdsByPIdPub(tenantGroupCompanyCode, tenantGroupCode); if (codes.size() > 0) { diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index da97942..a41b1d2 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -17,21 +17,17 @@ + diff --git a/src/main/resources/mapper/TenantBasicManagementMapper.xml b/src/main/resources/mapper/TenantBasicManagementMapper.xml index 7285d02..94eb3f3 100644 --- a/src/main/resources/mapper/TenantBasicManagementMapper.xml +++ b/src/main/resources/mapper/TenantBasicManagementMapper.xml @@ -3,16 +3,16 @@ - - - - - - - - - - + + + + + + + + + + + \ No newline at end of file -- 2.26.0