Commit c648d400 authored by liukai's avatar liukai

问题修复

parent ffe7fbd5
......@@ -85,6 +85,7 @@ public class OcpApiSubs {
@ApiModelProperty("服务版本(最新版本)")
private long apiVersion;
public String getObjId() {
return objId;
}
......@@ -141,14 +142,6 @@ public class OcpApiSubs {
this.subsCompanyCode = subsCompanyCode;
}
public String getIsDelete() {
return this.isDelete == 0 ?"已订阅":"取消订阅";
}
public void setIsDelete(long isDelete) {
this.isDelete = isDelete;
}
public String getApiName() {
return apiName;
}
......
......@@ -70,6 +70,120 @@ public class OcpTenantSubs implements Serializable {
@ApiModelProperty("是否删除0-否,1-是")
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;
/**
......@@ -170,20 +284,7 @@ public class OcpTenantSubs implements Serializable {
this.subsLogTenantAtime = subsLogTenantAtime;
}
/**
* 是否删除0-否,1-是
* @return
*/
public String getIsDelete() {
return this.isDelete == 0 ?"已订阅":"取消订阅";
}
/**
* 是否删除0-否,1-是
*/
public void setIsDelete(Short isDelete) {
this.isDelete = isDelete;
}
@Override
public boolean equals(Object that) {
......
package com.pms.ocp.service;
import com.baomidou.mybatisplus.extension.service.IService;
import com.pms.ocp.model.entity.OcpApiTenantRel;
import com.pms.ocp.model.entity.OcpTenantAudit;
import com.pms.ocp.model.vo.ResponseVO;
......
......@@ -5,7 +5,9 @@ import cn.afterturn.easypoi.excel.entity.ExportParams;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.pms.ocp.common.constants.AnalysisConstant;
import com.pms.ocp.common.constants.ExportUtils;
import com.pms.ocp.mapper.OcpApiTenantRelMapper;
import com.pms.ocp.mapper.OcpTenantAuditMapper;
import com.pms.ocp.model.entity.OcpApiTenantRel;
import com.pms.ocp.model.entity.OcpTenantAudit;
import com.pms.ocp.model.vo.ResponseVO;
import com.pms.ocp.service.OcpTenantAuditService;
......@@ -22,6 +24,9 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
@Autowired
private OcpTenantAuditMapper ocpTenantAuditMapper;
@Autowired
private OcpApiTenantRelMapper ocpApiTenantRelMapper;
@Override
public ResponseVO getOtaList(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> otaList = ocpTenantAuditMapper.getOtaList(ocpTenantAudit);
......@@ -44,7 +49,7 @@ public class OcpTenantAuditServiceImpl extends ServiceImpl<OcpTenantAuditMapper,
@Override
public ResponseVO OtaById(OcpTenantAudit ocpTenantAudit) {
List<OcpTenantAudit> otaById = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
return ResponseVO.ok(otaById);
List<OcpTenantAudit> oatrList = ocpTenantAuditMapper.OtaById(ocpTenantAudit);
return ResponseVO.ok(oatrList);
}
}
......@@ -10,9 +10,11 @@
</select>
<select id="OtaById" resultType="com.pms.ocp.model.entity.OcpTenantAudit">
select * from ocp_tenant_audit ota
LEFT JOIN ocp_tenant_base otb
on ota.tenant_code = otb.tenant_code
where ota.obj_id = #{objId}
SELECT * from ocp_api_tenant_rel oatr
LEFT JOIN ocp_tenant_audit ota
on oatr.tenant_code = ota.tenant_code
INNER JOIN ocp_api_base oab
on oatr.api_code = oab.api_code
where oatr.tenant_code = #{tenantCode}
</select>
</mapper>
\ No newline at end of file
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