diff --git a/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/PmsTenantDetailsController.java index 845a600511416c49ff8bede91d07350587758970..c2c60b53f9a1bd930aba3c3f3b2e5e5598e758f6 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 daf14a218b3aef804b9492240569c4599d834800..87c6803846c76df9d2d47c700c1feebaed345c2b 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 463d67761cca67cb502ea5ab43c7d2948a743409..8a509f45813b677929865d5e8e946037271f1114 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 074842d6dd7437ab245a127c50bc5b71e445b3aa..4b01b4ede96c2b74d947f31d50b60b6f57e551a8 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 8ac1a7fe92847c70a6c03ae89ff2735fc5c6cbb7..1b53d2103699b700e1fb2c91e5b7575d4773f255 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 d8343b4dbc5851f279f660ac4ab4c1ce94c54bd9..0000000000000000000000000000000000000000 --- 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 1cb7be2a1fc6bc6c1d7c18903705da2d87859aa9..0000000000000000000000000000000000000000 --- 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 5c8ad6f9a53671cf0165a93c1343e8f0a04ff8a0..0000000000000000000000000000000000000000 --- 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 4712e895e12c4ab4db54f2303fd47a49a7e1bc60..8a96c2bedf22c6827ee8cc5158e5ac62a0772503 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/PmsApiAuditMapper.xml @@ -10,7 +10,22 @@