Skip to content

O
operation-control-platform
Commit b4d7254a authored by 郭凡凡's avatar 郭凡凡
Browse files
Options

应用下线功能

parent e57c7aaf
Hide whitespace changes
Inline Side-by-side
Showing with 284 additions and 270 deletions
src/main/java/com/pms/ocp/controller/TenantBasicManagementController.java
View file @ b4d7254a
...@@ -84,7 +84,8 @@ public class TenantBasicManagementController { ...@@ -84,7 +84,8 @@ public class TenantBasicManagementController {
@ApiOperation("应用树层级") @ApiOperation("应用树层级")
@GetMapping("/tenantBaseTreeOther") @GetMapping("/tenantBaseTreeOther")
public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode) { public ResponseVO<List<GroupDto>> tenantBaseTreeOther(@RequestParam(required = false) String tenantGroupCode, @RequestParam(required = false) String tenantGroupCompanyCode
) {
List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode); List<GroupDto> ocpApiGroups = tenantBasicManagementService.tenantBaseTreeOther(tenantGroupCode, tenantGroupCompanyCode);
return ResponseVO.ok(ocpApiGroups); return ResponseVO.ok(ocpApiGroups);
} }
......
src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java
View file @ b4d7254a
...@@ -99,76 +99,76 @@ public class OcpTenantAudit implements Serializable { ...@@ -99,76 +99,76 @@ public class OcpTenantAudit implements Serializable {
@Excel(name = " 上一版本",orderNum = "11") @Excel(name = " 上一版本",orderNum = "11")
private String perTenantVersion; private String perTenantVersion;
private static final long serialVersionUID = 1L; // private static final long serialVersionUID = 1L;
//
@ApiModelProperty("服务编码") // @ApiModelProperty("服务编码")
private String apiCode; // private String apiCode;
//
@ApiModelProperty("服务部署公司") // @ApiModelProperty("服务部署公司")
private String apiDepCompanyCode; // private String apiDepCompanyCode;
//
@ApiModelProperty("应用所属公司") // @ApiModelProperty("应用所属公司")
private String tenantDepCompanyCode; // private String tenantDepCompanyCode;
//
@ApiModelProperty("关系创建时间") // @ApiModelProperty("关系创建时间")
private Timestamp apiTenantRelCtime; // private Timestamp apiTenantRelCtime;
//
@ApiModelProperty("关系创建时间") // @ApiModelProperty("关系创建时间")
private Timestamp apiTenantRelMtime; // private Timestamp apiTenantRelMtime;
//
@ApiModelProperty("关系创建用户ID") // @ApiModelProperty("关系创建用户ID")
private String apiTenantRelUserId; // private String apiTenantRelUserId;
//
@ApiModelProperty("关系创建用户") // @ApiModelProperty("关系创建用户")
private String apiTenantRelUserName; // private String apiTenantRelUserName;
//
@ApiModelProperty("是否已删除0未删除，1已删除") // @ApiModelProperty("是否已删除0未删除，1已删除")
private long isDelete; // private long isDelete;
//
@ApiModelProperty("服务接口中文名称") // @ApiModelProperty("服务接口中文名称")
private String apiName; // private String apiName;
//
@ApiModelProperty("服务分类代码") // @ApiModelProperty("服务分类代码")
private String apiGroupCode; // private String apiGroupCode;
//
@ApiModelProperty("推广类型0:统建；1:自建") // @ApiModelProperty("推广类型0:统建；1:自建")
private long apiPromotion; // private long apiPromotion;
//
@ApiModelProperty("服务请求体") // @ApiModelProperty("服务请求体")
private String apiReq; // private String apiReq;
//
@ApiModelProperty("服务返回体") // @ApiModelProperty("服务返回体")
private String apiResp; // private String apiResp;
//
@ApiModelProperty("服务地址") // @ApiModelProperty("服务地址")
private String apiUrl; // private String apiUrl;
//
@ApiModelProperty("服务创建时间") // @ApiModelProperty("服务创建时间")
private Timestamp apiCtime; // private Timestamp apiCtime;
//
@ApiModelProperty("服务修改时间") // @ApiModelProperty("服务修改时间")
private Timestamp apiMtime; // private Timestamp apiMtime;
//
@ApiModelProperty("创建者用户ID") // @ApiModelProperty("创建者用户ID")
private String apiUserId; // private String apiUserId;
//
@ApiModelProperty("建设单位") // @ApiModelProperty("建设单位")
private String apiUnit; // private String apiUnit;
//
@ApiModelProperty("服务所属公司") // @ApiModelProperty("服务所属公司")
private String ownerCompanyCode; // private String ownerCompanyCode;
//
@ApiModelProperty("服务所属公司") // @ApiModelProperty("服务所属公司")
private String ownerCompanyName; // private String ownerCompanyName;
//
@ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区") // @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
private long apiZone; // private long apiZone;
//
@ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;") // @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
private long apiLayer; // private long apiLayer;
//
@ApiModelProperty("服务版本（最新版本）") // @ApiModelProperty("服务版本（最新版本）")
private long apiVersion; // private long apiVersion;
public String getObjId() { public String getObjId() {
return objId; return objId;
...@@ -254,193 +254,193 @@ public class OcpTenantAudit implements Serializable { ...@@ -254,193 +254,193 @@ public class OcpTenantAudit implements Serializable {
this.perTenantVersion = perTenantVersion; this.perTenantVersion = perTenantVersion;
} }
public static long getSerialVersionUID() { // public static long getSerialVersionUID() {
return serialVersionUID; // return serialVersionUID;
} // }
//
public String getApiCode() { // public String getApiCode() {
return apiCode; // return apiCode;
} // }
//
public void setApiCode(String apiCode) { // public void setApiCode(String apiCode) {
this.apiCode = apiCode; // this.apiCode = apiCode;
} // }
//
public String getApiDepCompanyCode() { // public String getApiDepCompanyCode() {
return apiDepCompanyCode; // return apiDepCompanyCode;
} // }
//
public void setApiDepCompanyCode(String apiDepCompanyCode) { // public void setApiDepCompanyCode(String apiDepCompanyCode) {
this.apiDepCompanyCode = apiDepCompanyCode; // this.apiDepCompanyCode = apiDepCompanyCode;
} // }
//
public String getTenantDepCompanyCode() { // public String getTenantDepCompanyCode() {
return tenantDepCompanyCode; // return tenantDepCompanyCode;
} // }
//
public void setTenantDepCompanyCode(String tenantDepCompanyCode) { // public void setTenantDepCompanyCode(String tenantDepCompanyCode) {
this.tenantDepCompanyCode = tenantDepCompanyCode; // this.tenantDepCompanyCode = tenantDepCompanyCode;
} // }
//
public Timestamp getApiTenantRelCtime() { // public Timestamp getApiTenantRelCtime() {
return apiTenantRelCtime; // return apiTenantRelCtime;
} // }
//
public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) { // public void setApiTenantRelCtime(Timestamp apiTenantRelCtime) {
this.apiTenantRelCtime = apiTenantRelCtime; // this.apiTenantRelCtime = apiTenantRelCtime;
} // }
//
public Timestamp getApiTenantRelMtime() { // public Timestamp getApiTenantRelMtime() {
return apiTenantRelMtime; // return apiTenantRelMtime;
} // }
//
public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) { // public void setApiTenantRelMtime(Timestamp apiTenantRelMtime) {
this.apiTenantRelMtime = apiTenantRelMtime; // this.apiTenantRelMtime = apiTenantRelMtime;
} // }
//
public String getApiTenantRelUserId() { // public String getApiTenantRelUserId() {
return apiTenantRelUserId; // return apiTenantRelUserId;
} // }
//
public void setApiTenantRelUserId(String apiTenantRelUserId) { // public void setApiTenantRelUserId(String apiTenantRelUserId) {
this.apiTenantRelUserId = apiTenantRelUserId; // this.apiTenantRelUserId = apiTenantRelUserId;
} // }
//
public String getApiTenantRelUserName() { // public String getApiTenantRelUserName() {
return apiTenantRelUserName; // return apiTenantRelUserName;
} // }
//
public void setApiTenantRelUserName(String apiTenantRelUserName) { // public void setApiTenantRelUserName(String apiTenantRelUserName) {
this.apiTenantRelUserName = apiTenantRelUserName; // this.apiTenantRelUserName = apiTenantRelUserName;
} // }
//
public long getIsDelete() { // public long getIsDelete() {
return isDelete; // return isDelete;
} // }
//
public void setIsDelete(long isDelete) { // public void setIsDelete(long isDelete) {
this.isDelete = isDelete; // this.isDelete = isDelete;
} // }
//
public String getApiName() { // public String getApiName() {
return apiName; // return apiName;
} // }
//
public void setApiName(String apiName) { // public void setApiName(String apiName) {
this.apiName = apiName; // this.apiName = apiName;
} // }
//
public String getApiGroupCode() { // public String getApiGroupCode() {
return apiGroupCode; // return apiGroupCode;
} // }
//
public void setApiGroupCode(String apiGroupCode) { // public void setApiGroupCode(String apiGroupCode) {
this.apiGroupCode = apiGroupCode; // this.apiGroupCode = apiGroupCode;
} // }
//
public long getApiPromotion() { // public long getApiPromotion() {
return apiPromotion; // return apiPromotion;
} // }
//
public void setApiPromotion(long apiPromotion) { // public void setApiPromotion(long apiPromotion) {
this.apiPromotion = apiPromotion; // this.apiPromotion = apiPromotion;
} // }
//
public String getApiReq() { // public String getApiReq() {
return apiReq; // return apiReq;
} // }
//
public void setApiReq(String apiReq) { // public void setApiReq(String apiReq) {
this.apiReq = apiReq; // this.apiReq = apiReq;
} // }
//
public String getApiResp() { // public String getApiResp() {
return apiResp; // return apiResp;
} // }
//
public void setApiResp(String apiResp) { // public void setApiResp(String apiResp) {
this.apiResp = apiResp; // this.apiResp = apiResp;
} // }
//
public String getApiUrl() { // public String getApiUrl() {
return apiUrl; // return apiUrl;
} // }
//
public void setApiUrl(String apiUrl) { // public void setApiUrl(String apiUrl) {
this.apiUrl = apiUrl; // this.apiUrl = apiUrl;
} // }
//
public Timestamp getApiCtime() { // public Timestamp getApiCtime() {
return apiCtime; // return apiCtime;
} // }
//
public void setApiCtime(Timestamp apiCtime) { // public void setApiCtime(Timestamp apiCtime) {
this.apiCtime = apiCtime; // this.apiCtime = apiCtime;
} // }
//
public Timestamp getApiMtime() { // public Timestamp getApiMtime() {
return apiMtime; // return apiMtime;
} // }
//
public void setApiMtime(Timestamp apiMtime) { // public void setApiMtime(Timestamp apiMtime) {
this.apiMtime = apiMtime; // this.apiMtime = apiMtime;
} // }
//
public String getApiUserId() { // public String getApiUserId() {
return apiUserId; // return apiUserId;
} // }
//
public void setApiUserId(String apiUserId) { // public void setApiUserId(String apiUserId) {
this.apiUserId = apiUserId; // this.apiUserId = apiUserId;
} // }
//
public String getApiUnit() { // public String getApiUnit() {
return apiUnit; // return apiUnit;
} // }
//
public void setApiUnit(String apiUnit) { // public void setApiUnit(String apiUnit) {
this.apiUnit = apiUnit; // this.apiUnit = apiUnit;
} // }
//
public String getOwnerCompanyCode() { // public String getOwnerCompanyCode() {
return ownerCompanyCode; // return ownerCompanyCode;
} // }
//
public void setOwnerCompanyCode(String ownerCompanyCode) { // public void setOwnerCompanyCode(String ownerCompanyCode) {
this.ownerCompanyCode = ownerCompanyCode; // this.ownerCompanyCode = ownerCompanyCode;
} // }
//
public String getOwnerCompanyName() { // public String getOwnerCompanyName() {
return ownerCompanyName; // return ownerCompanyName;
} // }
//
public void setOwnerCompanyName(String ownerCompanyName) { // public void setOwnerCompanyName(String ownerCompanyName) {
this.ownerCompanyName = ownerCompanyName; // this.ownerCompanyName = ownerCompanyName;
} // }
//
public long getApiZone() { // public long getApiZone() {
return apiZone; // return apiZone;
} // }
//
public void setApiZone(long apiZone) { // public void setApiZone(long apiZone) {
this.apiZone = apiZone; // this.apiZone = apiZone;
} // }
//
public long getApiLayer() { // public long getApiLayer() {
return apiLayer; // return apiLayer;
} // }
//
public void setApiLayer(long apiLayer) { // public void setApiLayer(long apiLayer) {
this.apiLayer = apiLayer; // this.apiLayer = apiLayer;
} // }
//
public long getApiVersion() { // public long getApiVersion() {
return apiVersion; // return apiVersion;
} // }
//
public void setApiVersion(long apiVersion) { // public void setApiVersion(long apiVersion) {
this.apiVersion = apiVersion; // this.apiVersion = apiVersion;
} // }
// @Override // @Override
// public boolean equals(Object that) { // public boolean equals(Object that) {
......
src/main/java/com/pms/ocp/service/impl/TenantBasicManagementServiceImpl.java
View file @ b4d7254a
...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; ...@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageHelper;
import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.pms.ocp.mapper.OcpTenantAuditMapper;
import com.pms.ocp.mapper.OcpTenantExtentMapper; import com.pms.ocp.mapper.OcpTenantExtentMapper;
import com.pms.ocp.mapper.OcpTenantGroupMapper; import com.pms.ocp.mapper.OcpTenantGroupMapper;
import com.pms.ocp.mapper.TenantBasicManagementMapper; import com.pms.ocp.mapper.TenantBasicManagementMapper;
...@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -44,6 +45,8 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
private OcpTenantGroupService ocpTenantGroupService; private OcpTenantGroupService ocpTenantGroupService;
@Autowired @Autowired
private OcpTenantGroupMapper ocpTenantGroupMapper; private OcpTenantGroupMapper ocpTenantGroupMapper;
@Autowired
private OcpTenantAuditMapper ocpTenantAuditMapper;
List<String> tenantGroup = new ArrayList<>(); List<String> tenantGroup = new ArrayList<>();
...@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -86,11 +89,15 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) {
String tenantCode = ocpTenantExtent.getTenantCode(); String tenantCode = ocpTenantExtent.getTenantCode();
if (ocpTenantExtent.getTenantState() == 0) { if (ocpTenantExtent.getTenantState() == null) {
return ResponseVO.error("数据为空"); return ResponseVO.error("数据错误,状态为空");
} else if (ocpTenantExtent.getTenantState() == 1) { } else if (ocpTenantExtent.getTenantState() == 1) {
return ResponseVO.error(tenantCode + "已发布,请勿重复操作"); return ResponseVO.error(tenantCode + "已发布,请勿重复操作");
} else { }
// else if (ocpTenantExtent.getTenantState() == 2) {
// return ResponseVO.error(tenantCode + "已下线,无法发布");
// }
else {
ocpTenantExtent.setTenantState((short) 1); ocpTenantExtent.setTenantState((short) 1);
ocpTenantExtentMapper.updateById(ocpTenantExtent); ocpTenantExtentMapper.updateById(ocpTenantExtent);
} }
...@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan ...@@ -143,22 +150,28 @@ public class TenantBasicManagementServiceImpl extends ServiceImpl<TenantBasicMan
String[] split = tenantCodes.split(","); String[] split = tenantCodes.split(",");
List<String> list = Arrays.asList(split); List<String> list = Arrays.asList(split);
LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list); // LambdaQueryWrapper<OcpTenantExtent> lambdaQueryWrapper = new LambdaQueryWrapper<>();
List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper); // lambdaQueryWrapper.in(OcpTenantExtent::getTenantCode, list);
// List<OcpTenantExtent> ocpTenantExtents = ocpTenantExtentMapper.selectList(lambdaQueryWrapper);
LambdaQueryWrapper<OcpTenantAudit> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.in(OcpTenantAudit::getTenantCode, list);
List<OcpTenantAudit> ocpTenantExtents = ocpTenantAuditMapper.selectList(lambdaQueryWrapper);
if (ocpTenantExtents.size() == 0) { if (ocpTenantExtents.size() == 0) {
return ResponseVO.error("数据为空"); return ResponseVO.error("系统错误,数据为空");
} }
for (OcpTenantExtent ocpTenantExtent : ocpTenantExtents) { for (OcpTenantAudit ocpTenantExtent : ocpTenantExtents) {
String tenantCode = ocpTenantExtent.getTenantCode(); String tenantCode = ocpTenantExtent.getTenantCode();
if (ocpTenantExtent.getTenantState() == null) { if (ocpTenantExtent.getOperStatus() == null) {
return ResponseVO.error("系统错误,状态为空"); return ResponseVO.error("系统错误,状态为空");
} else if (ocpTenantExtent.getTenantState() == 2) { } else if (ocpTenantExtent.getOperStatus() == 2) {
return ResponseVO.error(tenantCode + "已下线,请勿重复下线"); return ResponseVO.error(tenantCode + "已下线,请勿重复下线");
} else { } else {
ocpTenantExtent.setTenantState((short) 2); ocpTenantExtent.setOperStatus((short) 2);
ocpTenantExtentMapper.updateById(ocpTenantExtent); ocpTenantAuditMapper.updateById(ocpTenantExtent);
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment