diff --git a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java index 986cb711e9f61d21c6d83e5564e0600cc6a5d71a..6a11939c9c65c07e854b34683bd4af36794155bb 100644 --- a/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/ApiBasicManagementController.java @@ -194,18 +194,24 @@ public class ApiBasicManagementController { return apiBasicManagementService.getBaseByGroupCode(ApiBaseReq); } - @ApiOperation("服务树一级") + /* @ApiOperation("服务树一级") @GetMapping("/apiBaseTree") public ResponseVO> apiBaseTree(String apiGroupCompanyCode, Integer apiGroupPromotionType) { List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,null,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); - } + }*/ - @ApiOperation("服务树层级") + @ApiOperation("服务分类层级") @GetMapping("/apiBaseTreeOther") public ResponseVO> apiBaseTreeOther(String apiGroupCompanyCode, String apiGroupCode, Integer apiGroupPromotionType) { List apiTreeGroupDtos = apiBasicManagementService.apiBaseTreeOther(apiGroupCompanyCode,apiGroupCode,apiGroupPromotionType); return ResponseVO.ok(apiTreeGroupDtos); } + @ApiOperation("服务树列表") + @GetMapping("/apiBaseTreeList") + public ResponseVO> apiBaseTreeList(String apiGroupCompanyCode, String apiGroupCode) { + List apiBaseList = apiBasicManagementService.apiBaseTreeApiList(apiGroupCompanyCode, apiGroupCode); + return ResponseVO.ok(apiBaseList); + } } diff --git a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java index 927cfe41b68596cf55bea5822b12e4e5cd28462b..3bc5b21652b9a26030ab7ef6dffebe6dc4c53f1d 100644 --- a/src/main/java/com/pms/ocp/controller/ApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/ApiDetailsController.java @@ -24,8 +24,8 @@ public class ApiDetailsController { @ApiOperation("服务库服务详情-查询") @GetMapping("/query") - public ResponseVO getApiDetails(String objId) { - return apiDetailsService.getApiDetails(objId); + public ResponseVO getApiDetails(String code) { + return apiDetailsService.getApiDetails(code); } } diff --git a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java index 880f34de8f2c548b4c7ace19ba8fd7d10719bf9c..4fc3e0e02eb30cfdad30f3411a14b16f1a467ee0 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiDetailsController.java @@ -46,11 +46,11 @@ public class OcpApiDetailsController { return ocpApiAuditService.getOcpApiAuditList(ocpApiAudit); } - @ApiOperation("服务大事记-查询详情") - @PostMapping("/getocpapidetails") - public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ - return ocpApiAuditService.sById(ocpApiAudit); - } +// @ApiOperation("服务大事记-查询详情") +// @PostMapping("/getocpapidetails") +// public ResponseVO> getOcpApiDetails(@RequestBody OcpApiAudit ocpApiAudit){ +// return ocpApiAuditService.sById(ocpApiAudit); +// } @ApiOperation("服务大事记-查询详情-变更内容") @PostMapping("/getocpapi") @@ -58,6 +58,12 @@ public class OcpApiDetailsController { return ocpApiAuditService.OaaById(ocpApiAudit); } + @ApiOperation("服务大事记-历史版本") + @PostMapping("/versionid") + public ResponseVO> versionId(@RequestBody OcpApiAudit ocpApiAudit){ + return ocpApiAuditService.versionId(ocpApiAudit); + } + @ApiOperation("服务与应用拓扑图-查询") @PostMapping("/getoatrlist") public ResponseVO> getOatrList(@RequestBody OcpApiTenantRel ocpApiTenantRel) { diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 3b2472466e298fdecc3092132b3ea76749b87863..22cdc6b4f2f6deeaf9a8f2d2b1c392f95fc73338 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -42,8 +42,8 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") - public ResponseVO inseter(@RequestBody OcpApiGroupDtos ocpApiGroupDtos){ - boolean flag = service.insertTree(ocpApiGroupDtos); + public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ + boolean flag = service.insertTree(ocpApiGroup); if (flag){ return ResponseVO.ok(); } diff --git a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java index 89b08a2d50b03cd7ba210fbd54ac3bc6d56a6528..dcc8c8042f7d546e78c71c1c97da5817a4f53a78 100644 --- a/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java +++ b/src/main/java/com/pms/ocp/controller/OcpTenantDetailsController.java @@ -10,13 +10,12 @@ 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 org.springframework.web.multipart.MultipartFile; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import javax.xml.transform.Result; import java.util.List; @Slf4j @@ -50,11 +49,6 @@ public class OcpTenantDetailsController { return ocpTenantAuditService.getOtaList(ocpTenantAudit); } - @ApiOperation("应用大事记-查询详情") - @PostMapping("/getotaListById") - public ResponseVO> getOtaListById(@RequestBody OcpTenantAudit ocpTenantAudit) { - return ocpTenantAuditService.getOtaListById(ocpTenantAudit); - } @ApiOperation("应用订阅记录-查询") @PostMapping("/getOcpTenantList") @@ -78,4 +72,12 @@ public class OcpTenantDetailsController { public ResponseVO> getOcpTenant(@RequestBody OcpTenantAudit ocpTenantAudit){ return ocpTenantAuditService.OtaById(ocpTenantAudit); } + + @ApiOperation("应用大事记-查询详情-历史版本") + @PostMapping("/versionId") + public ResponseVO> versionId(@RequestBody OcpTenantAudit ocpTenantAudit){ + return ocpTenantAuditService.versionId(ocpTenantAudit); + } + + } diff --git a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java b/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java index bd94f4136b5c4eecf20fea19a916b76a049d9b83..1f3efbcdfd396bee80ddd9e34810b92b7960d3da 100644 --- a/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java +++ b/src/main/java/com/pms/ocp/mapper/ApiDetailsMapper.java @@ -11,6 +11,5 @@ import java.util.List; @Mapper public interface ApiDetailsMapper extends BaseMapper { - - + OcpApiBaseVo selectByCode(String code); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java index 7bbd2f7a0e8216ac088cf09dbd386fd7688990a7..aa5936b489e08cbfcb8aa2d717a303b919b14ffa 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiAuditMapper.java @@ -20,4 +20,6 @@ public interface OcpApiAuditMapper extends BaseMapper { List sById(OcpApiAudit ocpApiAudit); + List versionId (OcpApiAudit ocpApiAudit); + } diff --git a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index c4ad7ec474960356cfb82dc467645cd53a7914aa..3e6f5e7bdb86946232905d833c50c436a5036d37 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,5 +32,8 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectList(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode,Long apiGroupLevel); + +//code重复问题 + List selectGroupCode(); } diff --git a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java index 87f777be215ccc755467f0293ff80f85c20bcc79..463d67761cca67cb502ea5ab43c7d2948a743409 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpTenantAuditMapper.java @@ -11,4 +11,6 @@ public interface OcpTenantAuditMapper extends BaseMapper { List getOtaListById(OcpTenantAudit ocpTenantAudit); List OtaById(OcpTenantAudit ocpTenantAudit); + + List versionId(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java index f2b40d6c69b21511c661ab88862f1c57106316d1..632463f5ba94a392c4a2b1261642cafd7c382cf9 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiGroup.java @@ -16,6 +16,7 @@ import java.util.List; @TableName("ocp_api_group") @ApiModel("服务分类表") public class OcpApiGroup { + @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") private String objId; diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java index 0f2c871d1266b8e86866d58978e433f42a67fc54..479c93b08166a34561e6787a0ff1a206a7385601 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java @@ -447,99 +447,99 @@ public class OcpTenantBase implements Serializable { public void setTenantVersion(String tenantVersion) { this.tenantVersion = tenantVersion; } - - @Override - public boolean equals(Object that) { - if (this == that) { - return true; - } - if (that == null) { - return false; - } - if (getClass() != that.getClass()) { - return false; - } - OcpTenantBase other = (OcpTenantBase) that; - return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) - && (this.getTenantName() == null ? other.getTenantName() == null : this.getTenantName().equals(other.getTenantName())) - && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) - && (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode())) - && (this.getTenantIp() == null ? other.getTenantIp() == null : this.getTenantIp().equals(other.getTenantIp())) - && (this.getTenantUrl() == null ? other.getTenantUrl() == null : this.getTenantUrl().equals(other.getTenantUrl())) - && (this.getProfessionalKind() == null ? other.getProfessionalKind() == null : this.getProfessionalKind().equals(other.getProfessionalKind())) - && (this.getTenantUserId() == null ? other.getTenantUserId() == null : this.getTenantUserId().equals(other.getTenantUserId())) - && (this.getTenantOrderNo() == null ? other.getTenantOrderNo() == null : this.getTenantOrderNo().equals(other.getTenantOrderNo())) - && (this.getTenantCtime() == null ? other.getTenantCtime() == null : this.getTenantCtime().equals(other.getTenantCtime())) - && (this.getTenantMtime() == null ? other.getTenantMtime() == null : this.getTenantMtime().equals(other.getTenantMtime())) - && (this.getDeploymentName() == null ? other.getDeploymentName() == null : this.getDeploymentName().equals(other.getDeploymentName())) - && (this.getTenantDescription() == null ? other.getTenantDescription() == null : this.getTenantDescription().equals(other.getTenantDescription())) - && (this.getTenantState() == null ? other.getTenantState() == null : this.getTenantState().equals(other.getTenantState())) - && (this.getTenantUnit() == null ? other.getTenantUnit() == null : this.getTenantUnit().equals(other.getTenantUnit())) - && (this.getOwnerCompanyCode() == null ? other.getOwnerCompanyCode() == null : this.getOwnerCompanyCode().equals(other.getOwnerCompanyCode())) - && (this.getOwnerCompanyName() == null ? other.getOwnerCompanyName() == null : this.getOwnerCompanyName().equals(other.getOwnerCompanyName())) - && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())) - && (this.getTenantZone() == null ? other.getTenantZone() == null : this.getTenantZone().equals(other.getTenantZone())) - && (this.getTenantLayer() == null ? other.getTenantLayer() == null : this.getTenantLayer().equals(other.getTenantLayer())) - && (this.getTenantVersion() == null ? other.getTenantVersion() == null : this.getTenantVersion().equals(other.getTenantVersion())); - } - - @Override - public int hashCode() { - final int prime = 31; - int result = 1; - result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); - result = prime * result + ((getTenantName() == null) ? 0 : getTenantName().hashCode()); - result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); - result = prime * result + ((getTenantGroupCode() == null) ? 0 : getTenantGroupCode().hashCode()); - result = prime * result + ((getTenantIp() == null) ? 0 : getTenantIp().hashCode()); - result = prime * result + ((getTenantUrl() == null) ? 0 : getTenantUrl().hashCode()); - result = prime * result + ((getProfessionalKind() == null) ? 0 : getProfessionalKind().hashCode()); - result = prime * result + ((getTenantUserId() == null) ? 0 : getTenantUserId().hashCode()); - result = prime * result + ((getTenantOrderNo() == null) ? 0 : getTenantOrderNo().hashCode()); - result = prime * result + ((getTenantCtime() == null) ? 0 : getTenantCtime().hashCode()); - result = prime * result + ((getTenantMtime() == null) ? 0 : getTenantMtime().hashCode()); - result = prime * result + ((getDeploymentName() == null) ? 0 : getDeploymentName().hashCode()); - result = prime * result + ((getTenantDescription() == null) ? 0 : getTenantDescription().hashCode()); - result = prime * result + ((getTenantState() == null) ? 0 : getTenantState().hashCode()); - result = prime * result + ((getTenantUnit() == null) ? 0 : getTenantUnit().hashCode()); - result = prime * result + ((getOwnerCompanyCode() == null) ? 0 : getOwnerCompanyCode().hashCode()); - result = prime * result + ((getOwnerCompanyName() == null) ? 0 : getOwnerCompanyName().hashCode()); - result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); - result = prime * result + ((getTenantZone() == null) ? 0 : getTenantZone().hashCode()); - result = prime * result + ((getTenantLayer() == null) ? 0 : getTenantLayer().hashCode()); - result = prime * result + ((getTenantVersion() == null) ? 0 : getTenantVersion().hashCode()); - return result; - } - - @Override - public String toString() { - StringBuilder sb = new StringBuilder(); - sb.append(getClass().getSimpleName()); - sb.append(" ["); - sb.append("Hash = ").append(hashCode()); - sb.append(", objId=").append(objId); - sb.append(", tenantName=").append(tenantName); - sb.append(", tenantCode=").append(tenantCode); - sb.append(", tenantGroupCode=").append(tenantGroupCode); - sb.append(", tenantIp=").append(tenantIp); - sb.append(", tenantUrl=").append(tenantUrl); - sb.append(", professionalKind=").append(professionalKind); - sb.append(", tenantUserId=").append(tenantUserId); - sb.append(", tenantOrderNo=").append(tenantOrderNo); - sb.append(", tenantCtime=").append(tenantCtime); - sb.append(", tenantMtime=").append(tenantMtime); - sb.append(", deploymentName=").append(deploymentName); - sb.append(", tenantDescription=").append(tenantDescription); - sb.append(", tenantState=").append(tenantState); - sb.append(", tenantUnit=").append(tenantUnit); - sb.append(", ownerCompanyCode=").append(ownerCompanyCode); - sb.append(", ownerCompanyName=").append(ownerCompanyName); - sb.append(", isDelete=").append(isDelete); - sb.append(", tenantZone=").append(tenantZone); - sb.append(", tenantLayer=").append(tenantLayer); - sb.append(", tenantVersion=").append(tenantVersion); - sb.append(", serialVersionUID=").append(serialVersionUID); - sb.append("]"); - return sb.toString(); - } +// +// @Override +// public boolean equals(Object that) { +// if (this == that) { +// return true; +// } +// if (that == null) { +// return false; +// } +// if (getClass() != that.getClass()) { +// return false; +// } +// OcpTenantBase other = (OcpTenantBase) that; +// return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) +// && (this.getTenantName() == null ? other.getTenantName() == null : this.getTenantName().equals(other.getTenantName())) +// && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) +// && (this.getTenantGroupCode() == null ? other.getTenantGroupCode() == null : this.getTenantGroupCode().equals(other.getTenantGroupCode())) +// && (this.getTenantIp() == null ? other.getTenantIp() == null : this.getTenantIp().equals(other.getTenantIp())) +// && (this.getTenantUrl() == null ? other.getTenantUrl() == null : this.getTenantUrl().equals(other.getTenantUrl())) +// && (this.getProfessionalKind() == null ? other.getProfessionalKind() == null : this.getProfessionalKind().equals(other.getProfessionalKind())) +// && (this.getTenantUserId() == null ? other.getTenantUserId() == null : this.getTenantUserId().equals(other.getTenantUserId())) +// && (this.getTenantOrderNo() == null ? other.getTenantOrderNo() == null : this.getTenantOrderNo().equals(other.getTenantOrderNo())) +// && (this.getTenantCtime() == null ? other.getTenantCtime() == null : this.getTenantCtime().equals(other.getTenantCtime())) +// && (this.getTenantMtime() == null ? other.getTenantMtime() == null : this.getTenantMtime().equals(other.getTenantMtime())) +// && (this.getDeploymentName() == null ? other.getDeploymentName() == null : this.getDeploymentName().equals(other.getDeploymentName())) +// && (this.getTenantDescription() == null ? other.getTenantDescription() == null : this.getTenantDescription().equals(other.getTenantDescription())) +// && (this.getTenantState() == null ? other.getTenantState() == null : this.getTenantState().equals(other.getTenantState())) +// && (this.getTenantUnit() == null ? other.getTenantUnit() == null : this.getTenantUnit().equals(other.getTenantUnit())) +// && (this.getOwnerCompanyCode() == null ? other.getOwnerCompanyCode() == null : this.getOwnerCompanyCode().equals(other.getOwnerCompanyCode())) +// && (this.getOwnerCompanyName() == null ? other.getOwnerCompanyName() == null : this.getOwnerCompanyName().equals(other.getOwnerCompanyName())) +// && (this.getIsDelete() == null ? other.getIsDelete() == null : this.getIsDelete().equals(other.getIsDelete())) +// && (this.getTenantZone() == null ? other.getTenantZone() == null : this.getTenantZone().equals(other.getTenantZone())) +// && (this.getTenantLayer() == null ? other.getTenantLayer() == null : this.getTenantLayer().equals(other.getTenantLayer())) +// && (this.getTenantVersion() == null ? other.getTenantVersion() == null : this.getTenantVersion().equals(other.getTenantVersion())); +// } +// +// @Override +// public int hashCode() { +// final int prime = 31; +// int result = 1; +// result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); +// result = prime * result + ((getTenantName() == null) ? 0 : getTenantName().hashCode()); +// result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); +// result = prime * result + ((getTenantGroupCode() == null) ? 0 : getTenantGroupCode().hashCode()); +// result = prime * result + ((getTenantIp() == null) ? 0 : getTenantIp().hashCode()); +// result = prime * result + ((getTenantUrl() == null) ? 0 : getTenantUrl().hashCode()); +// result = prime * result + ((getProfessionalKind() == null) ? 0 : getProfessionalKind().hashCode()); +// result = prime * result + ((getTenantUserId() == null) ? 0 : getTenantUserId().hashCode()); +// result = prime * result + ((getTenantOrderNo() == null) ? 0 : getTenantOrderNo().hashCode()); +// result = prime * result + ((getTenantCtime() == null) ? 0 : getTenantCtime().hashCode()); +// result = prime * result + ((getTenantMtime() == null) ? 0 : getTenantMtime().hashCode()); +// result = prime * result + ((getDeploymentName() == null) ? 0 : getDeploymentName().hashCode()); +// result = prime * result + ((getTenantDescription() == null) ? 0 : getTenantDescription().hashCode()); +// result = prime * result + ((getTenantState() == null) ? 0 : getTenantState().hashCode()); +// result = prime * result + ((getTenantUnit() == null) ? 0 : getTenantUnit().hashCode()); +// result = prime * result + ((getOwnerCompanyCode() == null) ? 0 : getOwnerCompanyCode().hashCode()); +// result = prime * result + ((getOwnerCompanyName() == null) ? 0 : getOwnerCompanyName().hashCode()); +// result = prime * result + ((getIsDelete() == null) ? 0 : getIsDelete().hashCode()); +// result = prime * result + ((getTenantZone() == null) ? 0 : getTenantZone().hashCode()); +// result = prime * result + ((getTenantLayer() == null) ? 0 : getTenantLayer().hashCode()); +// result = prime * result + ((getTenantVersion() == null) ? 0 : getTenantVersion().hashCode()); +// return result; +// } +// +// @Override +// public String toString() { +// StringBuilder sb = new StringBuilder(); +// sb.append(getClass().getSimpleName()); +// sb.append(" ["); +// sb.append("Hash = ").append(hashCode()); +// sb.append(", objId=").append(objId); +// sb.append(", tenantName=").append(tenantName); +// sb.append(", tenantCode=").append(tenantCode); +// sb.append(", tenantGroupCode=").append(tenantGroupCode); +// sb.append(", tenantIp=").append(tenantIp); +// sb.append(", tenantUrl=").append(tenantUrl); +// sb.append(", professionalKind=").append(professionalKind); +// sb.append(", tenantUserId=").append(tenantUserId); +// sb.append(", tenantOrderNo=").append(tenantOrderNo); +// sb.append(", tenantCtime=").append(tenantCtime); +// sb.append(", tenantMtime=").append(tenantMtime); +// sb.append(", deploymentName=").append(deploymentName); +// sb.append(", tenantDescription=").append(tenantDescription); +// sb.append(", tenantState=").append(tenantState); +// sb.append(", tenantUnit=").append(tenantUnit); +// sb.append(", ownerCompanyCode=").append(ownerCompanyCode); +// sb.append(", ownerCompanyName=").append(ownerCompanyName); +// sb.append(", isDelete=").append(isDelete); +// sb.append(", tenantZone=").append(tenantZone); +// sb.append(", tenantLayer=").append(tenantLayer); +// sb.append(", tenantVersion=").append(tenantVersion); +// sb.append(", serialVersionUID=").append(serialVersionUID); +// sb.append("]"); +// return sb.toString(); +// } } \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/service/ApiDetailsService.java b/src/main/java/com/pms/ocp/service/ApiDetailsService.java index fb31a5b57740a8a871788ee990f669e661bce43e..5ee8ca12b48bb71a15a7970b6520a278c3ff0b7a 100644 --- a/src/main/java/com/pms/ocp/service/ApiDetailsService.java +++ b/src/main/java/com/pms/ocp/service/ApiDetailsService.java @@ -12,10 +12,10 @@ import java.util.List; public interface ApiDetailsService{ /** * - * @param objId + * @param code * @return */ - ResponseVO getApiDetails(String objId); + ResponseVO getApiDetails(String code); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java index bd4b2ef27b621cb90fbe23dfbae2e6502c3581bf..2928f16e929f39df2ef8cdb27d0955c7be18717e 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiAuditService.java @@ -18,4 +18,6 @@ public interface OcpApiAuditService extends IService { ResponseVO sById(OcpApiAudit ocpApiAudit); void exportExcel(OcpApiAudit ocpApiAudit, HttpServletRequest request, HttpServletResponse response); + + ResponseVO versionId(OcpApiAudit ocpApiAudit); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 7e3d79e0e5344a959e972870e8733a605040db03..0859ee146a36d4e17307cc0ead04d9d5ab2befab 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -21,7 +21,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - boolean insertTree(OcpApiGroupDtos ocpApiGroupDtos); + boolean insertTree(OcpApiGroup ocpApiGroup); /* diff --git a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java index a058722730ea289222a0ffba50ba66c867e5a84d..8862bd55e0435592ed908a874f590792a3cd2f1b 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantAuditService.java @@ -16,4 +16,6 @@ public interface OcpTenantAuditService extends IService { void exportExcel(OcpTenantAudit ocpTenantAudit, HttpServletRequest request, HttpServletResponse response); ResponseVO OtaById(OcpTenantAudit ocpTenantAudit); + + ResponseVO versionId(OcpTenantAudit ocpTenantAudit); } diff --git a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java index 0cd5d24d378be3073701535f26664917988429e2..1ea2f62b502675b3b4b18dab536ee8df321d8691 100644 --- a/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java +++ b/src/main/java/com/pms/ocp/service/OcpTenantBaseService.java @@ -6,4 +6,7 @@ import com.pms.ocp.model.vo.ResponseVO; public interface OcpTenantBaseService extends IService { ResponseVO getOtbList(OcpTenantBase ocpTenantBase); + + + } 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 baa197ef6a07850c90e98495cf75daba78ce24b5..753effd7cca5b112b2c191c3a0d7f343c3886183 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiBasicManagementServiceImpl.java @@ -192,7 +192,7 @@ public class ApiBasicManagementServiceImpl extends ServiceImpl> getBaseByGroupCode(ApiBaseDto apiBaseReq) { if (apiBaseReq.getPageNum() == null || apiBaseReq.getPageSize() == null) { - ResponseVO.error("分页参数不能为空"); + return ResponseVO.error("分页参数不能为空"); } apiGroupCode.add(apiBaseReq.getApiGroupCode()); setGroupIdValue(apiBaseReq.getApiGroupCompanyCode() ,apiBaseReq.getApiGroupCode(),apiBaseReq.getApiPromotion()); diff --git a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java index 8ce618a1de5d60448b22555a814e72b605d38b68..7b1091cdfb314c6a776fa8b7b049d2707d34f00f 100644 --- a/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ApiDetailsServiceImpl.java @@ -38,8 +38,8 @@ public class ApiDetailsServiceImpl implements ApiDetailsService { @Override - public ResponseVO getApiDetails(String objId) { - OcpApiBase ocpApiBase = apiDetailsMapper.selectById(objId); + public ResponseVO getApiDetails(String code) { + OcpApiBaseVo ocpApiBase = apiDetailsMapper.selectByCode(code); return ResponseVO.ok(ocpApiBase); } 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 654b83db166ca058a0b4ad928a772e8fee3f0f9f..81f7ff6c05e63e54154443d6b78283279dd82bac 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiAuditServiceImpl.java @@ -58,5 +58,11 @@ public class OcpApiAuditServiceImpl extends ServiceImpl ocpApiAuditList = ocpApiAuditMapper.versionId(ocpApiAudit); + return ResponseVO.ok(ocpApiAuditList); + } + } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java index 3a1cb73796d44363a9389769b3796b0a190bed84..11a7e4b39798aa3ad1b9cb4ce574235707d3ddbd 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -62,30 +62,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup ocpApiGroup : ocpApiGroups) { - if (ocpApiGroup.getApiGroupCode().equals(ocpApiGroupDtos.getApiGroupCode())) { - flag = false; - break; - } - } - if (flag == true) { - OcpApiGroup ocpApiGroup1 = new OcpApiGroup(); - ocpApiGroup1.setObjId(""); - ocpApiGroup1.setApiGroupMtime(timestamp); - ocpApiGroup1.setApiGroupCtime(timestamp); - BeanUtils.copyProperties(ocpApiGroupDtos, ocpApiGroup1); - ocpApiGroup1.setApiGroupCode(code); - mapper.insert(ocpApiGroup1); - } + ocpApiGroup.setObjId(""); + ocpApiGroup.setApiGroupMtime(timestamp); + ocpApiGroup.setApiGroupCtime(timestamp); + ocpApiGroup.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); + ocpApiGroup.setApiGroupCode(code); + mapper.insert(ocpApiGroup); return flag; } @@ -150,8 +139,11 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectTwoApiGroups(pageGroupDto.getApiGroupPromotionType()); pageInfo.setRecords(ocpApiGroups); + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); + lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType,pageGroupDto.getApiGroupPromotionType()); + mapper.selectPage(pageInfo,lambdaQueryWrapper); }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ - List ocpApiGroups = mapper.selectList(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); + List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); LambdaQueryWrapper lwq = new LambdaQueryWrapper<>(); pageInfo.setRecords(ocpApiGroups); mapper.selectPage(pageInfo, lwq); 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 f592bbed5dcafe2af6885cbf7376825a14147b35..23bd11cd939a1f6aef11e61d30e636420a339efa 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantAuditServiceImpl.java @@ -41,7 +41,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl otaListById = ocpTenantAuditMapper.getOtaListById(ocpTenantAudit); + List otaListById = ocpTenantAuditMapper.versionId(ocpTenantAudit); ExportParams param = new ExportParams(AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API); Workbook workbook = ExcelExportUtil.exportExcel(param, OcpTenantAudit.class,otaListById); ExportUtils.exportExcel(response, AnalysisConstant.exportOcpTenantApiName.OCP_TENANT_API,workbook); @@ -52,4 +52,12 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit); return ResponseVO.ok(oatrList); } + + @Override + public ResponseVO versionId(OcpTenantAudit ocpTenantAudit) { + List ocpTenantAudits = ocpTenantAuditMapper.versionId(ocpTenantAudit); + return ResponseVO.ok(ocpTenantAudits); + } + + } diff --git a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java index ad52d3a7d50ccfd906225e1fffba2e5a064bb3f4..533e2304df52d7f707ba232eef12213abfcec81f 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpTenantBaseServiceImpl.java @@ -1,6 +1,8 @@ package com.pms.ocp.service.impl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.pms.ocp.common.constants.*; +import com.pms.ocp.common.exception.ServiceException; import com.pms.ocp.mapper.OcpTenantBaseMapper; import com.pms.ocp.model.entity.OcpTenantBase; import com.pms.ocp.model.vo.ResponseVO; @@ -8,10 +10,16 @@ import com.pms.ocp.service.OcpTenantBaseService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; + +import java.util.LinkedList; import java.util.List; + @Service public class OcpTenantBaseServiceImpl extends ServiceImpl implements OcpTenantBaseService { + + + @Autowired private OcpTenantBaseMapper ocpTenantBaseMapper; @Override @@ -19,4 +27,9 @@ public class OcpTenantBaseServiceImpl extends ServiceImpl otbList = ocpTenantBaseMapper.getOtbList(ocpTenantBase); return ResponseVO.ok(otbList); } + + + + + } diff --git a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java index 5301d1f0f4b5ec3e6b1e1cd268f9365d3b21b865..c07cbe8092799bf15bff17f41f0e4c0abe814814 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -86,13 +86,10 @@ public class TenantServiceImpl extends ServiceImpl ocpTenantGroup.setTenantGroupVersion("1.0"); } - OcpTenantBase ocpTenantBase = new OcpTenantBase(); - BeanUtils.copyProperties(tenanBaseDto,ocpTenantBase); if ("null".equals(tenanBaseDto.getTenantGroupCode())){ group.setTenantGroupCode(randomString); } tenantMapper.insert(tenanBaseDto); - tenantBasicMapper.insert(ocpTenantBase); return falg; } diff --git a/src/main/resources/mapper/ApiDetailsMapper.xml b/src/main/resources/mapper/ApiDetailsMapper.xml index af871c817ffdf60041a6379fb9d9c3f25ac79869..9b306bb2cb1de4e4ad39c296a9f15d030f57abfd 100644 --- a/src/main/resources/mapper/ApiDetailsMapper.xml +++ b/src/main/resources/mapper/ApiDetailsMapper.xml @@ -2,6 +2,16 @@ + + diff --git a/src/main/resources/mapper/OcpApiAuditMapper.xml b/src/main/resources/mapper/OcpApiAuditMapper.xml index 2d9c4e6179461b7ab95a92b8321a25745eb52227..488592567f7e59c2ccdaf797d7fcedf8a2ab7476 100644 --- a/src/main/resources/mapper/OcpApiAuditMapper.xml +++ b/src/main/resources/mapper/OcpApiAuditMapper.xml @@ -6,7 +6,7 @@ select * from ocp_api_audit oaa LEFT JOIN ocp_api_base oab on oaa.api_code = oab.api_code - where oaa.obj_id = #{objId} + where oaa.api_code = #{apiCode} select * from ocp_api_audit where obj_id = #{objId} + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpApiTreeMapper.xml b/src/main/resources/mapper/OcpApiTreeMapper.xml index f2b742b93a95cd7f1400fd0bf86756d173e60779..272b0e2ef026c67d46e5af7d1a9fedfa691146d2 100644 --- a/src/main/resources/mapper/OcpApiTreeMapper.xml +++ b/src/main/resources/mapper/OcpApiTreeMapper.xml @@ -1,19 +1,28 @@ - + - + - + + + + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantAuditMapper.xml b/src/main/resources/mapper/OcpTenantAuditMapper.xml index 41aa36751f5972d4c1994d34f9e6490f9aa6bdb2..1cb7be2a1fc6bc6c1d7c18903705da2d87859aa9 100644 --- a/src/main/resources/mapper/OcpTenantAuditMapper.xml +++ b/src/main/resources/mapper/OcpTenantAuditMapper.xml @@ -13,6 +13,13 @@ select * from ocp_tenant_audit ota LEFT JOIN ocp_tenant_base otb on ota.tenant_code = otb.tenant_code - where ota.obj_id = #{objId} + where ota.tenant_code = #{tenantCode} + + + \ No newline at end of file diff --git a/src/main/resources/mapper/OcpTenantGroup.xml b/src/main/resources/mapper/OcpTenantGroup.xml index 648f425279dd8a91ceea67d233f138eb8ba0d9d9..c0171773cd64fca368e7acf092faea5063b74227 100644 --- a/src/main/resources/mapper/OcpTenantGroup.xml +++ b/src/main/resources/mapper/OcpTenantGroup.xml @@ -25,6 +25,52 @@ + + +