赵呈明

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

@@ -10,10 +10,9 @@ import lombok.Data;
  * @Date: 2022/2/22 16:40
  * @Description:模型属性对象
  */
-
 @Data
 @TableName("ocp_model_prop")
-public class ModelProperty {
+public class ModelProperty{
 
     /**
      * 模型属性编号

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

@@ -50,7 +50,26 @@ public class OcpApiAudit {
 
   @ApiModelProperty("是否删除0-否1-是")
   private long isDelete;
+  @ApiModelProperty("当前版本")
+  private long applyVersion;
+  @ApiModelProperty("上一版本")
+  private long preApplyVersion;
 
+  public long getApplyVersion() {
+    return applyVersion;
+  }
+
+  public void setApplyVersion(long applyVersion) {
+    this.applyVersion = applyVersion;
+  }
+
+  public long getPreApplyVersion() {
+    return preApplyVersion;
+  }
+
+  public void setPreApplyVersion(long preApplyVersion) {
+    this.preApplyVersion = preApplyVersion;
+  }
 
   public String getObjId() {
     return objId;

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

@@ -62,8 +62,40 @@ public class OcpApiBase {
   @ApiModelProperty("是否删除0-否1-是")
   private long isDelete;
 
+  @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+  private long apiZone;
 
-  public String getObjId() {
+  @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+  private long apiLayer;
+
+  @ApiModelProperty("服务版本（最新版本）")
+  private long apiVersion;
+
+    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;
   }
 

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

@@ -11,98 +11,82 @@ import java.sql.Timestamp;
 
 @Data
 @Accessors(chain = true)
-@TableName("ocp_api_dep")
+@TableName("ocp_api_moedel_rel")
 @ApiModel("服务模型关系")
 public class OcpApiDep {
   @TableId(type = IdType.ASSIGN_ID)
   @ApiModelProperty("主键ID")
   private String objId;
 
-  @ApiModelProperty("服务code")
-  private String apiCode;
+  @ApiModelProperty("模型编码")
+  private String modelCode;
 
   @ApiModelProperty("部署公司code")
-  private String depCompanyCode;
+  private String modelDepCompanyCode;
+  @ApiModelProperty("服务编码")
+  private String apiCode;
 
-  @ApiModelProperty("部署人员id")
-  private String depUserId;
+  @ApiModelProperty("部署公司")
+  private String apiDepCompanyCode;
 
-  @ApiModelProperty("部署人")
-  private String depUserName;
 
-  @ApiModelProperty("部署时间")
-  private Timestamp depCtime;
+  @ApiModelProperty("关系添加时间")
+  private Timestamp relationCtime;
 
-  @ApiModelProperty("部署修改时间")
-  private Timestamp depMtime;
 
   @ApiModelProperty("是否删除0-否1-是")
   private long isDelete;
 
 
-  public String getObjId() {
-    return objId;
-  }
-
-  public void setObjId(String objId) {
-    this.objId = objId;
-  }
-
 
-  public String getApiCode() {
-    return apiCode;
+  public String getModelCode() {
+    return modelCode;
   }
 
-  public void setApiCode(String apiCode) {
-    this.apiCode = apiCode;
+  public void setModelCode(String modelCode) {
+    this.modelCode = modelCode;
   }
 
-
-  public String getDepCompanyCode() {
-    return depCompanyCode;
+  public String getModelDepCompanyCode() {
+    return modelDepCompanyCode;
   }
 
-  public void setDepCompanyCode(String depCompanyCode) {
-    this.depCompanyCode = depCompanyCode;
+  public void setModelDepCompanyCode(String modelDepCompanyCode) {
+    this.modelDepCompanyCode = modelDepCompanyCode;
   }
 
-
-  public String getDepUserId() {
-    return depUserId;
+  public String getApiDepCompanyCode() {
+    return apiDepCompanyCode;
   }
 
-  public void setDepUserId(String depUserId) {
-    this.depUserId = depUserId;
+  public void setApiDepCompanyCode(String apiDepCompanyCode) {
+    this.apiDepCompanyCode = apiDepCompanyCode;
   }
 
-
-  public String getDepUserName() {
-    return depUserName;
+  public Timestamp getRelationCtime() {
+    return relationCtime;
   }
 
-  public void setDepUserName(String depUserName) {
-    this.depUserName = depUserName;
+  public void setRelationCtime(Timestamp relationCtime) {
+    this.relationCtime = relationCtime;
   }
 
-
-  public Timestamp getDepCtime() {
-    return depCtime;
+  public String getObjId() {
+    return objId;
   }
 
-  public void setDepCtime(Timestamp depCtime) {
-    this.depCtime = depCtime;
+  public void setObjId(String objId) {
+    this.objId = objId;
   }
 
 
-  public Timestamp getDepMtime() {
-    return depMtime;
+  public String getApiCode() {
+    return apiCode;
   }
 
-  public void setDepMtime(Timestamp depMtime) {
-    this.depMtime = depMtime;
+  public void setApiCode(String apiCode) {
+    this.apiCode = apiCode;
   }
-
-
   public long getIsDelete() {
     return isDelete;
   }

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

@@ -21,100 +21,155 @@ public class OcpApiExtent {
   @ApiModelProperty("服务编码")
   private String apiCode;
 
-  @ApiModelProperty("服务属性")
-  private String apiAttribute;
+  @ApiModelProperty("系统名称")
+  private String sysName;
+
+  @ApiModelProperty("模块")
+  private String partName;
+  @ApiModelProperty("服务群")
+  private String serviceGroup;
+  @ApiModelProperty("服务")
+  private String serviceName;
+  @ApiModelProperty("所属集群")
+  private String clusterName;
+  @ApiModelProperty("所属命名空间")
+  private String 所属命名空间;
+  @ApiModelProperty("服务描述")
+  private String serviceDescription;
+  @ApiModelProperty("部署信息")
+  private String deployment;
+  @ApiModelProperty("服务状态0未发布1已发布")
+  private String apiState;
 
-  @ApiModelProperty("属性简述")
-  private String apiAttrDesc;
-
-  @ApiModelProperty("属性值")
-  private String apiAttrValue;
 
   @ApiModelProperty("属性添加时间")
-  private Timestamp apiAttrCtime;
+  private Timestamp apiCtime;
 
   @ApiModelProperty("属性修改时间")
-  private Timestamp apiAttrMtime;
+  private Timestamp apiMtime;
 
-  @ApiModelProperty("所属公司")
-  private String ownerCompanyCode;
+  @ApiModelProperty("部属公司")
+  private String depCompanyCode;
 
   @ApiModelProperty("是否已删除 0-否 1-是")
   private long isDelete;
 
 
-  public String getObjId() {
-    return objId;
+  public String getSysName() {
+    return sysName;
   }
 
-  public void setObjId(String objId) {
-    this.objId = objId;
+  public void setSysName(String sysName) {
+    this.sysName = sysName;
   }
 
+  public String getPartName() {
+    return partName;
+  }
 
-  public String getApiCode() {
-    return apiCode;
+  public void setPartName(String partName) {
+    this.partName = partName;
   }
 
-  public void setApiCode(String apiCode) {
-    this.apiCode = apiCode;
+  public String getServiceGroup() {
+    return serviceGroup;
+  }
+
+  public void setServiceGroup(String serviceGroup) {
+    this.serviceGroup = serviceGroup;
+  }
+
+  public String getServiceName() {
+    return serviceName;
+  }
+
+  public void setServiceName(String serviceName) {
+    this.serviceName = serviceName;
+  }
+
+  public String getClusterName() {
+    return clusterName;
   }
 
+  public void setClusterName(String clusterName) {
+    this.clusterName = clusterName;
+  }
 
-  public String getApiAttribute() {
-    return apiAttribute;
+  public String get所属命名空间() {
+    return 所属命名空间;
   }
 
-  public void setApiAttribute(String apiAttribute) {
-    this.apiAttribute = apiAttribute;
+  public void set所属命名空间(String 所属命名空间) {
+    this.所属命名空间 = 所属命名空间;
   }
 
+  public String getServiceDescription() {
+    return serviceDescription;
+  }
 
-  public String getApiAttrDesc() {
-    return apiAttrDesc;
+  public void setServiceDescription(String serviceDescription) {
+    this.serviceDescription = serviceDescription;
   }
 
-  public void setApiAttrDesc(String apiAttrDesc) {
-    this.apiAttrDesc = apiAttrDesc;
+  public String getDeployment() {
+    return deployment;
   }
 
+  public void setDeployment(String deployment) {
+    this.deployment = deployment;
+  }
 
-  public String getApiAttrValue() {
-    return apiAttrValue;
+  public String getApiState() {
+    return apiState;
   }
 
-  public void setApiAttrValue(String apiAttrValue) {
-    this.apiAttrValue = apiAttrValue;
+  public void setApiState(String apiState) {
+    this.apiState = apiState;
   }
 
+  public Timestamp getApiCtime() {
+    return apiCtime;
+  }
 
-  public Timestamp getApiAttrCtime() {
-    return apiAttrCtime;
+  public void setApiCtime(Timestamp apiCtime) {
+    this.apiCtime = apiCtime;
   }
 
-  public void setApiAttrCtime(Timestamp apiAttrCtime) {
-    this.apiAttrCtime = apiAttrCtime;
+  public Timestamp getApiMtime() {
+    return apiMtime;
   }
 
+  public void setApiMtime(Timestamp apiMtime) {
+    this.apiMtime = apiMtime;
+  }
+
+  public String getDepCompanyCode() {
+    return depCompanyCode;
+  }
+
+  public void setDepCompanyCode(String depCompanyCode) {
+    this.depCompanyCode = depCompanyCode;
+  }
 
-  public Timestamp getApiAttrMtime() {
-    return apiAttrMtime;
+  public String getObjId() {
+    return objId;
   }
 
-  public void setApiAttrMtime(Timestamp apiAttrMtime) {
-    this.apiAttrMtime = apiAttrMtime;
+  public void setObjId(String objId) {
+    this.objId = objId;
   }
 
 
-  public String getOwnerCompanyCode() {
-    return ownerCompanyCode;
+  public String getApiCode() {
+    return apiCode;
   }
 
-  public void setOwnerCompanyCode(String ownerCompanyCode) {
-    this.ownerCompanyCode = ownerCompanyCode;
+  public void setApiCode(String apiCode) {
+    this.apiCode = apiCode;
   }
 
 
+
   public long getIsDelete() {
     return isDelete;
   }

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

@@ -54,6 +54,11 @@ public class OcpApiGroup {
   @ApiModelProperty("是否删除0-否1-是")
   private long isDelete;
 
+  @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+  private long apiGroupLevel;
+
+
+
 
   public String getObjId() {
     return objId;