diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index b205476ef958af5042f7918b0e9ff3356119676b..27a967f4de663235240ef00f7ca75d1b01cc248d 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -221,4 +221,5 @@ public class ApiBasicManagementController { } + } diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 1a0fe9a9a6c764537df56ddb96f153a2b8cc097e..fc72d1ed3c8444907aaa83ff7f9dc013614132f9 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -131,8 +131,13 @@ public class TenantBasicManagementController { return tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto); } @ApiOperation("个人信息中-查询和应用关联的服务") - @PostMapping("/selectOcpByApi") + @GetMapping("/selectOcpByApi") public ResponseVO> selectOcpByApi(@RequestParam(required = false) String tenantCode){ return tenantBasicManagementService.selectOcpByApi(tenantCode); } + @ApiOperation("添加应用服务关系") + @PostMapping("/saveTenantAndApi") + public ResponseVO saveTenantAndApi(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ + return tenantBasicManagementService.saveTenantAndApi(ocpBaseTiocnDto); + } } diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index 09616c1ec18991f94045b68c7e15acc150c83d82..aa57fd25abab41bec612ce8819fa825fb4ad258c 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -102,6 +102,13 @@ public interface TenantBasicManagementService extends IService { */ ResponseVO >selectOcpByApi(String tenantCode); + /** + * 添加应用服务关系 + + * @return + */ + ResponseVO saveTenantAndApi( OcpBaseTiocnDto ocpBaseTiocnDto); + /** * 应用树 * @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 709849815a869be9d0a228f4c7cf244418c65657..3100532a760553f0e621d627871e83e85c6f15af 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -424,6 +424,42 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl apiCode = Arrays.asList(split); + if (apiCode.size() == 0) { + return ResponseVO.error("请选择你要关联的服务"); + } + //先删除之前关联的 + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode); + ocpApiTenantRelMapper.delete(queryWrapper); + for (String s : apiCode) { + OcpApiTenantRel rel = new OcpApiTenantRel(); + rel.setApiCode(s); + rel.setTenantCode(tenantCode); + rel.setApiTenantRelMtime(new Timestamp(System.currentTimeMillis())); + rel.setApiTenantRelCtime(new Timestamp(System.currentTimeMillis())); + rel.setApiDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode()); + rel.setTenantDepCompanyCode(ocpBaseTiocnDto.getOwnerCompanyCode()); + int insert = ocpApiTenantRelMapper.insert(rel); + if (insert > 0) { + return ResponseVO.ok("添加成功"); + } else { + return ResponseVO.error("添加失败"); + } + } + return ResponseVO.error("系统异常"); + } + /** * 应用树2 * diff --git a/src/main/resources/mapper/OcpApiGroupMapper.xml b/src/main/resources/mapper/OcpApiGroupMapper.xml index 33dc7f5dca854db22a3947606fda374ae8409753..485a79d98b5ad18c5be186886522a3fd74c11eca 100644 --- a/src/main/resources/mapper/OcpApiGroupMapper.xml +++ b/src/main/resources/mapper/OcpApiGroupMapper.xml @@ -53,7 +53,7 @@