From 051ba77d8f8a0421b126c7cee3d2bd617b28724e Mon Sep 17 00:00:00 2001 From: liukai <35074062@qq.com> Date: Thu, 10 Mar 2022 17:34:03 +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 --- .../controller/OcpApiDetailsController.java | 17 +- .../OcpTenantDetailsController.java | 13 +- .../com/pms/ocp/mapper/OcpApiAuditMapper.java | 4 +- .../pms/ocp/mapper/OcpApiModelRelMapper.java | 2 +- .../com/pms/ocp/mapper/OcpApiSubsMapper.java | 2 +- .../pms/ocp/mapper/OcpApiTenantRelMapper.java | 2 +- .../pms/ocp/mapper/OcpTenantAuditMapper.java | 2 + .../com/pms/ocp/model/entity/OcpApiAudit.java | 230 ++++++++++++++++++ .../pms/ocp/model/entity/OcpApiTenantRel.java | 2 +- .../pms/ocp/service/OcpApiAuditService.java | 2 - .../ocp/service/OcpTenantAuditService.java | 2 + .../service/impl/OcpApiAuditServiceImpl.java | 10 +- .../impl/OcpApiModelRelServiceImpl.java | 2 +- .../service/impl/OcpApiSubsServiceImpl.java | 8 +- .../impl/OcpApiTenantRelServiceImpl.java | 2 +- .../impl/OcpTenantAuditServiceImpl.java | 6 + .../resources/mapper/OcpApiAuditMapper.xml | 4 +- .../resources/mapper/OcpApiModelRelMapper.xml | 2 +- .../resources/mapper/OcpApiSubsMapper.xml | 2 +- .../mapper/OcpApiTenantRelMapper.xml | 2 +- .../resources/mapper/OcpTenantAuditMapper.xml | 4 + 21 files changed, 282 insertions(+), 38 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java index c65a3a5..880f34d 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -12,6 +12,7 @@ import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import java.util.List; @Slf4j @@ -35,43 +36,43 @@ public class OcpApiDetailsController { @ApiOperation("服务订阅记录-查询") @PostMapping("/getocpapisublist") - public ResponseVO getOcpApiSubsList(OcpApiSubs ocpApiSubs) { + public ResponseVO> getOcpApiSubsList(OcpApiSubs ocpApiSubs) { return ocpApiSubsService.getOcpApiSubsList(ocpApiSubs); } @ApiOperation("服务大事记-查询") @PostMapping("/getocpapiauditlist") - public ResponseVO getOcpApiAuditList(OcpApiAudit ocpApiAudit) { + public ResponseVO> getOcpApiAuditList(OcpApiAudit ocpApiAudit) { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } @ApiOperation("服务大事记-查询详情") @PostMapping("/getocpapidetails") - public ResponseVO getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.sById(ocpApiAudit); } @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") - public ResponseVO getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ + public ResponseVO> getOcpApi(@RequestBody OcpApiAudit ocpApiAudit){ return ocpApiAuditService.OaaById(ocpApiAudit); } @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") - public ResponseVO getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { + public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { return ocpApiTenantRelService.getOatrList(ocpApiTenantRel); } @ApiOperation("服务与模型拓扑图-查询") @PostMapping("/getoamrlist") - public ResponseVO getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { + public ResponseVO> getOamrList(@RequestBody OcpApiModelRel ocpApiModelRel) { return ocpApiModelRelService.getOamrList(ocpApiModelRel); } @ApiOperation("服务大事记-导出") - @GetMapping("/export") - public void exportExcel(@RequestBody OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response) { + @RequestMapping("/export") + public void exportExcel(@RequestBody(required = false) 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 index 798c1d3..c4c2877 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -1,5 +1,6 @@ package com.pms.ocp.controller; +import com.pms.ocp.model.entity.OcpApiAudit; import com.pms.ocp.model.entity.OcpTenantAudit; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; @@ -15,6 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; +import java.util.List; + @Slf4j @RequestMapping("/tenant") @RestController @@ -29,13 +32,19 @@ public class OcpTenantDetailsController { @ApiOperation("应用基础信息-查询") @PostMapping("/getotbList") - public ResponseVO getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ + public ResponseVO> getOtbList(@RequestBody OcpTenantBase ocpTenantBase){ return ocpTenantBaseService.getOtbList(ocpTenantBase); } @ApiOperation("应用大事记-查询") @PostMapping("/getotaList") - public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) { + public ResponseVO> getOtaList(OcpTenantAudit ocpTenantAudit) { return ocpTenantAuditService.getOtaList(ocpTenantAudit); } + + @ApiOperation("应用大事记-查询详情") + @PostMapping("/getotaListById") + public ResponseVO> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) { + return ocpTenantAuditService.getOtaListById(ocpTenantAudit); + } } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index e9a61f2..7bbd2f7 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -16,8 +16,8 @@ public interface OcpApiAuditMapper extends BaseMapper { List OaaById(OcpApiAudit ocpApiAudit); - List getOcpApiSubsList(OcpApiAudit ocpApiAudit); + List getOcpApiSubsList(OcpApiAudit ocpApiAudit); - List sById(OcpApiAudit ocpApiAudit); + List sById(OcpApiAudit ocpApiAudit); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiModelRelMapper.java index 87dbd04..daf14a2 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); + List getOamrList(OcpApiModelRel ocpApiModelRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java index 11a06ca..2bc170c 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiSubsMapper.java @@ -8,5 +8,5 @@ import java.util.List; @Mapper public interface OcpApiSubsMapper extends BaseMapper { - List getOcpApisList(OcpApiSubs ocpApiSubs); + List getOcpApisList(OcpApiSubs ocpApiSubs); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java index 6e4e47a..84831be 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTenantRelMapper.java @@ -9,5 +9,5 @@ import java.util.List; @Mapper public interface OcpApiTenantRelMapper extends BaseMapper { - List getOatrList(OcpApiTenantRel ocpApiTenantRel); + List getOatrList(OcpApiTenantRel ocpApiTenantRel); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java index 30c4c13..ac21605 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -7,4 +7,6 @@ import java.util.List; public interface OcpTenantAuditMapper extends BaseMapper { List getOtaList(OcpTenantAudit ocpTenantAudit); + + List getOtaListById(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index 0b36e82..e5e4a20 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -115,5 +115,235 @@ public class OcpApiAudit { @ApiModelProperty("服务版本（最新版本）") private long apiVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + + public String getApiCode() { + return apiCode; + } + + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } + + public long getOperStatus() { + return operStatus; + } + + public void setOperStatus(long operStatus) { + this.operStatus = operStatus; + } + + public long getOperTarget() { + return operTarget; + } + + public void setOperTarget(long operTarget) { + this.operTarget = operTarget; + } + + public long getAuditType() { + return auditType; + } + + public void setAuditType(long auditType) { + this.auditType = auditType; + } + + public String getAuditMessage() { + return auditMessage; + } + + public void setAuditMessage(String auditMessage) { + this.auditMessage = auditMessage; + } + + public String getAuditJson() { + return auditJson; + } + + public void setAuditJson(String auditJson) { + this.auditJson = auditJson; + } + + public String getAuditUserId() { + return auditUserId; + } + + public void setAuditUserId(String auditUserId) { + this.auditUserId = auditUserId; + } + + public String getAuditUserName() { + return auditUserName; + } + + public void setAuditUserName(String auditUserName) { + this.auditUserName = auditUserName; + } + + public Timestamp getAuditCtime() { + return auditCtime; + } + + public void setAuditCtime(Timestamp auditCtime) { + this.auditCtime = auditCtime; + } + + public Timestamp getAuditMtime() { + return auditMtime; + } + + public void setAuditMtime(Timestamp auditMtime) { + this.auditMtime = auditMtime; + } + + public long getIsDelete() { + return isDelete; + } + + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + + public long getApplyVersion() { + return applyVersion; + } + + public void setApplyVersion(long applyVersion) { + this.applyVersion = applyVersion; + } + + public long getPreApiVersion() { + return preApiVersion; + } + + public void setPreApiVersion(long preApiVersion) { + this.preApiVersion = preApiVersion; + } + + public String getApiName() { + return apiName; + } + + public void setApiName(String apiName) { + this.apiName = apiName; + } + + public String getApiGroupCode() { + return apiGroupCode; + } + + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } + + public long getApiPromotion() { + return apiPromotion; + } + + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } + + public String getApiReq() { + return apiReq; + } + + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + + public String getApiResp() { + return apiResp; + } + + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } + + public String getApiUrl() { + return apiUrl; + } + + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } + + public Timestamp getApiCtime() { + return apiCtime; + } + + public void setApiCtime(Timestamp apiCtime) { + this.apiCtime = apiCtime; + } + + public Timestamp getApiMtime() { + return apiMtime; + } + + public void setApiMtime(Timestamp apiMtime) { + this.apiMtime = apiMtime; + } + + public String getApiUserId() { + return apiUserId; + } + + public void setApiUserId(String apiUserId) { + this.apiUserId = apiUserId; + } + + public String getApiUnit() { + return apiUnit; + } + + public void setApiUnit(String apiUnit) { + this.apiUnit = apiUnit; + } + + public String getOwnerCompanyCode() { + return ownerCompanyCode; + } + + public void setOwnerCompanyCode(String ownerCompanyCode) { + this.ownerCompanyCode = ownerCompanyCode; + } + + public String getOwnerCompanyName() { + return ownerCompanyName; + } + + public void setOwnerCompanyName(String ownerCompanyName) { + this.ownerCompanyName = ownerCompanyName; + } + + public long getApiZone() { + return apiZone; + } + + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } + + public long getApiLayer() { + return apiLayer; + } + + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } + + public long getApiVersion() { + return apiVersion; + } + + public void setApiVersion(long apiVersion) { + this.apiVersion = apiVersion; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java index 072478d..0455acc 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -11,7 +11,7 @@ import java.sql.Timestamp; @Data @Accessors(chain = true) -@TableName("ocp_api_Tenant_rel") + @ApiModel("服务应用关系表") public class OcpApiTenantRel { diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index 8983669..3478281 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -12,8 +12,6 @@ public interface OcpApiAuditService { ResponseVO getOcpApiDetails(String objId); -// ResponseVO getOcpApiList(Oaa oaa); - ResponseVO OaaById(OcpApiAudit ocpApiAudit); ResponseVO sById(OcpApiAudit ocpApiAudit); diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java index 9b67b16..8ecc267 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -5,4 +5,6 @@ import com.pms.ocp.model.vo.ResponseVO; public interface OcpTenantAuditService { ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit); + + ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java index 522a928..654b83d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -27,12 +27,8 @@ public class OcpApiAuditServiceImpl extends ServiceImpl ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); - if(CollectionUtils.isEmpty(ocpApiAuditList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiAuditList); - } + List ocpApiAuditList = ocpApiAuditMapper.getOcpApiSubsList(ocpApiAudit); + return ResponseVO.ok(ocpApiAuditList); } @@ -50,7 +46,7 @@ public class OcpApiAuditServiceImpl extends ServiceImpl oaaById = ocpApiAuditMapper.sById(ocpApiAudit); + List oaaById = ocpApiAuditMapper.sById(ocpApiAudit); return ResponseVO.ok(oaaById); } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java index 48afb59..118a294 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiModelRelServiceImpl.java @@ -16,7 +16,7 @@ public class OcpApiModelRelServiceImpl extends ServiceImpl ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); + List ocpApiModelRelList = ocpApiModelRelMapper.getOamrList(ocpApiModelRel); return ResponseVO.ok(ocpApiModelRelList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java index 4796e1a..e6b4f4d 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiSubsServiceImpl.java @@ -20,11 +20,7 @@ public class OcpApiSubsServiceImpl extends ServiceImpl ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); - if(CollectionUtils.isEmpty(ocpApiSubsList)){ - return ResponseVO.error("查询列表为空"); - }else{ - return ResponseVO.ok(ocpApiSubsList); - } + List ocpApiSubsList = ocpApiSubsMapper.getOcpApisList(ocpApiSubs); + return ResponseVO.ok(ocpApiSubsList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java index f79c75a..0e5b9a9 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTenantRelServiceImpl.java @@ -19,7 +19,7 @@ public class OcpApiTenantRelServiceImpl extends ServiceImpl oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); + List oatrList = ocpApiTenantRelMapper.getOatrList(ocpApiTenantRel); return ResponseVO.ok(oatrList); } } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java index 1fa4958..75aa9ee 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -20,4 +20,10 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit); return ResponseVO.ok(otaList); } + + @Override + public ResponseVO getOtaListById(OcpTenantAudit ocpTenantAudit) { + List otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); + return ResponseVO.ok(otaListById); + } } diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index abec0d9..2d9c4e6 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -9,11 +9,11 @@ where oaa.obj_id = #{objId} - select * from ocp_api_audit - select * from ocp_api_audit where obj_id = #{objId} \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiModelRelMapper.xml b/src/main/resources/mapper/OcpApiModelRelMapper.xml index b843637..d8343b4 100644 --- a/src/main/resources/mapper/OcpApiModelRelMapper.xml +++ b/src/main/resources/mapper/OcpApiModelRelMapper.xml @@ -2,7 +2,7 @@ - select * from ocp_api_model_rel oamr LEFT JOIN ocp_model_base omb on oamr.model_code = omb.model_code diff --git a/src/main/resources/mapper/OcpApiSubsMapper.xml b/src/main/resources/mapper/OcpApiSubsMapper.xml index d3895ae..07da0a9 100644 --- a/src/main/resources/mapper/OcpApiSubsMapper.xml +++ b/src/main/resources/mapper/OcpApiSubsMapper.xml @@ -4,7 +4,7 @@ - SELECT * from ocp_api_subs oas left JOIN ocp_api_base oab on oas.api_code = oab.api_code diff --git a/src/main/resources/mapper/OcpApiTenantRelMapper.xml b/src/main/resources/mapper/OcpApiTenantRelMapper.xml index 927727a..d74e7c0 100644 --- a/src/main/resources/mapper/OcpApiTenantRelMapper.xml +++ b/src/main/resources/mapper/OcpApiTenantRelMapper.xml @@ -2,7 +2,7 @@ - SELECT * from ocp_api_tenant_rel oa LEFT JOIN ocp_api_base ab on oa.api_code = ab.api_code INNER JOIN diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml index 6da0b3a..010d6c6 100644 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -4,4 +4,8 @@ + + \ No newline at end of file -- 2.26.0