From d7e23150b6d09e49265b1481f4a335e7c0a8297f Mon Sep 17 00:00:00 2001 From: liukai <35074062@qq.com> Date: Fri, 18 Mar 2022 17:34:42 +0800 Subject: [PATCH] =?UTF-8?q?=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../PmsTenantDetailsController.java | 12 ++++----- .../pms/ocp/mapper/OcpApiModelRelMapper.java | 2 +- .../pms/ocp/mapper/OcpTenantAuditMapper.java | 6 ----- .../pms/ocp/mapper/OcpTenantBaseMapper.java | 2 +- .../pms/ocp/mapper/OcpTenantSubsMapper.java | 2 +- .../resources/mapper/OcpApiModelRelMapper.xml | 13 ---------- .../resources/mapper/OcpTenantAuditMapper.xml | 25 ------------------- .../resources/mapper/OcpTenantSubsMapper.xml | 12 --------- ...iAuditMapper.xml => PmsApiAuditMapper.xml} | 17 ++++++++++++- ...ApiSubsMapper.xml => PmsApiSubsMapper.xml} | 0 10 files changed, 25 insertions(+), 66 deletions(-) delete mode 100644 src/main/resources/mapper/OcpApiModelRelMapper.xml delete mode 100644 src/main/resources/mapper/OcpTenantAuditMapper.xml delete mode 100644 src/main/resources/mapper/OcpTenantSubsMapper.xml rename src/main/resources/mapper/{OcpApiAuditMapper.xml => PmsApiAuditMapper.xml} (73%) rename src/main/resources/mapper/{OcpApiSubsMapper.xml => PmsApiSubsMapper.xml} (100%) diff --git a/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java index 845a600..c2c60b5 100644 --- a/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java @@ -31,7 +31,7 @@ public class PmsTenantDetailsController { private PmsTenantSubsService pmsTenantSubsService; @Autowired - private OcpApiTenantRelService ocpApiTenantRelService; + private PmsApiTenantRelService pmsApiTenantRelService; @ApiOperation("应用基础信息-查询") @@ -53,11 +53,11 @@ public class PmsTenantDetailsController { return pmsTenantSubsService.getOcpTenantList(pmsTenantSubs); } -// @ApiOperation("应用与服务拓扑图-查询") -// @PostMapping("/getOcpTenantApiList") -// public ResponseVO> getOcpTenantApiList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { -// return ocpApiTenantRelService.getTenantApiList(ocpApiTenantRel); -// } + @ApiOperation("应用与服务拓扑图-查询") + @PostMapping("/getOcpTenantApiList") + public ResponseVO> getOcpTenantApiList(@RequestBody PmsApiTenantRel pmsApiTenantRel) { + return pmsApiTenantRelService.getTenantApiList(pmsApiTenantRel); + } @ApiOperation("应用大事记-导出") @PostMapping("/export") diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java index daf14a2..87c6803 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java @@ -8,7 +8,7 @@ import java.util.List; @Mapper public interface OcpApiModelRelMapper extends BaseMapper { - List getOamrList(OcpApiModelRel ocpApiModelRel); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java index 463d677..8a509f4 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -6,11 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantAudit; import java.util.List; public interface OcpTenantAuditMapper extends BaseMapper { - List getOtaList(OcpTenantAudit ocpTenantAudit); - List getOtaListById(OcpTenantAudit ocpTenantAudit); - - List OtaById(OcpTenantAudit ocpTenantAudit); - - List versionId(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java index 074842d..4b01b4e 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -6,5 +6,5 @@ import com.pms.ocp.model.entity.OcpTenantBase; import java.util.List; public interface OcpTenantBaseMapper extends BaseMapper { - List getOtbList(OcpTenantBase ocpTenantBase); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java index 8ac1a7f..1b53d21 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantSubsMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface OcpTenantSubsMapper extends BaseMapper { - List getOcpTenantList(OcpTenantSubs ocpTenantSubs); + } diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/OcpApiModelRelMapper.xml deleted file mode 100644 index d8343b4..0000000 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml deleted file mode 100644 index 1cb7be2..0000000 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantSubsMapper.xml b/src/main/resources/mapper/OcpTenantSubsMapper.xml deleted file mode 100644 index 5c8ad6f..0000000 --- a/src/main/resources/mapper/OcpTenantSubsMapper.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/PmsApiAuditMapper.xml similarity index 73% rename from src/main/resources/mapper/OcpApiAuditMapper.xml rename to src/main/resources/mapper/PmsApiAuditMapper.xml index 4712e89..8a96c2b 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/PmsApiAuditMapper.xml @@ -10,7 +10,22 @@