From b4d7254ab62fe860aaa975e9cc8d2c8280b69024 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=83=AD=E5=87=A1=E5=87=A1?= Date: Fri, 18 Mar 2022 12:54:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BA=94=E7=94=A8=E4=B8=8B=E7=BA=BF=E5=8A=9F?= =?UTF-8?q?=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TenantBasicManagementController.java | 3 +- .../pms/ocp/model/entity/OcpTenantAudit.java | 514 +++++++++--------- .../TenantBasicManagementServiceImpl.java | 37 +- 3 files changed, 284 insertions(+), 270 deletions(-) diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 2c10ccd..d2da811 100644 --- a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java +++ b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java @@ -84,7 +84,8 @@ public class TenantBasicManagementController { @ApiOperation("应用树层级") @GetMapping("/tenantBaseTreeOther") - public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) { + public ResponseVO> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode + ) { List ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); return ResponseVO.ok(ocpApiGroups); } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java index 1259012..d340d7e 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -99,76 +99,76 @@ public class OcpTenantAudit implements Serializable { @Excel(name = " 上一版本",orderNum = "11") private String perTenantVersion; - private static final long serialVersionUID = 1L; - - @ApiModelProperty("服务编码") - private String apiCode; - - @ApiModelProperty("服务部署公司") - private String apiDepCompanyCode; - - @ApiModelProperty("应用所属公司") - private String tenantDepCompanyCode; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelCtime; - - @ApiModelProperty("关系创建时间") - private Timestamp apiTenantRelMtime; - - @ApiModelProperty("关系创建用户ID") - private String apiTenantRelUserId; - - @ApiModelProperty("关系创建用户") - private String apiTenantRelUserName; - - @ApiModelProperty("是否已删除0未删除，1已删除") - private long isDelete; - - @ApiModelProperty("服务接口中文名称") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - private String apiReq; - - @ApiModelProperty("服务返回体") - private String apiResp; - - @ApiModelProperty("服务地址") - private String apiUrl; - - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; - - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; - - @ApiModelProperty("创建者用户ID") - private String apiUserId; - - @ApiModelProperty("建设单位") - private String apiUnit; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; - - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private long apiVersion; +// private static final long serialVersionUID = 1L; +// +// @ApiModelProperty("服务编码") +// private String apiCode; +// +// @ApiModelProperty("服务部署公司") +// private String apiDepCompanyCode; +// +// @ApiModelProperty("应用所属公司") +// private String tenantDepCompanyCode; +// +// @ApiModelProperty("关系创建时间") +// private Timestamp apiTenantRelCtime; +// +// @ApiModelProperty("关系创建时间") +// private Timestamp apiTenantRelMtime; +// +// @ApiModelProperty("关系创建用户ID") +// private String apiTenantRelUserId; +// +// @ApiModelProperty("关系创建用户") +// private String apiTenantRelUserName; +// +// @ApiModelProperty("是否已删除0未删除，1已删除") +// private long isDelete; +// +// @ApiModelProperty("服务接口中文名称") +// private String apiName; +// +// @ApiModelProperty("服务分类代码") +// private String apiGroupCode; +// +// @ApiModelProperty("推广类型0:统建；1:自建") +// private long apiPromotion; +// +// @ApiModelProperty("服务请求体") +// private String apiReq; +// +// @ApiModelProperty("服务返回体") +// private String apiResp; +// +// @ApiModelProperty("服务地址") +// private String apiUrl; +// +// @ApiModelProperty("服务创建时间") +// private Timestamp apiCtime; +// +// @ApiModelProperty("服务修改时间") +// private Timestamp apiMtime; +// +// @ApiModelProperty("创建者用户ID") +// private String apiUserId; +// +// @ApiModelProperty("建设单位") +// private String apiUnit; +// +// @ApiModelProperty("服务所属公司") +// private String ownerCompanyCode; +// +// @ApiModelProperty("服务所属公司") +// private String ownerCompanyName; +// +// @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") +// private long apiZone; +// +// @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") +// private long apiLayer; +// +// @ApiModelProperty("服务版本（最新版本）") +// private long apiVersion; public String getObjId() { return objId; @@ -254,193 +254,193 @@ public class OcpTenantAudit implements Serializable { this.perTenantVersion = perTenantVersion; } - public static long getSerialVersionUID() { - return serialVersionUID; - } - - public String getApiCode() { - return apiCode; - } - - public void setApiCode(String apiCode) { - this.apiCode = apiCode; - } - - public String getApiDepCompanyCode() { - return apiDepCompanyCode; - } - - public void setApiDepCompanyCode(String apiDepCompanyCode) { - this.apiDepCompanyCode = apiDepCompanyCode; - } - - public String getTenantDepCompanyCode() { - return tenantDepCompanyCode; - } - - public void setTenantDepCompanyCode(String tenantDepCompanyCode) { - this.tenantDepCompanyCode = tenantDepCompanyCode; - } - - public Timestamp getApiTenantRelCtime() { - return apiTenantRelCtime; - } - - public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { - this.apiTenantRelCtime = apiTenantRelCtime; - } - - public Timestamp getApiTenantRelMtime() { - return apiTenantRelMtime; - } - - public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { - this.apiTenantRelMtime = apiTenantRelMtime; - } - - public String getApiTenantRelUserId() { - return apiTenantRelUserId; - } - - public void setApiTenantRelUserId(String apiTenantRelUserId) { - this.apiTenantRelUserId = apiTenantRelUserId; - } - - public String getApiTenantRelUserName() { - return apiTenantRelUserName; - } - - public void setApiTenantRelUserName(String apiTenantRelUserName) { - this.apiTenantRelUserName = apiTenantRelUserName; - } - - public long getIsDelete() { - return isDelete; - } - - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } - - 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; - } +// public static long getSerialVersionUID() { +// return serialVersionUID; +// } +// +// public String getApiCode() { +// return apiCode; +// } +// +// public void setApiCode(String apiCode) { +// this.apiCode = apiCode; +// } +// +// public String getApiDepCompanyCode() { +// return apiDepCompanyCode; +// } +// +// public void setApiDepCompanyCode(String apiDepCompanyCode) { +// this.apiDepCompanyCode = apiDepCompanyCode; +// } +// +// public String getTenantDepCompanyCode() { +// return tenantDepCompanyCode; +// } +// +// public void setTenantDepCompanyCode(String tenantDepCompanyCode) { +// this.tenantDepCompanyCode = tenantDepCompanyCode; +// } +// +// public Timestamp getApiTenantRelCtime() { +// return apiTenantRelCtime; +// } +// +// public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { +// this.apiTenantRelCtime = apiTenantRelCtime; +// } +// +// public Timestamp getApiTenantRelMtime() { +// return apiTenantRelMtime; +// } +// +// public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { +// this.apiTenantRelMtime = apiTenantRelMtime; +// } +// +// public String getApiTenantRelUserId() { +// return apiTenantRelUserId; +// } +// +// public void setApiTenantRelUserId(String apiTenantRelUserId) { +// this.apiTenantRelUserId = apiTenantRelUserId; +// } +// +// public String getApiTenantRelUserName() { +// return apiTenantRelUserName; +// } +// +// public void setApiTenantRelUserName(String apiTenantRelUserName) { +// this.apiTenantRelUserName = apiTenantRelUserName; +// } +// +// public long getIsDelete() { +// return isDelete; +// } +// +// public void setIsDelete(long isDelete) { +// this.isDelete = isDelete; +// } +// +// 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; +// } // @Override // public boolean equals(Object that) { diff --git a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java index 7bc5dce..8a3d4a4 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; +import com.pms.ocp.mapper.OcpTenantAuditMapper; import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper; @@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl tenantGroup = new ArrayList<>(); @@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { String tenantCode = ocpTenantExtent.getTenantCode(); - if (ocpTenantExtent.getTenantState() == 0) { - return ResponseVO.error("数据为空"); + if (ocpTenantExtent.getTenantState() == null) { + return ResponseVO.error("数据错误,状态为空"); } else if (ocpTenantExtent.getTenantState() == 1) { return ResponseVO.error(tenantCode + "已发布,请勿重复操作"); - } else { + } +// else if (ocpTenantExtent.getTenantState() == 2) { +// return ResponseVO.error(tenantCode + "已下线,无法发布"); +// } + else { ocpTenantExtent.setTenantState((short) 1); ocpTenantExtentMapper.updateById(ocpTenantExtent); } @@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl list = Arrays.asList(split); - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); - lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); - List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); + +// LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); +// lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); +// List ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); + + LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper<>(); + lambdaQueryWrapper.in(OcpTenantAudit::getTenantCode, list); + List ocpTenantExtents = ocpTenantAuditMapper.selectList(lambdaQueryWrapper); + if (ocpTenantExtents.size() == 0) { - return ResponseVO.error("数据为空"); + return ResponseVO.error("系统错误,数据为空"); } - for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { + for (OcpTenantAudit ocpTenantExtent : ocpTenantExtents) { String tenantCode = ocpTenantExtent.getTenantCode(); - if (ocpTenantExtent.getTenantState() == null) { + if (ocpTenantExtent.getOperStatus() == null) { return ResponseVO.error("系统错误,状态为空"); - } else if (ocpTenantExtent.getTenantState() == 2) { + } else if (ocpTenantExtent.getOperStatus() == 2) { return ResponseVO.error(tenantCode + "已下线,请勿重复下线"); } else { - ocpTenantExtent.setTenantState((short) 2); - ocpTenantExtentMapper.updateById(ocpTenantExtent); + ocpTenantExtent.setOperStatus((short) 2); + ocpTenantAuditMapper.updateById(ocpTenantExtent); } } -- 2.26.0