修复

src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java

@@ -59,289 +59,107 @@ 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;
-//  }
-//
-//  public void setObjId(String objId) {
-//    this.objId = objId;
-//  }
-//
-//  public String getApiCode() {
-//    return apiCode;
-//  }
-//
-//  public void setApiCode(String apiCode) {
-//    this.apiCode = apiCode;
-//  }
-//
-//  public long getOperStatus() {
-//    return operStatus;
-//  }
-//
-//  public void setOperStatus(long operStatus) {
-//    this.operStatus = operStatus;
-//  }
-//
-//  public long getOperTarget() {
-//    return operTarget;
-//  }
-//
-//  public void setOperTarget(long operTarget) {
-//    this.operTarget = operTarget;
-//  }
-//
-//  public long getAuditType() {
-//    return auditType;
-//  }
-//
-//  public void setAuditType(long auditType) {
-//    this.auditType = auditType;
-//  }
-//
-//  public String getAuditMessage() {
-//    return auditMessage;
-//  }
-//
-//  public void setAuditMessage(String auditMessage) {
-//    this.auditMessage = auditMessage;
-//  }
-//
-//  public String getAuditJson() {
-//    return auditJson;
-//  }
-//
-//  public void setAuditJson(String auditJson) {
-//    this.auditJson = auditJson;
-//  }
-//
-//  public String getAuditUserId() {
-//    return auditUserId;
-//  }
-//
-//  public void setAuditUserId(String auditUserId) {
-//    this.auditUserId = auditUserId;
-//  }
-//
-//  public String getAuditUserName() {
-//    return auditUserName;
-//  }
-//
-//  public void setAuditUserName(String auditUserName) {
-//    this.auditUserName = auditUserName;
-//  }
-//
-//  public Timestamp getAuditCtime() {
-//    return auditCtime;
-//  }
-//
-//  public void setAuditCtime(Timestamp auditCtime) {
-//    this.auditCtime = auditCtime;
-//  }
-//
-//  public Timestamp getAuditMtime() {
-//    return auditMtime;
-//  }
-//
-//  public void setAuditMtime(Timestamp auditMtime) {
-//    this.auditMtime = auditMtime;
-//  }
-//
-//  public long getIsDelete() {
-//    return isDelete;
-//  }
-//
-//  public void setIsDelete(long isDelete) {
-//    this.isDelete = isDelete;
-//  }
-//
-//  public long getApplyVersion() {
-//    return applyVersion;
-//  }
-//
-//  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;
-//  }
+  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 long getOperStatus() {
+    return operStatus;
+  }
+
+  public void setOperStatus(long operStatus) {
+    this.operStatus = operStatus;
+  }
+
+  public long getOperTarget() {
+    return operTarget;
+  }
+
+  public void setOperTarget(long operTarget) {
+    this.operTarget = operTarget;
+  }
+
+  public long getAuditType() {
+    return auditType;
+  }
+
+  public void setAuditType(long auditType) {
+    this.auditType = auditType;
+  }
+
+  public String getAuditMessage() {
+    return auditMessage;
+  }
+
+  public void setAuditMessage(String auditMessage) {
+    this.auditMessage = auditMessage;
+  }
+
+  public String getAuditJson() {
+    return auditJson;
+  }
+
+  public void setAuditJson(String auditJson) {
+    this.auditJson = auditJson;
+  }
+
+  public String getAuditUserId() {
+    return auditUserId;
+  }
+
+  public void setAuditUserId(String auditUserId) {
+    this.auditUserId = auditUserId;
+  }
+
+  public String getAuditUserName() {
+    return auditUserName;
+  }
+
+  public void setAuditUserName(String auditUserName) {
+    this.auditUserName = auditUserName;
+  }
+
+  public Timestamp getAuditCtime() {
+    return auditCtime;
+  }
+
+  public void setAuditCtime(Timestamp auditCtime) {
+    this.auditCtime = auditCtime;
+  }
+
+  public Timestamp getAuditMtime() {
+    return auditMtime;
+  }
+
+  public void setAuditMtime(Timestamp auditMtime) {
+    this.auditMtime = auditMtime;
+  }
+
+  public long getIsDelete() {
+    return isDelete;
+  }
+
+  public void setIsDelete(long isDelete) {
+    this.isDelete = isDelete;
+  }
+
+  public long getApplyVersion() {
+    return applyVersion;
+  }
+
+  public void setApplyVersion(long applyVersion) {
+    this.applyVersion = applyVersion;
+  }
 }

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;
+    }
 }