diff --git a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java index 22cdc6b4f2f6deeaf9a8f2d2b1c392f95fc73338..88c157decfd8da8d649ea1a7323fc374fe07d01b 100644 --- a/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java +++ b/src/main/java/com/pms/ocp/controller/OcpApiTreeController.java @@ -43,11 +43,8 @@ public class OcpApiTreeController { @PostMapping("/instertree") @ApiOperation("服务树分类--新增") public ResponseVO inseter(@RequestBody OcpApiGroup ocpApiGroup){ - boolean flag = service.insertTree(ocpApiGroup); - if (flag){ - return ResponseVO.ok(); - } - return ResponseVO.error("您的服务编码重复,请重新输入"); + OcpApiGroup ocpApiGroup1 = service.insertTree(ocpApiGroup); + return ResponseVO.ok(ocpApiGroup1); } @@ -58,7 +55,6 @@ public class OcpApiTreeController { return ResponseVO.ok(onePages); } - @PostMapping("/updatatree") @ApiOperation("服务树分类--修改") public ResponseVO updataTree(@RequestBody OcpApiGroup ocpApiGroup){ diff --git a/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java b/src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java index 2c10ccdfdcacf82a3a6b2185d007b7f62f1d5a57..d2da8117bdb0818292d2c57a22b80732ab6bd3bb 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/mapper/OcpApiTreeMapper.java b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java index 02ad59aeda0da52751f9ed4637022dc55ddf8767..082d54642a9f18840a5e2ce5f53f9b3a16085d76 100644 --- a/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java +++ b/src/main/java/com/pms/ocp/mapper/OcpApiTreeMapper.java @@ -32,7 +32,7 @@ public interface OcpApiTreeMapper extends BaseMapper { List selectThreeApiGroupsList(Long apiGroupPromotionType, String apiGroupCode); - List selectLists(Long apiGroupPromotionType, String apiGroupCode,String apiGroupLevel); + List selectLists(Long apiGroupPromotionType, String apiGroupCode); //code重复问题 List selectGroupCode(); diff --git a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java index 2395d25be2813ef012286b65f7cce2753766a202..b48ed5f3ccd7d2846160183999a0495f48c0e606 100644 --- a/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java +++ b/src/main/java/com/pms/ocp/model/dto/PageGroupDto.java @@ -53,6 +53,18 @@ public class PageGroupDto extends PageParam { @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ") private String apiGroupLevel; + + @ApiModelProperty("模糊查询字段") + private String keyword; + + public String getKeyword() { + return keyword; + } + + public void setKeyword(String keyword) { + this.keyword = keyword; + } + public String getObjId() { return objId; } diff --git a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java index 3c3c771ce32a1dae9bfb4bfa73132c54af86d2b0..b30ca9e7cd7f1d36467dc29003187e5a4658ebdb 100644 --- a/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java +++ b/src/main/java/com/pms/ocp/model/dto/TenanBaseDto.java @@ -131,7 +131,104 @@ public class TenanBaseDto extends OcpTenantGroup { return classIfy; } - public void setClassIfy(String classIfy) { + public String getTenantGroupName() { + return tenantGroupName; + } + + public void setTenantGroupName(String tenantGroupName) { + this.tenantGroupName = tenantGroupName; + } + + public String getTenantGroupCompanyCode() { + return tenantGroupCompanyCode; + } + + public void setTenantGroupCompanyCode(String tenantGroupCompanyCode) { + this.tenantGroupCompanyCode = tenantGroupCompanyCode; + } + + public String getTenantGroupPcode() { + return tenantGroupPcode; + } + + public void setTenantGroupPcode(String tenantGroupPcode) { + this.tenantGroupPcode = tenantGroupPcode; + } + + public String getTenantType() { + return tenantType; + } + + public void setTenantType(String tenantType) { + this.tenantType = tenantType; + } + + public String getTenantGroupVersion() { + return tenantGroupVersion; + } + + public void setTenantGroupVersion(String tenantGroupVersion) { + this.tenantGroupVersion = tenantGroupVersion; + } + + public Integer getTenantGroupOrderNo() { + return tenantGroupOrderNo; + } + + public void setTenantGroupOrderNo(Integer tenantGroupOrderNo) { + this.tenantGroupOrderNo = tenantGroupOrderNo; + } + + public String getTenantGroupUserId() { + return tenantGroupUserId; + } + + public void setTenantGroupUserId(String tenantGroupUserId) { + this.tenantGroupUserId = tenantGroupUserId; + } + + public String getTenantGroupUserName() { + return tenantGroupUserName; + } + + public void setTenantGroupUserName(String tenantGroupUserName) { + this.tenantGroupUserName = tenantGroupUserName; + } + + public Timestamp getTenantGroupCtime() { + return tenantGroupCtime; + } + + public void setTenantGroupCtime(Timestamp tenantGroupCtime) { + this.tenantGroupCtime = tenantGroupCtime; + } + + public Timestamp getTenantGroupMtime() { + return tenantGroupMtime; + } + + public void setTenantGroupMtime(Timestamp tenantGroupMtime) { + this.tenantGroupMtime = tenantGroupMtime; + } + + public Short getIsDelete() { + return isDelete; + } + + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } + + public String getTenantGroupLevel() { + return tenantGroupLevel; + } + + public void setTenantGroupLevel(String tenantGroupLevel) { + this.tenantGroupLevel = tenantGroupLevel; + } + + public OcpTenantGroup setClassIfy(String classIfy) { this.classIfy = classIfy; + return null; } } 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 9fd2f66129f94a40476e64a88c6355de54ecc25a..470d1b4d570a230cd7a86eef8caed9e557f29d80 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -59,60 +59,6 @@ public class OcpApiAudit { @ApiModelProperty("当前版本") private long applyVersion; - @ApiModelProperty("上一版本") - @Excel(name = "上一版本",orderNum = "7") - private long preApiVersion; - - @ApiModelProperty("服务接口中文名称") - @Excel(name = "服务名称",orderNum = "2") - private String apiName; - - @ApiModelProperty("服务分类代码") - private String apiGroupCode; - - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; - - @ApiModelProperty("服务请求体") - @Excel(name = "请求参数",orderNum = "8") - private String apiReq; - - @ApiModelProperty("服务返回体") - @Excel(name = "返回参数",orderNum = "9") - - 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("服务版本（最新版本）") - @Excel(name = "当前版本",orderNum = "6") - private long apiVersion; - public String getObjId() { return objId; } @@ -216,132 +162,4 @@ public class OcpApiAudit { 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/OcpApiBase.java b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java index d7dfff479da2420f30b09c4f996919b0a54f7cf1..0c8b9c8f17c4d83b7b486ece52c00fa80ea86c2b 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiBase.java @@ -73,109 +73,78 @@ public class OcpApiBase { @ApiModelProperty("服务版本（最新版本）") private String apiVersion; - public long getApiZone() { - return apiZone; - } + @ApiModelProperty("服务所属中心编码所属中心") + private String apiCenterCode; - public void setApiZone(long apiZone) { - this.apiZone = apiZone; - } + @ApiModelProperty("服务简述") + private String apiDescription; - public long getApiLayer() { - return apiLayer; - } + @ApiModelProperty("创建者姓名") + private String apiUserName; - public void setApiLayer(long apiLayer) { - this.apiLayer = apiLayer; + public String getObjId() { + return objId; } -// public long getApiVersion() { -// return apiVersion; -// } -// -// public void setApiVersion(long apiVersion) { -// this.apiVersion = apiVersion; -// } - - public String getApiVersion() { - return apiVersion; + public void setObjId(String objId) { + this.objId = objId; } - public void setApiVersion(String apiVersion) { - this.apiVersion = apiVersion; + public String getApiCode() { + return apiCode; } - 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 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 void setApiCode(String apiCode) { + this.apiCode = apiCode; + } - public long getApiPromotion() { - return apiPromotion; - } + public String getApiName() { + return apiName; + } - public void setApiPromotion(long apiPromotion) { - this.apiPromotion = apiPromotion; - } + public void setApiName(String apiName) { + this.apiName = apiName; + } + public String getApiGroupCode() { + return apiGroupCode; + } - public String getApiReq() { - return apiReq; - } + public void setApiGroupCode(String apiGroupCode) { + this.apiGroupCode = apiGroupCode; + } - public void setApiReq(String apiReq) { - this.apiReq = apiReq; - } + public long getApiPromotion() { + return apiPromotion; + } + public void setApiPromotion(long apiPromotion) { + this.apiPromotion = apiPromotion; + } - public String getApiResp() { - return apiResp; - } + public String getApiReq() { + return apiReq; + } - public void setApiResp(String apiResp) { - this.apiResp = apiResp; - } + public void setApiReq(String apiReq) { + this.apiReq = apiReq; + } + public String getApiResp() { + return apiResp; + } - public String getApiUrl() { - return apiUrl; - } + public void setApiResp(String apiResp) { + this.apiResp = apiResp; + } - public void setApiUrl(String apiUrl) { - this.apiUrl = apiUrl; - } + public String getApiUrl() { + return apiUrl; + } + public void setApiUrl(String apiUrl) { + this.apiUrl = apiUrl; + } public Timestamp getApiCtime() { return apiCtime; @@ -194,47 +163,82 @@ public class OcpApiBase { } public String getApiUserId() { - return apiUserId; - } + 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 long getIsDelete() { + return isDelete; + } - public void setApiUserId(String apiUserId) { - this.apiUserId = apiUserId; - } + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } + public long getApiZone() { + return apiZone; + } - public String getApiUnit() { - return apiUnit; - } + public void setApiZone(long apiZone) { + this.apiZone = apiZone; + } - public void setApiUnit(String apiUnit) { - this.apiUnit = apiUnit; - } + public long getApiLayer() { + return apiLayer; + } + public void setApiLayer(long apiLayer) { + this.apiLayer = apiLayer; + } - public String getOwnerCompanyCode() { - return ownerCompanyCode; - } + public String getApiVersion() { + return apiVersion; + } - public void setOwnerCompanyCode(String ownerCompanyCode) { - this.ownerCompanyCode = ownerCompanyCode; - } + public void setApiVersion(String apiVersion) { + this.apiVersion = apiVersion; + } + public String getApiCenterCode() { + return apiCenterCode; + } -// public String getOwnerCompanyName() { -// return ownerCompanyName; -// } -// -// public void setOwnerCompanyName(String ownerCompanyName) { -// this.ownerCompanyName = ownerCompanyName; -// } + public void setApiCenterCode(String apiCenterCode) { + this.apiCenterCode = apiCenterCode; + } + public String getApiDescription() { + return apiDescription; + } - public long getIsDelete() { - return isDelete; - } + public void setApiDescription(String apiDescription) { + this.apiDescription = apiDescription; + } - public void setIsDelete(long isDelete) { - this.isDelete = isDelete; - } + public String getApiUserName() { + return apiUserName; + } + public void setApiUserName(String apiUserName) { + this.apiUserName = apiUserName; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java index 97b94f94c91019c56b098357797cac93540d5525..f0231de512f9f7ef0998b478fe6bfce1a47ec599 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiModelRel.java @@ -37,107 +37,59 @@ public class OcpApiModelRel { @ApiModelProperty("是否已删除 0-否1-是") private long isDelete; - @ApiModelProperty("服务接口中文名称") - private String apiName; + public String getObjId() { + return objId; + } - @ApiModelProperty("服务分类代码") - private String apiGroupCode; + public void setObjId(String objId) { + this.objId = objId; + } - @ApiModelProperty("推广类型0:统建；1:自建") - private long apiPromotion; + public String getModelCode() { + return modelCode; + } - @ApiModelProperty("服务请求体") - private String apiReq; + public void setModelCode(String modelCode) { + this.modelCode = modelCode; + } - @ApiModelProperty("服务返回体") - private String apiResp; + public String getModelDepCompanyCode() { + return modelDepCompanyCode; + } - @ApiModelProperty("服务地址") - private String apiUrl; + public void setModelDepCompanyCode(String modelDepCompanyCode) { + this.modelDepCompanyCode = modelDepCompanyCode; + } - @ApiModelProperty("服务创建时间") - private Timestamp apiCtime; + public String getApiCode() { + return apiCode; + } - @ApiModelProperty("服务修改时间") - private Timestamp apiMtime; + public void setApiCode(String apiCode) { + this.apiCode = apiCode; + } - @ApiModelProperty("创建者用户ID") - private String apiUserId; + public String getApiDepCompanyCode() { + return apiDepCompanyCode; + } - @ApiModelProperty("建设单位") - private String apiUnit; + public void setApiDepCompanyCode(String apiDepCompanyCode) { + this.apiDepCompanyCode = apiDepCompanyCode; + } - @ApiModelProperty("服务所属公司") - private String ownerCompanyCode; + public Timestamp getRelationCtime() { + return relationCtime; + } - @ApiModelProperty("服务所属公司") - private String ownerCompanyName; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private long apiZone; - - @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private long apiLayer; - - @ApiModelProperty("服务版本（最新版本）") - private long apiVersion; - - @ApiModelProperty("应用编码") - private String tenantCode; - - @ApiModelProperty("应用名称") - private String tenantName; - - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - @ApiModelProperty("应用IP") - private String tenantIp; - - @ApiModelProperty("应用url") - private String tenantUrl; - - @ApiModelProperty("所属专业") - private String professionalKind; - - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - @ApiModelProperty("排序") - private String tenantOrderNo; - - @ApiModelProperty("创建时间") - private String tenantCtime; - - @ApiModelProperty("最后更新时间") - private String tenantMtime; - - @ApiModelProperty("部署名称") - private String deploymentName; - - @ApiModelProperty("描述") - private String tenantDescription; - - @ApiModelProperty("应用状态0设计 1运行态") - private String tenantState; - - @ApiModelProperty("模型名称") - private String modelName; - - @ApiModelProperty("建设单位") - private String tenantUnit; - - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private String tenantZone; - - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层") - private String tenantLayer; - - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - @ApiModelProperty("应用版本（当前版本）") - private String tenanttVersion; + public void setRelationCtime(Timestamp relationCtime) { + this.relationCtime = relationCtime; + } + public long getIsDelete() { + return isDelete; + } + public void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java index a9e592052cf7b57f220fff4d0497b68dcedba6c3..752744e5775e109c42fb55009497aa2fbd7d4907 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiSubs.java @@ -40,52 +40,6 @@ public class OcpApiSubs { @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; } @@ -142,123 +96,11 @@ public class OcpApiSubs { this.subsCompanyCode = subsCompanyCode; } -// 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 long getIsDelete() { + return isDelete; + } -// 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 void setIsDelete(long isDelete) { + this.isDelete = isDelete; + } } 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 e39a6bf20245474e156518f8c9e31d6857c30ac9..4ae9f9864f91b7e72f8119c6419d76fee70f6004 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiTenantRel.java @@ -43,101 +43,75 @@ public class OcpApiTenantRel { @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; -// -// @ApiModelProperty("应用名称") -// private String tenantName; -// -// @ApiModelProperty("应用分类代码") -// private String tenantGroupCode; -// -// @ApiModelProperty("应用IP") -// private String tenantIp; -// -// @ApiModelProperty("应用url") -// private String tenantUrl; -// -// @ApiModelProperty("所属专业") -// private String professionalKind; -// -// @ApiModelProperty("创建者用户ID") -// private String tenantUserId; -// -// @ApiModelProperty("排序") -// private String tenantOrderNo; -// -// @ApiModelProperty("创建时间") -// private String tenantCtime; -// -// @ApiModelProperty("最后更新时间") -// private String tenantMtime; -// -// @ApiModelProperty("部署名称") -// private String deploymentName; -// -// @ApiModelProperty("描述") -// private String tenantDescription; -// -// @ApiModelProperty("应用状态0设计 1运行态") -// private String tenantState; -// -// @ApiModelProperty("建设单位") -// private String tenantUnit; -// -// @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") -// private String tenantZone; -// -// @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层") -// private String tenantLayer; -// -// @ApiModelProperty("应用版本（当前版本）") -// private String tenantVersion; + public String getObjId() { + return objId; + } + public void setObjId(String objId) { + this.objId = objId; + } + public String getTenantCode() { + return tenantCode; + } + + public void setTenantCode(String tenantCode) { + this.tenantCode = tenantCode; + } + + 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; + } } 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 125901205202362bbc88d82b7fc8bcc287477ad5..1dce44272285b92ef752f820145cfb5f5eb8c88b 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -99,77 +99,6 @@ 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; - public String getObjId() { return objId; } @@ -234,7 +163,7 @@ public class OcpTenantAudit implements Serializable { this.auditUserName = auditUserName; } - public Date getAuditCtime() { + public Timestamp getAuditCtime() { return auditCtime; } @@ -242,6 +171,10 @@ public class OcpTenantAudit implements Serializable { this.auditCtime = auditCtime; } + public String getApplyVersion() { + return applyVersion; + } + public void setApplyVersion(String applyVersion) { this.applyVersion = applyVersion; } @@ -253,257 +186,4 @@ public class OcpTenantAudit implements Serializable { public void setPerTenantVersion(String perTenantVersion) { 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; - } - -// @Override -// public boolean equals(Object that) { -// if (this == that) { -// return true; -// } -// if (that == null) { -// return false; -// } -// if (getClass() != that.getClass()) { -// return false; -// } -// OcpTenantAudit other = (OcpTenantAudit) that; -// return (this.getObjId() == null ? other.getObjId() == null : this.getObjId().equals(other.getObjId())) -// && (this.getTenantCode() == null ? other.getTenantCode() == null : this.getTenantCode().equals(other.getTenantCode())) -// && (this.getOperStatus() == null ? other.getOperStatus() == null : this.getOperStatus().equals(other.getOperStatus())) -// && (this.getAuditType() == null ? other.getAuditType() == null : this.getAuditType().equals(other.getAuditType())) -// && (this.getAuditMessage() == null ? other.getAuditMessage() == null : this.getAuditMessage().equals(other.getAuditMessage())) -// && (this.getAuditJson() == null ? other.getAuditJson() == null : this.getAuditJson().equals(other.getAuditJson())) -// && (this.getAuditUserId() == null ? other.getAuditUserId() == null : this.getAuditUserId().equals(other.getAuditUserId())) -// && (this.getAuditUserName() == null ? other.getAuditUserName() == null : this.getAuditUserName().equals(other.getAuditUserName())) -// && (this.getAuditCtime() == null ? other.getAuditCtime() == null : this.getAuditCtime().equals(other.getAuditCtime())) -// && (this.getApplyVersion() == null ? other.getApplyVersion() == null : this.getApplyVersion().equals(other.getApplyVersion())) -// && (this.getPerTenantVersion() == null ? other.getPerTenantVersion() == null : this.getPerTenantVersion().equals(other.getPerTenantVersion())); -// } -// -// @Override -// public int hashCode() { -// final int prime = 31; -// int result = 1; -// result = prime * result + ((getObjId() == null) ? 0 : getObjId().hashCode()); -// result = prime * result + ((getTenantCode() == null) ? 0 : getTenantCode().hashCode()); -// result = prime * result + ((getOperStatus() == null) ? 0 : getOperStatus().hashCode()); -// result = prime * result + ((getAuditType() == null) ? 0 : getAuditType().hashCode()); -// result = prime * result + ((getAuditMessage() == null) ? 0 : getAuditMessage().hashCode()); -// result = prime * result + ((getAuditJson() == null) ? 0 : getAuditJson().hashCode()); -// result = prime * result + ((getAuditUserId() == null) ? 0 : getAuditUserId().hashCode()); -// result = prime * result + ((getAuditUserName() == null) ? 0 : getAuditUserName().hashCode()); -// result = prime * result + ((getAuditCtime() == null) ? 0 : getAuditCtime().hashCode()); -// result = prime * result + ((getApplyVersion() == null) ? 0 : getApplyVersion().hashCode()); -// result = prime * result + ((getPerTenantVersion() == null) ? 0 : getPerTenantVersion().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(", tenantCode=").append(tenantCode); -// sb.append(", operStatus=").append(operStatus); -// sb.append(", auditType=").append(auditType); -// sb.append(", auditMessage=").append(auditMessage); -// sb.append(", auditJson=").append(auditJson); -// sb.append(", auditUserId=").append(auditUserId); -// sb.append(", auditUserName=").append(auditUserName); -// sb.append(", auditCtime=").append(auditCtime); -// sb.append(", applyVersion=").append(applyVersion); -// sb.append(", perTenantVersion=").append(perTenantVersion); -// 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/model/entity/OcpTenantBase.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java index c48650e51f75835d6efc22b8487f574a2a6f130f..5171f7988fa4dd9d912f14cd253e16845d8c69cd 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantBase.java @@ -152,394 +152,172 @@ public class OcpTenantBase implements Serializable { @ApiModelProperty("应用版本（当前版本）") private String tenantVersion; - private static final long serialVersionUID = 1L; - /** - * 应用ID - */ + @ApiModelProperty("推广类型") + private String tenantPromotion; + + + @ApiModelProperty("应用路径") + private String tenantFullPath; + + public String getObjId() { return objId; } - /** - * 应用ID - */ public void setObjId(String objId) { this.objId = objId; } - /** - * 应用名称 - */ public String getTenantName() { return tenantName; } - /** - * 应用名称 - */ public void setTenantName(String tenantName) { this.tenantName = tenantName; } - /** - * 应用代码 - */ public String getTenantCode() { return tenantCode; } - /** - * 应用代码 - */ public void setTenantCode(String tenantCode) { this.tenantCode = tenantCode; } - /** - * 应用分类代码 - */ public String getTenantGroupCode() { return tenantGroupCode; } - /** - * 应用分类代码 - */ public void setTenantGroupCode(String tenantGroupCode) { this.tenantGroupCode = tenantGroupCode; } - /** - * 应用ip - */ public String getTenantIp() { return tenantIp; } - /** - * 应用ip - */ public void setTenantIp(String tenantIp) { this.tenantIp = tenantIp; } - /** - * 应用url - */ public String getTenantUrl() { return tenantUrl; } - /** - * 应用url - */ public void setTenantUrl(String tenantUrl) { this.tenantUrl = tenantUrl; } - /** - * 所属专业 - */ public String getProfessionalKind() { return professionalKind; } - /** - * 所属专业 - */ public void setProfessionalKind(String professionalKind) { this.professionalKind = professionalKind; } - /** - * 创建者用户ID - */ public String getTenantUserId() { return tenantUserId; } - /** - * 创建者用户ID - */ public void setTenantUserId(String tenantUserId) { this.tenantUserId = tenantUserId; } - /** - * 排序 - */ public Integer getTenantOrderNo() { return tenantOrderNo; } - /** - * 排序 - */ public void setTenantOrderNo(Integer tenantOrderNo) { this.tenantOrderNo = tenantOrderNo; } - /** - * 创建时间 - */ - public Date getTenantCtime() { + public Timestamp getTenantCtime() { return tenantCtime; } - /** - * 创建时间 - */ public void setTenantCtime(Timestamp tenantCtime) { this.tenantCtime = tenantCtime; } - /** - * 最后更新时间 - */ - public Date getTenantMtime() { + public Timestamp getTenantMtime() { return tenantMtime; } - /** - * 最后更新时间 - */ public void setTenantMtime(Timestamp tenantMtime) { this.tenantMtime = tenantMtime; } -// /** -// * 部署名称 -// */ -// public String getDeploymentName() { -// return deploymentName; -// } -// -// /** -// * 部署名称 -// */ -// public void setDeploymentName(String deploymentName) { -// this.deploymentName = deploymentName; -// } - - /** - * 描述 - */ public String getTenantDescription() { return tenantDescription; } - /** - * 描述 - */ public void setTenantDescription(String tenantDescription) { this.tenantDescription = tenantDescription; } -// /** -// * 应用状态0:设计态；1:运行态 -// */ -// public Short getTenantState() { -// return tenantState; -// } -// -// /** -// * 应用状态0:设计态；1:运行态 -// */ -// public void setTenantState(Short tenantState) { -// this.tenantState = tenantState; -// } - - /** - * 建设单位 - */ public String getTenantUnit() { return tenantUnit; } - /** - * 建设单位 - */ public void setTenantUnit(String tenantUnit) { this.tenantUnit = tenantUnit; } - /** - * 所属公司编码 - */ 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; -// } - /** - * 是否删除0:否;1:是 - */ public Short getIsDelete() { return isDelete; } - /** - * 是否删除0:否;1:是 - */ public void setIsDelete(Short isDelete) { this.isDelete = isDelete; } - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ public Short getTenantZone() { return tenantZone; } - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ public void setTenantZone(Short tenantZone) { this.tenantZone = tenantZone; } - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ public Short getTenantLayer() { return tenantLayer; } - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ public void setTenantLayer(Short tenantLayer) { this.tenantLayer = tenantLayer; } - /** - * 应用版本（当前版本） - */ public String getTenantVersion() { return tenantVersion; } - /** - * 应用版本（当前版本） - */ 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(); -// } + + public String getTenantPromotion() { + return tenantPromotion; + } + + public void setTenantPromotion(String tenantPromotion) { + this.tenantPromotion = tenantPromotion; + } + + public String getTenantFullPath() { + return tenantFullPath; + } + + public void setTenantFullPath(String tenantFullPath) { + this.tenantFullPath = tenantFullPath; + } } \ No newline at end of file diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java index 1aa6664e94a3349c8d0ba1181371471593df1f83..d23be9175578345eb463d1b65c7ed0c19b336da9 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantGroup.java @@ -1,6 +1,7 @@ package com.pms.ocp.model.entity; import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableId; import com.baomidou.mybatisplus.annotation.TableName; import io.swagger.annotations.ApiModel; @@ -106,7 +107,11 @@ public class OcpTenantGroup implements Serializable { @ApiModelProperty("应用树层级 1:应用分组层 2:应用层") private String tenantGroupLevel; + //上级分类名称 + @ApiModelProperty("上级分类名称") + @TableField(exist = false) + private String classIfy; public static long getSerialVersionUID() { return serialVersionUID; diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java index 93993ecdfa9d3e87c8461e1ca1f45ec801246959..c9ee8f2bfe22c45ff89df400d1d637c9531e486f 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantSubs.java @@ -71,220 +71,69 @@ public class OcpTenantSubs implements Serializable { private Short isDelete; - /** - * 应用名称 - */ - @ApiModelProperty("应用名称") - private String tenantName; - - - /** - * 应用分类代码 - */ - @ApiModelProperty("应用分类代码") - private String tenantGroupCode; - - /** - * 应用ip - */ - @ApiModelProperty("应用ip") - private String tenantIp; - - /** - * 应用url - */ - @ApiModelProperty("应用url") - private String tenantUrl; - - /** - * 所属专业 - */ - @ApiModelProperty("所属专业") - private String professionalKind; - - /** - * 创建者用户ID - */ - @ApiModelProperty("创建者用户ID") - private String tenantUserId; - - /** - * 排序 - */ - @ApiModelProperty("排序") - private Integer tenantOrderNo; - - /** - * 创建时间 - */ - @ApiModelProperty("创建时间") - private Timestamp tenantCtime; - - /** - * 最后更新时间 - */ - @ApiModelProperty("最后更新时间") - private Timestamp tenantMtime; - - /** - * 部署名称 - */ - @ApiModelProperty("部署名称") - private String deploymentName; - - /** - * 描述 - */ - @ApiModelProperty("描述") - private String tenantDescription; - - /** - * 应用状态0:设计态；1:运行态 - */ - @ApiModelProperty("应用状态0:设计态；1:运行态") - private Short tenantState; -// /** -// * 推广类型0:统建；1:自建 -// */ -// @ApiModelProperty("推广类型0:统建；1:自建") -// private long tenantPromotion; - /** - * 建设单位 - */ - @ApiModelProperty("建设单位") - private String tenantUnit; - - /** - * 所属公司编码 - */ - @ApiModelProperty("所属公司编码") - private String ownerCompanyCode; - - /** - * 所属公司名称 - */ - @ApiModelProperty("所属公司名称") - private String ownerCompanyName; - - /** - * 所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区 - */ - @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") - private Short tenantZone; - - /** - * 所属层级 1:应用层;2:平台层;3:网络层;4:感知层; - */ - @ApiModelProperty("所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") - private Short tenantLayer; - - /** - * 应用版本（当前版本） - */ - @ApiModelProperty("应用版本（当前版本）") - private String tenantVersion; - - private static final long serialVersionUID = 1L; - - /** - * 关系ID - */ public String getObjId() { return objId; } - /** - * 关系ID - */ public void setObjId(String objId) { this.objId = objId; } - /** - * 服务编码 - */ public String getTenantCode() { return tenantCode; } - /** - * 服务编码 - */ public void setTenantCode(String tenantCode) { this.tenantCode = tenantCode; } - /** - * 订阅公司编码 - */ public String getSubsCompanyCode() { return subsCompanyCode; } - /** - * 订阅公司编码 - */ public void setSubsCompanyCode(String subsCompanyCode) { this.subsCompanyCode = subsCompanyCode; } - /** - * 服务订阅创建时间 - */ - public Date getSubsLogTenantCtime() { + public Timestamp getSubsLogTenantCtime() { return subsLogTenantCtime; } - /** - * 服务订阅创建时间 - */ public void setSubsLogTenantCtime(Timestamp subsLogTenantCtime) { this.subsLogTenantCtime = subsLogTenantCtime; } - /** - * 服务订阅修改时间 - */ - public Date getSubsLogTenantMtime() { + public Timestamp getSubsLogTenantMtime() { return subsLogTenantMtime; } - /** - * 服务订阅修改时间 - */ public void setSubsLogTenantMtime(Timestamp subsLogTenantMtime) { this.subsLogTenantMtime = subsLogTenantMtime; } - /** - * 服务订阅创建用户ID - */ public String getSubsLogTenantUserId() { return subsLogTenantUserId; } - /** - * 服务订阅创建用户ID - */ public void setSubsLogTenantUserId(String subsLogTenantUserId) { this.subsLogTenantUserId = subsLogTenantUserId; } - /** - * 服务订阅添加时间 - */ - public Date getSubsLogTenantAtime() { + public Timestamp getSubsLogTenantAtime() { return subsLogTenantAtime; } - /** - * 服务订阅添加时间 - */ public void setSubsLogTenantAtime(Timestamp subsLogTenantAtime) { this.subsLogTenantAtime = subsLogTenantAtime; } + public Short getIsDelete() { + return isDelete; + } + public void setIsDelete(Short isDelete) { + this.isDelete = isDelete; + } @Override public boolean equals(Object that) { @@ -337,7 +186,6 @@ public class OcpTenantSubs implements Serializable { sb.append(", subsLogTenantUserId=").append(subsLogTenantUserId); sb.append(", subsLogTenantAtime=").append(subsLogTenantAtime); sb.append(", isDelete=").append(isDelete); - sb.append(", serialVersionUID=").append(serialVersionUID); sb.append("]"); return sb.toString(); } diff --git a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java index 6f59c30ac3cfed66ea74dd80ece305984bc077ed..7fd9f90c708157929dfaca9ed9d0249b3f29fedc 100644 --- a/src/main/java/com/pms/ocp/service/OcpApiTreeService.java +++ b/src/main/java/com/pms/ocp/service/OcpApiTreeService.java @@ -19,7 +19,7 @@ public interface OcpApiTreeService extends IService { /** * 新增服务分类 */ - boolean insertTree(OcpApiGroup ocpApiGroup); + OcpApiGroup insertTree(OcpApiGroup ocpApiGroup); /* 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 b54d0068dba9664a04ff851c6f0304eb7a57345e..dcc500077641c2fe8fbd23d8fd635a2ad34c5fe4 100644 --- a/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/OcpApiTreeServiceImpl.java @@ -8,9 +8,11 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pms.ocp.common.utils.RandomStringUtils; import com.pms.ocp.mapper.OcpApiBaseMapper; import com.pms.ocp.mapper.OcpApiTreeMapper; +import com.pms.ocp.model.QueryResponseResult; import com.pms.ocp.model.dto.*; import com.pms.ocp.model.entity.OcpApiGroup; +import com.pms.ocp.model.entity.OcpTenantGroup; import com.pms.ocp.service.OcpApiTreeService; import lombok.extern.slf4j.Slf4j; import org.apache.commons.lang3.StringUtils; @@ -25,7 +27,7 @@ import java.util.stream.Stream; @Service @Slf4j -public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { +public class OcpApiTreeServiceImpl extends ServiceImpl implements OcpApiTreeService { @Autowired @@ -41,19 +43,19 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getByGroup(Long apiGroupPromotionType,String apiGroupCode) { - - if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)){ - List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); - return ocpApiGroups; - } else if(!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))){ - List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); - return ocpApiGroups; - } - - return null; + public List getByGroup(Long apiGroupPromotionType, String apiGroupCode) { + + if (!("".equals(apiGroupPromotionType)) && StringUtils.isBlank(apiGroupCode)) { + List ocpApiGroups = mapper.selectTwoApiGroups(apiGroupPromotionType); + return ocpApiGroups; + } else if (!("".equals(apiGroupPromotionType)) && !(StringUtils.isBlank(apiGroupCode))) { + List ocpApiGroups = mapper.selectThreeApiGroupsList(apiGroupPromotionType, apiGroupCode); + return ocpApiGroups; } + return null; + } + /** * 新增服务分类 @@ -61,35 +63,35 @@ public class OcpApiTreeServiceImpl extends ServiceImpl ocpApiGroups = mapper.selectList(null); - Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); - Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); - if (!(apiGroupStream1.isParallel())){ - OcpApiGroup ocpApi = new OcpApiGroup(); - BeanUtils.copyProperties(ocpApiGroup,ocpApi); + Stream ocpApiGroupStream = ocpApiGroups.stream().filter(item -> item.getApiGroupCode().equals(ocpApiGroup.getApiGroupPcode())); + Stream apiGroupStream1 = ocpApiGroupStream.filter(ocp -> ocp.getApiGroupName().equals(ocpApiGroup.getApiGroupName())); + OcpApiGroup ocpApi = new OcpApiGroup(); + if (!(StringUtils.isBlank(apiGroupStream1.toString()))) { + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + BeanUtils.copyProperties(ocpApiGroup, ocpApi); ocpApi.setObjId(""); ocpApi.setApiGroupMtime(timestamp); ocpApi.setApiGroupCtime(timestamp); ocpApi.setApiGroupPcode(ocpApiGroup.getApiGroupCode()); ocpApi.setApiGroupCode(code); - if(ocpApiGroup.getApiGroupLevel().equals("Middleground")){ + ocpApi.setApiGroupPromotionType(ocpApiGroup.getApiGroupPromotionType()); + if ("Middleground".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("sys_center"); } - if(ocpApiGroup.getApiGroupLevel().equals("sys_center")){ + if ("sys_center".equals(ocpApiGroup.getApiGroupLevel())) { ocpApiGroup.setApiGroupLevel("api_group"); } - mapper.insert(ocpApi); - - }else { - return false; + } else { + return ocpApi; } - return flag; + return ocpApi; } @@ -123,18 +125,21 @@ public class OcpApiTreeServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(OcpApiGroup::getApiGroupCode, ocpApiGroup.getApiGroupCode()); String objId = ocpApiGroup.getObjId(); - OcpApiGroup ocpApiGroup1 = mapper.selectById(objId); - List ocpApiGroups = mapper.selectList(null); - for (OcpApiGroup apiGroup : ocpApiGroups) { - if ((ocpApiGroup1.getApiGroupCode()).equals(apiGroup.getApiGroupPcode())){ - flag = false; - break; - } + if (StringUtils.isBlank(ocpApiGroup.getApiGroupCode())) { + flag = false; + } else { + + LambdaQueryWrapper eq = queryWrapper.eq(OcpApiGroup::getApiGroupPcode, ocpApiGroup.getApiGroupCode()); + if (StringUtils.isBlank(eq.toString())) { + flag = false; + } } - if (flag){ + if (flag) { mapper.deleteById(objId); } return flag; @@ -149,17 +154,27 @@ public class OcpApiTreeServiceImpl extends ServiceImpl getOnePages(PageGroupDto pageGroupDto) { - Page pageInfo = new Page(pageGroupDto.getPageNum(), pageGroupDto.getPageSize()); - if (StringUtils.isBlank(pageGroupDto.getApiGroupCode())){ - LambdaQueryWrapper lambdaQueryWrapper = new LambdaQueryWrapper(); - lambdaQueryWrapper.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); - pageInfo = mapper.selectPage(pageInfo,lambdaQueryWrapper); - }else if (!(StringUtils.isBlank(pageGroupDto.getApiGroupCode()))){ - List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(),pageGroupDto.getApiGroupCode(),pageGroupDto.getApiGroupLevel()); - pageInfo.setRecords(ocpApiGroups); - pageInfo = mapper.selectPage(pageInfo, null); + LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); + if (!("".equals(pageGroupDto.getKeyword()))) { + if (StringUtils.isBlank(pageGroupDto.getApiGroupLevel())) { + + qw.eq(OcpApiGroup::getApiGroupPromotionType, pageGroupDto.getApiGroupPromotionType()); + mapper.selectPage(pageInfo, qw); + + } else if ("Middleground".equals(pageGroupDto.getApiGroupLevel()) || "sys_center".equals(pageGroupDto.getApiGroupLevel()) || "api_group".equals(pageGroupDto.getApiGroupLevel())) { + List ocpApiGroups = mapper.selectLists(pageGroupDto.getApiGroupPromotionType(), pageGroupDto.getApiGroupCode()); + pageInfo.setRecords(ocpApiGroups); + pageInfo.setTotal(ocpApiGroups.size()); + } + } else { + LambdaQueryWrapper ocpTenantGroupLambdaQueryWrapper = qw.and(c -> c.like(OcpApiGroup::getApiGroupName, pageGroupDto.getKeyword())) + .or().like(OcpApiGroup::getApiGroupUserName, pageGroupDto.getKeyword()) + .or().like(OcpApiGroup::getApiGroupPcode, pageGroupDto.getKeyword()); + mapper.selectPage(pageInfo, ocpTenantGroupLambdaQueryWrapper); } return pageInfo; } } + + 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 7bc5dce869cb5f4dae40ec414c5df15ac4bae179..8a3d4a4613f5531d57cd858235f7dc5592148c7f 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); } } 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 fbfdd58849cb977164059024675a89a2ca57882d..a12e55bd050af3fc25547c4ff017f0cbca5a47e6 100644 --- a/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/TenantServiceImpl.java @@ -86,8 +86,7 @@ public class TenantServiceImpl extends ServiceImpl if (tenanBaseDto.getTenantGroupLevel().equals("sys_center")){ group.setTenantGroupLevel("api_group"); } - - + group.setClassIfy(tenanBaseDto.getTenantGroupCompanyCode()); //判断是否含有相同的分类名称 if (falg) {