From d93016cae5fd11872b0a06572352d5996cea81d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= Date: Sun, 27 Mar 2022 16:10:20 +0800 Subject: [PATCH] =?UTF-8?q?=20=20=E7=9C=81=E6=B5=8B-=E5=BA=94=E7=94=A8?= =?UTF-8?q?=E6=8E=A5=E5=85=A5=E7=94=B3=E8=AF=B7-=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E5=92=8C=E5=BA=94=E7=94=A8=E5=85=B3=E8=81=94=E7=9A=84=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=20=20=20=20-=E7=BC=96=E8=BE=91=E5=92=8C=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E5=BA=94=E7=94=A8=E6=9C=8D=E5=8A=A1=E5=85=B3=E7=B3=BB?= =?UTF-8?q?=20=20=20=20=20-=E7=BC=96=E8=BE=91=E5=92=8C=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E5=BA=94=E7=94=A8=20=20=20=20=20=20=E6=9D=A1=E4=BB=B6=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ApiBasicManagementController.java | 2 +- .../TenantBasicManagementController.java | 18 +-- .../service/ApiBasicManagementService.java | 2 +- .../service/TenantBasicManagementService.java | 12 +- .../impl/ApiBasicManagementServiceImpl.java | 2 +- .../TenantBasicManagementServiceImpl.java | 122 +++++++++--------- 6 files changed, 77 insertions(+), 81 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 27a967f..05f049d 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -209,7 +209,7 @@ public class ApiBasicManagementController { return ResponseVO.ok(apiBaseList); } - @ApiOperation("个人信息编辑中的模糊查询") + @ApiOperation("省侧-应用接入申请-的模糊查询") @GetMapping("/selectByCondition") public ResponseVO >selectByCondition(@RequestParam(required = false) String apiCode, @RequestParam(required = false) String apiName, diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index fc72d1e..739b6f6 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -125,19 +125,19 @@ public class TenantBasicManagementController { - @ApiOperation("个人信息中-编辑") - @PostMapping("/update") - public ResponseVO update(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ + @ApiOperation("省测-应用接入申请-编辑和添加应用服务关系") + @PostMapping("/updateByCondition") + public ResponseVO updateByCondition(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ return tenantBasicManagementService.updateByCondition(ocpBaseTiocnDto); } - @ApiOperation("个人信息中-查询和应用关联的服务") + @ApiOperation("省测-应用接入申请-查询和应用关联的服务") @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); - } + @ApiOperation("省测-应用接入申请-编辑和发布应用") + @PostMapping("/saveAndUpdateTenant") + public ResponseVO saveAndUpdateTenant(@RequestBody OcpBaseTiocnDto ocpBaseTiocnDto){ + return tenantBasicManagementService.saveAndUpdateTenant(ocpBaseTiocnDto); + } } diff --git a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java index 2c55ca4..c7424a7 100644 --- a/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/ApiBasicManagementService.java @@ -82,7 +82,7 @@ public interface ApiBasicManagementService extends IService { /** - * 编辑中的模糊查询 + * 省侧-应用接入申请-的模糊查询 * @param apiCode * @param apiName * @param apiCenterCode diff --git a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java index aa57fd2..9fda6bf 100644 --- a/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java +++ b/src/main/java/com/pms/ocp/service/TenantBasicManagementService.java @@ -89,25 +89,27 @@ public interface TenantBasicManagementService extends IService { List selectBase(String tenantGroupCode, String tenantGroupCompanyCode); /** - * 个人信息中编辑 + * 省测-应用接入申请-编辑和添加应用服务关系 * @param ocpBaseTiocnDto * @return */ ResponseVO updateByCondition(OcpBaseTiocnDto ocpBaseTiocnDto); /** - * 个人信息中-查询和应用关联的服务 + * 省测-应用接入申请-查询和应用关联的服务 * @param tenantCode * @return */ ResponseVO >selectOcpByApi(String tenantCode); - /** - * 添加应用服务关系 + + /** + * 省测-应用接入申请-编辑和发布应用 + * @param ocpBaseTiocnDto * @return */ - ResponseVO saveTenantAndApi( OcpBaseTiocnDto ocpBaseTiocnDto); + ResponseVO saveAndUpdateTenant(OcpBaseTiocnDto ocpBaseTiocnDto); /** * 应用树 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 4eae1c1..0ab9834 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -259,7 +259,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl implements TenantBasicManagementService { @Autowired private TenantBasicManagementMapper tenantBasicManagementMapper; @@ -330,7 +332,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); - lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode); - boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2); - if (flag) { - log.info("应用基础表修改成功"); - System.out.println("应用基础表修改成功"); - } - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode); - boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper); - if (remove) { - log.info("图标表删除成功"); - System.out.println("图标表删除成功"); - } - - //添加新的数据到图标表 - OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); - Object iocn = ocpBaseTiocnDto.getIocn(); String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode(); - ocpTenantIocn.setCodeNo(tenantCode); - ocpTenantIocn.setIocnType("tenant"); - ocpTenantIocn.setIocn(iocn); - ocpTenantIocn.setCompanyCode(ownerCompanyCode); - boolean save = ocpTenantIocnService.save(ocpTenantIocn); - if (save) { - log.info("添加图标表成功"); - System.out.println("添加图标表成功"); - } //先删除应用服务关联 LambdaQueryWrapper lambdaQueryWrapper1 = new LambdaQueryWrapper<>(); lambdaQueryWrapper1.eq(OcpApiTenantRel::getTenantCode, tenantCode); @@ -377,7 +350,7 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl apiCode = Arrays.asList(split); @@ -387,8 +360,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl lambdaQueryWrapper = new LambdaQueryWrapper<>(); lambdaQueryWrapper.eq(StringUtils.isNotEmpty(tenantCode), OcpApiTenantRel::getTenantCode, tenantCode); List ocpApiTenantRel = ocpApiTenantRelMapper.selectList(lambdaQueryWrapper); - + List list = new ArrayList<>(); if (ocpApiTenantRel.size() == 0) { return ResponseVO.ok(Collections.EMPTY_LIST); } else { @@ -416,48 +389,69 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); String apiCode = apiTenantRel.getApiCode(); queryWrapper.eq(StringUtils.isNotEmpty(apiCode), OcpApiBase::getApiCode, apiCode); - List list = apiBasicManagementMapper.selectList(queryWrapper); - return ResponseVO.ok(list); + OcpApiBase ocpApiBase = apiBasicManagementMapper.selectOne(queryWrapper); + list.add(ocpApiBase); + } } - return ResponseVO.ok(); + return ResponseVO.ok(list); } /** - * 添加应用服务关系 + * 省测-应用接入申请-编辑和发布应用 * + * @param ocpBaseTiocnDto * @return */ @Override - public ResponseVO saveTenantAndApi(OcpBaseTiocnDto ocpBaseTiocnDto) { - String apiCodes = ocpBaseTiocnDto.getApiCodes(); + public ResponseVO saveAndUpdateTenant(OcpBaseTiocnDto ocpBaseTiocnDto) { String tenantCode = ocpBaseTiocnDto.getTenantCode(); - String[] split = apiCodes.split(","); - List apiCode = Arrays.asList(split); - if (apiCode.size() == 0) { - return ResponseVO.error("请选择你要关联的服务"); + OcpTenantBase ocpTenantBase = new OcpTenantBase(); + BeanUtils.copyProperties(ocpBaseTiocnDto, ocpTenantBase); + LambdaQueryWrapper lambdaQueryWrapper2 = new LambdaQueryWrapper<>(); + lambdaQueryWrapper2.eq(OcpTenantBase::getTenantCode, tenantCode); +// boolean flag = this.update(ocpTenantBase, lambdaQueryWrapper2); +// if (flag) { +// log.info("应用基础表修改成功"); +// System.out.println("应用基础表修改成功"); +// } + int delete = tenantBasicManagementMapper.delete(lambdaQueryWrapper2); + if (delete == 0) { + log.info("增加"); + } else { + log.info("编辑"); } - //先删除之前关联的 - 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("添加失败"); - } + boolean save1 = this.save(ocpTenantBase); + if (save1) { + log.info("基础表添加成功"); + } + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.eq(OcpTenantIocn::getCodeNo, tenantCode); + boolean remove = ocpTenantIocnService.remove(lambdaQueryWrapper); + if (remove) { + log.info("图标表删除成功"); + System.out.println("图标表删除成功"); + } + + //添加新的数据到图标表 + OcpTenantIocn ocpTenantIocn = new OcpTenantIocn(); + Object iocn = ocpBaseTiocnDto.getIocn(); + String ownerCompanyCode = ocpBaseTiocnDto.getOwnerCompanyCode(); + ocpTenantIocn.setCodeNo(tenantCode); + ocpTenantIocn.setIocnType("tenant"); + ocpTenantIocn.setIocn(iocn); + ocpTenantIocn.setCompanyCode(ownerCompanyCode); + boolean save = ocpTenantIocnService.save(ocpTenantIocn); + if (save) { + log.info("添加图标表成功"); + System.out.println("添加图标表成功"); + } + if (save1 && save) { + return ResponseVO.ok("添加成功"); } - return ResponseVO.error("系统异常"); + return ResponseVO.error("未知错误"); } /** -- 2.26.0