diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 05f049d12d51b45d2d1caba476bf017a421f37d9..655c868d129d5dac0dd8c6d1b0cf45ed3366f938 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -8,6 +8,7 @@ import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.dto.OcpGroupBaseDto; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -43,8 +44,6 @@ public class ApiBasicManagementController { @Autowired private ApiBasicManagementService apiBasicManagementService; - - @ApiOperation("导入功能") @PostMapping("/import") public ResponseVO ApiImport(@RequestParam(required = false) MultipartFile file, @@ -136,7 +135,6 @@ public class ApiBasicManagementController { // } //} - @ApiOperation("下载模块") @GetMapping("/downloadExcel") public void downloadExcel(HttpServletResponse response, HttpServletRequest request) { @@ -197,8 +195,8 @@ public class ApiBasicManagementController { @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") - public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType,String apiCode) { - List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType,apiCode); + public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType, String apiCode) { + List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode, apiGroupCode, apiGroupPromotionType, apiCode); return ResponseVO.ok(apiTreeGroupDtos); } @@ -211,15 +209,20 @@ public class ApiBasicManagementController { @ApiOperation("省侧-应用接入申请-的模糊查询") @GetMapping("/selectByCondition") - public ResponseVO >selectByCondition(@RequestParam(required = false) String apiCode, - @RequestParam(required = false) String apiName, - @RequestParam(required = false) String apiCenterCode, - @RequestParam(required = false) Integer pageNum, - @RequestParam(required = false) Integer pageSize){ - return apiBasicManagementService.selectByCondition(apiCode,apiName,apiCenterCode,pageNum,pageSize); + public ResponseVO> selectByCondition(@RequestParam(required = false) String apiCode, + @RequestParam(required = false) String apiName, + @RequestParam(required = false) String apiCenterCode, + @RequestParam(required = false) Integer pageNum, + @RequestParam(required = false) Integer pageSize, + @RequestParam(required = false) String apiGroupCode) { + return apiBasicManagementService.selectByCondition(apiCode, apiName, apiCenterCode, pageNum, pageSize, apiGroupCode); } - + @ApiOperation("省侧-应用接入申请-查询组中所有中心") + @GetMapping("/selectCentre") + public ResponseVO> selectCentre() { + return apiBasicManagementService.selectCentre(); + } } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java index 726377334bbdd7c3d688c8ae8a6a45183894a640..da29dcca08cf36388f83a0c3d8852ffc528819e7 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantGroupIocnController.java @@ -1,6 +1,7 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.dto.OcpTenantDto; import com.pms.ocp.model.dto.OcpTenantGroupIocnDto; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; @@ -17,6 +18,12 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; + + +/** + * @author zhaochengming + * + */ @Slf4j @RequestMapping("/tenant-group/v1") @RestController @@ -32,7 +39,7 @@ public class OcpTenantGroupIocnController { - /** + /**@author:zhaochengming * 我的应用--服务列表 * @return */ @@ -43,7 +50,7 @@ public class OcpTenantGroupIocnController { return ResponseVO.ok(ocpgroup); } - /** + /**@author:zhaochengming * 我的应用--应用删除 * @return */ @@ -59,5 +66,17 @@ public class OcpTenantGroupIocnController { } + /** + * @author:zhaochengming + * @param objId + * @return + */ + @GetMapping("/details") + @ApiModelProperty("我的应用--应用详情") + private ResponseVO selectDetails(String objId) { + OcpTenantDto ocpTenantDto = ocpTenantBaseService.selectDetails(objId); + return ResponseVO.ok(ocpTenantDto); + } + + } -} diff --git a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java index 0b221c61f40156a76533bffa77bc6053ea55a696..9fb6fa95f06be221113519779dc963d03bd36fec 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiBasicManagementMapper.java @@ -18,5 +18,5 @@ public interface ApiBasicManagementMapper extends BaseMapper { - List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode); + List selectByCondition(@Param("apiCode") String apiCode, @Param("apiName") String apiName, @Param("apiCenterCode") String apiCenterCode,@Param("apiGroupCode") String apiGroupCode); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantGroupMapper.java index d9d6ba79f24296eae3594aa0fcee6e351607789c..b4494cc182bd949118a43ad91513364942cbe521 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.OcpApiGroup; import com.pms.ocp.model.entity.OcpTenantGroup; import org.apache.ibatis.annotations.Mapper; @@ -22,4 +23,6 @@ public interface OcpTenantGroupMapper extends BaseMapper { List selectBase(@Param("tenantGroupCode") String tenantGroupCode, String tenantGroupCompanyCode); + + List selectCentre(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java index 3eab7c16cd0377b79d563863a6d74937dbacca72..3b5a3b1cc8ee3405dfc588e54499fa9b87e9ebf1 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantIocnMapper.java @@ -7,4 +7,8 @@ import com.pms.ocp.model.entity.OcpTenantIocn; * @author Administrator */ public interface OcpTenantIocnMapper extends BaseMapper { + + + + OcpTenantIocn selectCode(String tenantCode); } diff --git a/src/main/java/com/pms/ocp/model/dto/OcpTenantDto.java b/src/main/java/com/pms/ocp/model/dto/OcpTenantDto.java new file mode 100644 index 0000000000000000000000000000000000000000..362bfe9e41fa5187426f166d7c2ecb0844f86571 --- /dev/null +++ b/src/main/java/com/pms/ocp/model/dto/OcpTenantDto.java @@ -0,0 +1,299 @@ +package com.pms.ocp.model.dto; + +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.sql.Timestamp; + + +@Data +@AllArgsConstructor +@NoArgsConstructor +@ApiModel(value = "应用详情dto") +public class OcpTenantDto { + + + @TableId(type = IdType.ASSIGN_ID) + @ApiModelProperty("主键ID") + private String objId; + + @ApiModelProperty("服务代码") + private String apiCode; + + @ApiModelProperty("服务接口中文名称") + private String apiName; + + @ApiModelProperty("服务分类代码") + private String apiGroupCode; + + @ApiModelProperty("推广类型0:统建；1:自建") + private long apiPromotion; + + @ApiModelProperty("服务请求体") + private String apiReq; + + @ApiModelProperty("服务返回体") + private String apiResp; + + @ApiModelProperty("服务地址") + private String apiUrl; + + @ApiModelProperty("服务创建时间") + private Timestamp apiCtime; + + @ApiModelProperty("服务修改时间") + private Timestamp apiMtime; + + @ApiModelProperty("创建者用户ID") + private String apiUserId; + + @ApiModelProperty("建设单位") + private String apiUnit; + + @ApiModelProperty("服务所属公司") + private String ownerCompanyCode; + +// @ApiModelProperty("服务所属公司") +// private String ownerCompanyName; + + @ApiModelProperty("是否删除0-否1-是") + private long isDelete; + + @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") + private long apiZone; + + @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") + private long apiLayer; + + @ApiModelProperty("服务版本（最新版本）") + private String apiVersion; + + @ApiModelProperty("服务所属中心编码所属中心") + private String apiCenterCode; + + @ApiModelProperty("服务简述") + private String apiDescription; + + @ApiModelProperty("创建者姓名") + private String apiUserName; + + + @ApiModelProperty(value = "图标种类——tenant:应用图标,api:服务图标") + private String iocnType; + + /** + * 编码值 + */ + @ApiModelProperty(value = "编码值") + private String codeNo; + + /** + * 应用调用的服务数量图标数据 + */ + @ApiModelProperty(value = "应用调用的服务数量图标数据") + private Object iocn; + + /** + * 所属公司可能会根据公司分区 + */ + @ApiModelProperty(value = "所属公司可能会根据公司分区") + private String companyCode; + + + public String getObjId() { + return objId; + } + + public void setObjId(String objId) { + this.objId = objId; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public String getApiVersion() { + return apiVersion; + } + + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + + public String getApiCenterCode() { + return apiCenterCode; + } + + public void setApiCenterCode(String apiCenterCode) { + this.apiCenterCode = apiCenterCode; + } + + public String getApiDescription() { + return apiDescription; + } + + public void setApiDescription(String apiDescription) { + this.apiDescription = apiDescription; + } + + public String getApiUserName() { + return apiUserName; + } + + public void setApiUserName(String apiUserName) { + this.apiUserName = apiUserName; + } + + public String getIocnType() { + return iocnType; + } + + public void setIocnType(String iocnType) { + this.iocnType = iocnType; + } + + public String getCodeNo() { + return codeNo; + } + + public void setCodeNo(String codeNo) { + this.codeNo = codeNo; + } + + public Object getIocn() { + return iocn; + } + + public void setIocn(Object iocn) { + this.iocn = iocn; + } + + public String getCompanyCode() { + return companyCode; + } + + public void setCompanyCode(String companyCode) { + this.companyCode = companyCode; + } +} diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java index f161dafcd8c9cae01fb8cbff0507d2d00d4d1491..417d23d8bc29f31ea925b16aae9b676a023c50ea 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantIocn.java @@ -42,6 +42,9 @@ public class OcpTenantIocn implements Serializable { @ApiModelProperty(value = "应用调用的服务数量图标数据") private Object iocn; + @ApiModelProperty(value = "图片类型") + private Object iocnKind; + /** * 所属公司可能会根据公司分区 */ diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index c7424a76790f1a2e242817ff0aad5de08ad19a47..d1747ece8ea79178b15b9fefa50effbf01a78e7e 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -7,6 +7,7 @@ import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiBase; import com.pms.ocp.model.entity.OcpApiExtent; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.model.vo.OcpApiBaseVo; import com.pms.ocp.model.vo.ResponseVO; @@ -80,15 +81,23 @@ public interface ApiBasicManagementService extends IService { */ List apiBaseTreeApiList(String apiGroupCompanyCode, String apiGroupPcode); - /** * 省侧-应用接入申请-的模糊查询 * @param apiCode * @param apiName * @param apiCenterCode + * @param pageNum + * @param pageSize + * @param apiGroupCode + * @return + */ + ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize,String apiGroupCode); + + /** + * 省侧-应用接入申请-查询组中所有中心 * @return */ - ResponseVO> selectByCondition(String apiCode, String apiName, String apiCenterCode,Integer pageNum,Integer pageSize); + ResponseVO> selectCentre(); // /** // * 服务列表2 diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index c63d85f6a64af330e6fa64e190d60d3e040200b1..29ca4d5942bfa896e5b15b6ff45a490ec89a528d 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -1,6 +1,7 @@ package com.pms.ocp.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.pms.ocp.model.dto.OcpTenantDto; import com.pms.ocp.model.entity.OcpTenantBase; public interface OcpTenantBaseService extends IService { @@ -12,4 +13,11 @@ public interface OcpTenantBaseService extends IService { * @return */ boolean delectApply(String objId); + + /** + * 我的应用--应用详情 + * @param objId + * @return + */ + OcpTenantDto selectDetails(String objId); } 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 0ab9834e2c9dea2d890159285a9c879682b95e77..902983d8ca431a682619fd1005af126019aa1fc5 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -7,24 +7,19 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; -import com.pms.ocp.mapper.ApiBasicManagementMapper; -import com.pms.ocp.mapper.OcpApiExtentMapper; -import com.pms.ocp.mapper.OcpApiGroupMapper; -import com.pms.ocp.mapper.OcpApiSubsMapper; +import com.pms.ocp.mapper.*; import com.pms.ocp.model.dto.ApiBaseDto; import com.pms.ocp.model.dto.OcpGroupBaseDto; -import com.pms.ocp.model.entity.OcpApiBase; -import com.pms.ocp.model.entity.OcpApiExtent; -import com.pms.ocp.model.entity.OcpApiGroup; -import com.pms.ocp.model.entity.OcpApiSubs; +import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.*; import com.pms.ocp.service.ApiBasicManagementService; import com.pms.ocp.service.OcpApiExtentService; +import com.pms.ocp.service.OcpTenantGroupService; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -52,7 +47,10 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl apiGroupCode = new ArrayList<>(); /** @@ -97,8 +95,6 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> selectByCondition(String apiCode, String apiName, String apiCenterCode, Integer pageNum, Integer pageSize) { + + public ResponseVO> selectByCondition(String apiCode, String apiName,String apiCenterCode ,Integer pageNum, Integer pageSize, String apiGroupCode) { if (pageNum == null || pageSize == null) { return ResponseVO.error("分页参数不能为空"); } PageHelper.startPage(pageNum, pageSize); - List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode); + List list = apiBasicManagementMapper.selectByCondition(apiCode, apiName, apiCenterCode,apiGroupCode); PageInfo pageInfo = new PageInfo<>(list); return ResponseVO.ok(pageInfo); } + + /** + * 省侧-应用接入申请-查询组中所有中心 + * + * @return + */ + @Override + public ResponseVO> selectCentre() { +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.eq(OcpTenantGroup::getLevel, "sys_center"); +// List ocpTenantGroups = ocpTenantGroupMapper.selectList(lambdaQueryWrapper); +// return ResponseVO.ok(ocpTenantGroups); + List ocpApiGroups = ocpTenantGroupMapper.selectCentre(); + ArrayList objects = new ArrayList<>(); + for (OcpApiGroup ocpApiGroup : ocpApiGroups) { + if (ocpApiGroup.getApiGroupLevel().equals("sys_center")) { + objects.add(ocpApiGroup); + } + } + return ResponseVO.ok(objects); + } } diff --git a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java index ea7e6e78e9307c482b88ee418b0171601d28f9bf..07600a201d5f57542e3233b97c29eb238cb587f7 100644 --- a/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/AppRegisterServiceImpl.java @@ -51,8 +51,6 @@ public class AppRegisterServiceImpl implements AppRegisterService { ocpTenantIocn.setIocnType("tenant"); ocpTenantIocn.setCodeNo(appRegisterDTO.getAppCode()); ocpTenantIocn.setIocn(appRegisterDTO.getImgUrl()); - // 加字段 - int n = ocpTenantIocnMapper.insert(ocpTenantIocn); @@ -110,6 +108,7 @@ public class AppRegisterServiceImpl implements AppRegisterService { ocpTenantIocn.setIocnType("tenant"); ocpTenantIocn.setCodeNo(item.getCodeNo()); ocpTenantIocn.setIocn(item.getImg()); + ocpTenantIocn.setIocnKind("Tenant_swiper"); list.add(ocpTenantIocn); } int count = appRegisterMapper.batchInsert(list); diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index feee97389f824263c83330e84d08736ca8dc6f90..ea092e70c2a89f030c3f09ec5b6e828f22d9911d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -3,7 +3,10 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.core.toolkit.StringUtils; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.mapper.OcpTenantBaseMapper; +import com.pms.ocp.mapper.OcpTenantIocnMapper; +import com.pms.ocp.model.dto.OcpTenantDto; import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.entity.OcpTenantIocn; import com.pms.ocp.service.OcpTenantBaseService; import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -16,6 +19,10 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantIocnService { diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index b3cbf9aeba68632e67fa6a49f2984dd757d021a3..22abfe23dd5d1b5eb281cf770ea341da7dbc59dd 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -175,12 +175,13 @@ public class TenantServiceImpl extends ServiceImpl Page page = new Page<>(currentPage, pageSize); if (StringUtils.isBlank(keyword)) { - if (StringUtils.isBlank(lev) || "1".equals(lev) ) { + if (StringUtils.isBlank(lev) || "1".equals(lev)) { LambdaQueryWrapper eq = qw.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode); tenantMapper.selectPage(page, eq); } else if ("2".equals(lev) || "3".equals(lev)) { - LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)).eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); - tenantMapper.selectPage(page,eq); + LambdaQueryWrapper eq = qw.or(wq -> wq.eq(OcpTenantGroup::getTenantGroupCompanyCode, tenantGroupCompanyCode)) + .eq(OcpTenantGroup::getTenantGroupPcode, tenantGroupCode); + tenantMapper.selectPage(page, eq); } } else if (!(StringUtils.isBlank(keyword))) { LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpTenantGroup::getTenantGroupCompanyCode, keyword)) diff --git a/src/main/resources/mapper/ApiBasicManagementMapper.xml b/src/main/resources/mapper/ApiBasicManagementMapper.xml index c226eb4492923df072c788568e7a691b08911a02..341d98aa2d4e9280e75476d73388447582a69b2c 100644 --- a/src/main/resources/mapper/ApiBasicManagementMapper.xml +++ b/src/main/resources/mapper/ApiBasicManagementMapper.xml @@ -82,6 +82,9 @@ and api_center_code=#{apiCenterCode} + + and api_group_code=#{apiGroupCode} + diff --git a/src/main/resources/mapper/AppRegisterMapper.xml b/src/main/resources/mapper/AppRegisterMapper.xml index 571ce540b1cdcd82d7b5a512420ddb261d546c76..9c746a32be491f109d3f705a0bc1dc3ce7f1f0ab 100644 --- a/src/main/resources/mapper/AppRegisterMapper.xml +++ b/src/main/resources/mapper/AppRegisterMapper.xml @@ -14,23 +14,23 @@ INNER JOIN ocp_tenant_iocn icon ON base.tenant_code = icon.code_no INNER JOIN ocp_tenant_extent extent ON extent.tenant_code = base.tenant_code INNER JOIN ocp_tenant_group g ON g.tenant_group_code = base.tenant_group_code - - - base.professional_kind like CONCAT('%', #{dto.kind}, '%') - - - and g.tenant_group_name like CONCAT('%', #{dto.type}, '%') - - + WHERE icon.iocn_type = 'tenant' and icon.iocn_kind is null + + base.professional_kind like CONCAT('%', #{dto.kind}, '%') + + + and g.tenant_group_name like CONCAT('%', #{dto.type}, '%') + + - insert into ocp_tenant_iocn(obj_id, iocn_type, code_no, iocn, company_code) + insert into ocp_tenant_iocn(obj_id, iocn_type, code_no, iocn, company_code,iocn_kind) values (#{item.objId,jdbcType=VARCHAR}, #{item.iocnType,jdbcType=VARCHAR}, - #{item.codeNo},#{item.iocn},#{item.companyCode,jdbcType=VARCHAR}) + #{item.codeNo},#{item.iocn},#{item.companyCode,jdbcType=VARCHAR},#{item.iocnKind,jdbcType=VARCHAR}) \ No newline at end of file diff --git a/src/main/resources/mapper/OcpGroup.xml b/src/main/resources/mapper/OcpGroup.xml index d75ebf6edac41b411318245a060e8cc19e0c1551..9a1cb1d774f4def59a3f2fa1fccebd5c1c4309bb 100644 --- a/src/main/resources/mapper/OcpGroup.xml +++ b/src/main/resources/mapper/OcpGroup.xml @@ -80,5 +80,8 @@ + diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml index 3e409c597a1695780bff4230acbf42d3a212b962..0cd86188cfb70acd9d9096dec32323ec14ad1efb 100644 --- a/src/main/resources/mapper/OcpTenantBaseMapper.xml +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -14,4 +14,6 @@ + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantIocnMapper.xml b/src/main/resources/mapper/OcpTenantIocnMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..c4f02381194c07106f71c66fe572e6a3651b9e74 --- /dev/null +++ b/src/main/resources/mapper/OcpTenantIocnMapper.xml @@ -0,0 +1,10 @@ + + + + + + + + \ No newline at end of file