赵呈明

src/main/java/com/pms/ocp/model/dto/ApiTreeGroupDto.java

@@ -10,22 +10,26 @@ import java.util.List;
 @Data
 public class ApiTreeGroupDto {
 
-    @ApiModelProperty("一级")
+    @ApiModelProperty("1中台层")
     private List<OneTreeUpList> oneList;
 
 
-    @ApiModelProperty("二级")
+    @ApiModelProperty("2中心层")
     private List<TwoDownList> twoList;
 
-    @ApiModelProperty("三级")
+    @ApiModelProperty("3服务组层")
     private List<ThreeTreeList> ThreeList;
 
-    public List<OneTreeUpList> getOneupList() {
+    @ApiModelProperty("4服务层")
+    private List<FourTreeList> fourList;
+
+
+    public List<OneTreeUpList> getOneList() {
         return oneList;
     }
 
-    public void setOneupList(List<OneTreeUpList> oneupList) {
-        this.oneList = oneupList;
+    public void setOneList(List<OneTreeUpList> oneList) {
+        this.oneList = oneList;
     }
 
     public List<TwoDownList> getTwoList() {
@@ -43,4 +47,12 @@ public class ApiTreeGroupDto {
     public void setThreeList(List<ThreeTreeList> threeList) {
         ThreeList = threeList;
     }
+
+    public List<FourTreeList> getFourList() {
+        return fourList;
+    }
+
+    public void setFourList(List<FourTreeList> fourList) {
+        this.fourList = fourList;
+    }
 }

src/main/java/com/pms/ocp/model/dto/FourTreeList.java

+package com.pms.ocp.model.dto;
+
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.sql.Timestamp;
+
+/**
+ *
+ */
+@ApiModel(value = "4服务层")
+@Data
+public class FourTreeList {
+
+    @ApiModelProperty("主键ID")
+    private String objId;
+
+    @ApiModelProperty("分类编码")
+    private String apiGroupCode;
+
+    @ApiModelProperty("分类名称")
+    private String apiGroupName;
+
+    @ApiModelProperty("推广类型0统推，1自建")
+    private long apiGroupPromotionType;
+
+    @ApiModelProperty("分类所属公司")
+    private String apiGroupCompanyCode;
+
+    @ApiModelProperty("分类版本")
+    private String apiGroupVersion;
+
+    @ApiModelProperty("显示顺序")
+    private long apiGroupOrderNo;
+
+    @ApiModelProperty("提交人id")
+    private String apiGroupUserId;
+
+    @ApiModelProperty("提交人姓名")
+    private String apiGroupUserName;
+
+    @ApiModelProperty("创建时间")
+    private Timestamp apiGroupCtime;
+
+    @ApiModelProperty("修改时间")
+    private Timestamp apiGroupMtime;
+
+    @ApiModelProperty("上级code")
+    private String apiGroupPcode;
+
+    @ApiModelProperty("是否删除0-否1-是")
+    private long isDelete;
+
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
+
+    public String getApiGroupPcode() {
+        return apiGroupPcode;
+    }
+
+    public void setApiGroupPcode(String apiGroupPcode) {
+        this.apiGroupPcode = apiGroupPcode;
+    }
+
+    public String getObjId() {
+        return objId;
+    }
+
+    public void setObjId(String objId) {
+        this.objId = objId;
+    }
+
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
+
+    public long getApiGroupPromotionType() {
+        return apiGroupPromotionType;
+    }
+
+    public void setApiGroupPromotionType(long apiGroupPromotionType) {
+        this.apiGroupPromotionType = apiGroupPromotionType;
+    }
+
+    public String getApiGroupUserId() {
+        return apiGroupUserId;
+    }
+
+    public void setApiGroupUserId(String apiGroupUserId) {
+        this.apiGroupUserId = apiGroupUserId;
+    }
+
+    public String getApiGroupUserName() {
+        return apiGroupUserName;
+    }
+
+    public void setApiGroupUserName(String apiGroupUserName) {
+        this.apiGroupUserName = apiGroupUserName;
+    }
+
+    public Timestamp getApiGroupCtime() {
+        return apiGroupCtime;
+    }
+
+    public void setApiGroupCtime(Timestamp apiGroupCtime) {
+        this.apiGroupCtime = apiGroupCtime;
+    }
+
+    public Timestamp getApiGroupMtime() {
+        return apiGroupMtime;
+    }
+
+    public void setApiGroupMtime(Timestamp apiGroupMtime) {
+        this.apiGroupMtime = apiGroupMtime;
+    }
+
+    public String getApiGroupVersion() {
+        return apiGroupVersion;
+    }
+
+    public void setApiGroupVersion(String apiGroupVersion) {
+        this.apiGroupVersion = apiGroupVersion;
+    }
+
+    public long getApiGroupOrderNo() {
+        return apiGroupOrderNo;
+    }
+
+    public void setApiGroupOrderNo(long apiGroupOrderNo) {
+        this.apiGroupOrderNo = apiGroupOrderNo;
+    }
+
+    public String getApiGroupCompanyCode() {
+        return apiGroupCompanyCode;
+    }
+
+    public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
+        this.apiGroupCompanyCode = apiGroupCompanyCode;
+    }
+
+    public long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public long getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(long apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
+}

src/main/java/com/pms/ocp/model/dto/OcpApiGroupDtos.java

@@ -7,16 +7,10 @@ import lombok.Data;
 import java.sql.Timestamp;
 
 
-
-
-@ApiModel(value = "服务分类新增关系dto")
+@ApiModel(value = "新增接收参数")
 @Data
 public class OcpApiGroupDtos {
 
-
-    @ApiModelProperty("主键ID")
-    private String objId;
-
     @ApiModelProperty("分类编码")
     private String apiGroupCode;
 
@@ -26,6 +20,15 @@ public class OcpApiGroupDtos {
     @ApiModelProperty("推广类型0统推，1自建")
     private long apiGroupPromotionType;
 
+    @ApiModelProperty("分类所属公司")
+    private String apiGroupCompanyCode;
+
+    @ApiModelProperty("分类版本")
+    private String apiGroupVersion;
+
+    @ApiModelProperty("显示顺序")
+    private long apiGroupOrderNo;
+
     @ApiModelProperty("提交人id")
     private String apiGroupUserId;
 
@@ -35,17 +38,28 @@ public class OcpApiGroupDtos {
     @ApiModelProperty("创建时间")
     private Timestamp apiGroupCtime;
 
-
     @ApiModelProperty("修改时间")
     private Timestamp apiGroupMtime;
-    @ApiModelProperty("分类版本")
-    private String apiGroupVersion;
-
-    @ApiModelProperty("显示顺序")
-    private long apiGroupOrderNo;
 
     @ApiModelProperty("上级code")
     private String apiGroupPcode;
+
+    @ApiModelProperty("是否删除0-否1-是")
+    private long isDelete;
+
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
+
+    @ApiModelProperty("服务代码")
+    private String apiCode;
+
+    @ApiModelProperty("服务接口中文名称")
+    private String apiName;
+
+
+    @ApiModelProperty("推广类型0:统建；1:自建")
+    private long apiPromotion;
+
     @ApiModelProperty("服务请求体")
     private String apiReq;
 
@@ -55,6 +69,15 @@ public class OcpApiGroupDtos {
     @ApiModelProperty("服务地址")
     private String apiUrl;
 
+    @ApiModelProperty("服务创建时间")
+    private Timestamp apiCtime;
+
+    @ApiModelProperty("服务修改时间")
+    private Timestamp apiMtime;
+
+    @ApiModelProperty("创建者用户ID")
+    private String apiUserId;
+
     @ApiModelProperty("建设单位")
     private String apiUnit;
 
@@ -64,10 +87,235 @@ public class OcpApiGroupDtos {
     @ApiModelProperty("服务所属公司")
     private String ownerCompanyName;
 
-    @ApiModelProperty("分类所属公司")
-    private String apiGroupCompanyCode;
+    @ApiModelProperty("所属区域 1:生产控制大区;2:信息关联大区;3:互联网大区")
+    private long apiZone;
 
-    @ApiModelProperty("是否删除0-否1-是")
-    private long isDelete;
+    @ApiModelProperty("'所属层级 1:应用层;2:平台层;3:网络层;4:感知层;")
+    private long apiLayer;
+
+    @ApiModelProperty("服务版本（最新版本）")
+    private long apiVersion;
+    public String getApiGroupCode() {
+        return apiGroupCode;
+    }
+
+    public void setApiGroupCode(String apiGroupCode) {
+        this.apiGroupCode = apiGroupCode;
+    }
+
+    public String getApiGroupName() {
+        return apiGroupName;
+    }
+
+    public void setApiGroupName(String apiGroupName) {
+        this.apiGroupName = apiGroupName;
+    }
+
+    public long getApiGroupPromotionType() {
+        return apiGroupPromotionType;
+    }
+
+    public void setApiGroupPromotionType(long apiGroupPromotionType) {
+        this.apiGroupPromotionType = apiGroupPromotionType;
+    }
+
+    public String getApiGroupCompanyCode() {
+        return apiGroupCompanyCode;
+    }
+
+    public void setApiGroupCompanyCode(String apiGroupCompanyCode) {
+        this.apiGroupCompanyCode = apiGroupCompanyCode;
+    }
+
+    public String getApiGroupVersion() {
+        return apiGroupVersion;
+    }
+
+    public void setApiGroupVersion(String apiGroupVersion) {
+        this.apiGroupVersion = apiGroupVersion;
+    }
+
+    public long getApiGroupOrderNo() {
+        return apiGroupOrderNo;
+    }
+
+    public void setApiGroupOrderNo(long apiGroupOrderNo) {
+        this.apiGroupOrderNo = apiGroupOrderNo;
+    }
+
+    public String getApiGroupUserId() {
+        return apiGroupUserId;
+    }
+
+    public void setApiGroupUserId(String apiGroupUserId) {
+        this.apiGroupUserId = apiGroupUserId;
+    }
+
+    public String getApiGroupUserName() {
+        return apiGroupUserName;
+    }
+
+    public void setApiGroupUserName(String apiGroupUserName) {
+        this.apiGroupUserName = apiGroupUserName;
+    }
+
+    public Timestamp getApiGroupCtime() {
+        return apiGroupCtime;
+    }
+
+    public void setApiGroupCtime(Timestamp apiGroupCtime) {
+        this.apiGroupCtime = apiGroupCtime;
+    }
+
+    public Timestamp getApiGroupMtime() {
+        return apiGroupMtime;
+    }
+
+    public void setApiGroupMtime(Timestamp apiGroupMtime) {
+        this.apiGroupMtime = apiGroupMtime;
+    }
+
+    public String getApiGroupPcode() {
+        return apiGroupPcode;
+    }
+
+    public void setApiGroupPcode(String apiGroupPcode) {
+        this.apiGroupPcode = apiGroupPcode;
+    }
+
+    public long getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(long isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public long getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(long apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
+
+    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 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;
+    }
 }

src/main/java/com/pms/ocp/model/dto/OneTreeUpList.java

@@ -13,7 +13,7 @@ import java.util.List;
 
 
 @EqualsAndHashCode(callSuper=false)
-@ApiModel(value = "服务树一级目录")
+@ApiModel(value = "1中台层")
 @Data
 public class OneTreeUpList{
 
@@ -57,7 +57,16 @@ public class OneTreeUpList{
 
     @ApiModelProperty("是否删除0-否1-是")
     private long isDelete;
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
 
+    public long getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(long apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
 
     public String getObjId() {
         return objId;

src/main/java/com/pms/ocp/model/dto/ThreeTreeList.java

@@ -10,7 +10,7 @@ import lombok.Data;
 
 import java.sql.Timestamp;
 
-@ApiModel(value = "服务树三级目录")
+@ApiModel(value = "服务组层")
 @Data
 public class ThreeTreeList {
     @TableId(type = IdType.ASSIGN_ID)
@@ -52,7 +52,16 @@ public class ThreeTreeList {
 
     @ApiModelProperty("是否删除0-否1-是")
     private long isDelete;
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
 
+    public long getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(long apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
 
     public String getObjId() {
         return objId;

src/main/java/com/pms/ocp/model/dto/TwoDownList.java

@@ -11,7 +11,7 @@ import lombok.Data;
 import java.sql.Timestamp;
 import java.util.List;
 
-@ApiModel(value = "服务树二级目录")
+@ApiModel(value = "中心层")
 @Data
 public class TwoDownList {
     @TableId(type = IdType.ASSIGN_ID)
@@ -54,6 +54,16 @@ public class TwoDownList {
     @ApiModelProperty("是否删除0-否1-是")
     private long isDelete;
 
+    @ApiModelProperty("分层树层级 1中台层 2中心层 3 服务组层 4服务层 ")
+    private long apiGroupLevel;
+
+    public long getApiGroupLevel() {
+        return apiGroupLevel;
+    }
+
+    public void setApiGroupLevel(long apiGroupLevel) {
+        this.apiGroupLevel = apiGroupLevel;
+    }
 
     public String getObjId() {
         return objId;