diff --git a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java b/src/main/java/com/pms/ocp/common/utils/TreeUtils.java index e3298214624434ab19a392296453c86acd90858d..85a2d7bff65319e448518f68ab15fcec0f477ebf 100644 --- a/src/main/java/com/pms/ocp/common/utils/TreeUtils.java +++ b/src/main/java/com/pms/ocp/common/utils/TreeUtils.java @@ -61,7 +61,6 @@ public class TreeUtils { } result.add(node); } - return result; } diff --git a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java index e5e4a20270aecec0a641143f2153be8cd5933696..9fd2f66129f94a40476e64a88c6355de54ecc25a 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpApiAudit.java @@ -17,60 +17,54 @@ public class OcpApiAudit { @TableId(type = IdType.ASSIGN_ID) @ApiModelProperty("主键ID") - @Excel(name = "主键ID",orderNum = "1") + @Excel(name = "编号",orderNum = "1") private String objId; @ApiModelProperty("服务编码") - @Excel(name = "服务编码",orderNum = "2") private String apiCode; @ApiModelProperty("操作状态0:新增,1:迭代;2,下线") - @Excel(name = "操作状态",orderNum = "3") + @Excel(name = "类型",orderNum = "3") private long operStatus; @ApiModelProperty("操作对象0:服务,1:入参,2:出参") - @Excel(name = "操作对象",orderNum = "4") private long operTarget; @ApiModelProperty("类型0:人工操作,1:流程管控,3:总部下发") - @Excel(name = "操作对象",orderNum = "4") private long auditType; @ApiModelProperty("备注简述") - @Excel(name = "备注简述",orderNum = "5") private String auditMessage; @ApiModelProperty("事记内容") - @Excel(name = "事记内容",orderNum = "6") + @Excel(name = "变更内容",orderNum = "4") private String auditJson; @ApiModelProperty("提交人id") - @Excel(name = "提交人id",orderNum = "7") private String auditUserId; @ApiModelProperty("提交人姓名") - @Excel(name = "提交人姓名",orderNum = "8") + @Excel(name = "变更人",orderNum = "5") private String auditUserName; @ApiModelProperty("创建时间") - @Excel(name = "创建时间",orderNum = "9") + @Excel(name = "创建时间",orderNum = "6") private Timestamp auditCtime; @ApiModelProperty("修改时间") - @Excel(name = "修改时间",orderNum = "10") private Timestamp auditMtime; @ApiModelProperty("是否删除0-否1-是") - @Excel(name = "是否删除",orderNum = "11") private long isDelete; @ApiModelProperty("当前版本") - @Excel(name = "当前版本",orderNum = "12") private long applyVersion; + @ApiModelProperty("上一版本") - @Excel(name = "上一版本",orderNum = "13") + @Excel(name = "上一版本",orderNum = "7") private long preApiVersion; @ApiModelProperty("服务接口中文名称") + @Excel(name = "服务名称",orderNum = "2") private String apiName; @ApiModelProperty("服务分类代码") @@ -80,9 +74,12 @@ public class OcpApiAudit { private long apiPromotion; @ApiModelProperty("服务请求体") + @Excel(name = "请求参数",orderNum = "8") private String apiReq; @ApiModelProperty("服务返回体") + @Excel(name = "返回参数",orderNum = "9") + private String apiResp; @ApiModelProperty("服务地址") @@ -113,6 +110,7 @@ public class OcpApiAudit { private long apiLayer; @ApiModelProperty("服务版本(最新版本)") + @Excel(name = "当前版本",orderNum = "6") private long apiVersion; public String getObjId() { diff --git a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java index 7918098858a7d5c9101b230e65cf4b9f249d6d2c..125901205202362bbc88d82b7fc8bcc287477ad5 100644 --- a/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java +++ b/src/main/java/com/pms/ocp/model/entity/OcpTenantAudit.java @@ -83,7 +83,7 @@ public class OcpTenantAudit implements Serializable { */ @ApiModelProperty("创建时间") @Excel(name = "创建时间",orderNum = "9") - private Date auditCtime; + private Timestamp auditCtime; /** * 应用版本(当前版本) @@ -238,14 +238,10 @@ public class OcpTenantAudit implements Serializable { return auditCtime; } - public void setAuditCtime(Date auditCtime) { + public void setAuditCtime(Timestamp auditCtime) { this.auditCtime = auditCtime; } - public String getApplyVersion() { - return applyVersion; - } - public void setApplyVersion(String applyVersion) { this.applyVersion = applyVersion; } diff --git a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java index 1707f8d7e8d467e0a882793cf8329585e055074d..3a2651e22abe1a4b205c181ceb5b416b6648d22b 100644 --- a/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java +++ b/src/main/java/com/pms/ocp/service/impl/ModelClassifyServiceImpl.java @@ -125,7 +125,7 @@ public class ModelClassifyServiceImpl implements ModelClassifyService { if (!result) { return ResponseVO.error(CodeEnum.INSERT_FAIL); } - return ResponseVO.ok(); + return ResponseVO.ok(list); } /**