diff --git a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java similarity index 66% rename from src/main/java/com/pms/ocp/controller/OcpDetailsController.java rename to src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java index 49caf2a1d2f8cfe1bf3e8212de1fc1b58764fd1e..c082f963e44ddb3a3aa79037b8ef1d1b080e1493 100644 --- a/src/main/java/com/pms/ocp/controller/OcpDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -1,33 +1,24 @@ package com.pms.ocp.controller; -import com.pms.ocp.model.entity.OcpApiAudit; -import com.pms.ocp.model.entity.OcpApiModelRel; -import com.pms.ocp.model.entity.OcpApiSubs; -import com.pms.ocp.model.entity.OcpApiTenantRel; +import com.pms.ocp.model.entity.*; import com.pms.ocp.model.vo.ResponseVO; -import com.pms.ocp.service.OcpApiAuditService; -import com.pms.ocp.service.OcpApiModelRelService; -import com.pms.ocp.service.OcpApiSubsService; -import com.pms.ocp.service.OcpApiTenantRelService; +import com.pms.ocp.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @Slf4j -@RequestMapping("/tenant") +@RequestMapping("/api") @RestController @Api(tags = "服务接口") -public class OcpDetailsController { +public class OcpApiDetailsController { @Autowired private OcpApiSubsService ocpApiSubsService; @@ -44,13 +35,13 @@ public class OcpDetailsController { @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(@RequestBody OcpApiSubs ocpApiSubs) { + public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(@RequestBody OcpApiAudit ocpApiAudit) { + public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } @@ -74,7 +65,7 @@ public class OcpDetailsController { @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { + public ResponseVO getOamrList(OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } @@ -85,9 +76,11 @@ public class OcpDetailsController { } @ApiOperation("服务大事记-导出") - @RequestMapping("/export") - public void exportExcel(@RequestBody(required = false) OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + @GetMapping("/export") + public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { ocpApiAuditService.exportExcel(ocpApiAudit,request,response); } + + } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java new file mode 100644 index 0000000000000000000000000000000000000000..d7c81c9cb29019746b01573df5684896940c4d24 --- /dev/null +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -0,0 +1,28 @@ +package com.pms.ocp.controller; + +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantBaseService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +@Slf4j +@RequestMapping("/tenant") +@RestController +@Api(tags = "应用接口") +public class OcpTenantDetailsController { + + @Autowired + private OcpTenantBaseService ocpTenantBaseService; + @ApiOperation("应用基础信息-查询") + @PostMapping("/getotbList") + public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ + return ocpTenantBaseService.getOtbList(ocpTenantBase); + } +} diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java new file mode 100644 index 0000000000000000000000000000000000000000..074842d6dd7437ab245a127c50bc5b71e445b3aa --- /dev/null +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantBaseMapper.java @@ -0,0 +1,10 @@ +package com.pms.ocp.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +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/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java new file mode 100644 index 0000000000000000000000000000000000000000..c82f777df1d6deda563058b9ad11acbefd707706 --- /dev/null +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -0,0 +1,8 @@ +package com.pms.ocp.service; + +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; + +public interface OcpTenantBaseService { + ResponseVO getOtbList(OcpTenantBase ocpTenantBase); +} diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java new file mode 100644 index 0000000000000000000000000000000000000000..d9520d63ab4ca6c70f2c5d9eac0dc8d247e003bc --- /dev/null +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -0,0 +1,21 @@ +package com.pms.ocp.service.impl; + +import com.pms.ocp.mapper.OcpTenantBaseMapper; +import com.pms.ocp.model.entity.OcpTenantBase; +import com.pms.ocp.model.vo.ResponseVO; +import com.pms.ocp.service.OcpTenantBaseService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service +public class OcpTenantBaseServiceImpl implements OcpTenantBaseService { + @Autowired + private OcpTenantBaseMapper ocpTenantBaseMapper; + @Override + public ResponseVO getOtbList(OcpTenantBase ocpTenantBase) { + List otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase); + return ResponseVO.ok(otbList); + } +} diff --git a/src/main/resources/mapper/OcpTenantBaseMapper.xml b/src/main/resources/mapper/OcpTenantBaseMapper.xml new file mode 100644 index 0000000000000000000000000000000000000000..7784a8ee50809624d2779585ec47ae0635121c8c --- /dev/null +++ b/src/main/resources/mapper/OcpTenantBaseMapper.xml @@ -0,0 +1,10 @@ + + + + + \ No newline at end of file