diff --git a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java index 4b391120..41413d35 100644 --- a/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java +++ b/renren-admin/src/main/java/io/renren/common/controller/ResourceMountController.java @@ -94,6 +94,11 @@ public class ResourceMountController { tResourceMountApplyDTO.setParameterContentMd5(SecureUtil.md5(JSONObject.toJSONString(index))); tResourceMountApplyDTO.setResourceDTO(index); tResourceMountApplyDTO.setEnclosure(index.getEnclosure()); + try { + tResourceMountApplyDTO.setResourceId(tResourceMountApplyDTO.getResourceDTO().getId()); + } catch (Exception e) { + logger.error("", e); + } ValidatorUtils.validateEntity(tResourceMountApplyDTO, AddGroup.class, DefaultGroup.class); tResourceMountApplyService.save(tResourceMountApplyDTO); // 保存单条资源申请记录 diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceBatchMountApplyDTO.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceBatchMountApplyDTO.java index 2eda4f14..5bf7abfb 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceBatchMountApplyDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceBatchMountApplyDTO.java @@ -37,4 +37,7 @@ public class TResourceBatchMountApplyDTO extends AuditingBaseDTO implements Seri @ApiModelProperty(value = "附件") private String enclosure; + @ApiModelProperty(value = "附件") + private List resourceIds; + } diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java index 0a4a1f4d..0a700ac9 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/dto/TResourceMountApplyDTO.java @@ -44,6 +44,9 @@ public class TResourceMountApplyDTO extends AuditingBaseDTO implements Serializa @ApiModelProperty(value = "附件") private String enclosure; + @ApiModelProperty(value = "资源id") + private Long resourceId; + public ResourceDTO getResourceDTO() { if (this.parameterContent != null) { return JSON.parseObject(this.parameterContent, ResourceDTO.class); diff --git a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/entity/TResourceMountApplyEntity.java b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/entity/TResourceMountApplyEntity.java index 91d5bd00..45a285e6 100644 --- a/renren-admin/src/main/java/io/renren/modules/resourceMountApply/entity/TResourceMountApplyEntity.java +++ b/renren-admin/src/main/java/io/renren/modules/resourceMountApply/entity/TResourceMountApplyEntity.java @@ -14,47 +14,53 @@ import lombok.EqualsAndHashCode; * @since 3.0 2022-04-24 */ @Data -@EqualsAndHashCode(callSuper=false) +@EqualsAndHashCode(callSuper = false) @TableName("t_resource_mount_apply") public class TResourceMountApplyEntity extends BaseEntity { - private static final long serialVersionUID = 1L; + private static final long serialVersionUID = 1L; - /** - * 上架申请人id - */ - private String userId; - /** - * 上架申请人名字 - */ - private String userName; - /** - * 上架申请人电话 - */ - private String phone; - /** - * 上架申请人部门 - */ - @TableField(fill = FieldFill.INSERT) - private String deptId; - /** - * 流程实例ID - */ - private String instanceId; - /** - * 删除标记:0:正常使用;1:已删除;9:其他 - */ - private String delFlag; - /** - * 参数内容(挂载能力json参数) - */ - private String parameterContent; - /** - * 参数内容 md5 - */ - private String parameterContentMd5; + /** + * 上架申请人id + */ + private String userId; + /** + * 上架申请人名字 + */ + private String userName; + /** + * 上架申请人电话 + */ + private String phone; + /** + * 上架申请人部门 + */ + @TableField(fill = FieldFill.INSERT) + private String deptId; + /** + * 流程实例ID + */ + private String instanceId; + /** + * 删除标记:0:正常使用;1:已删除;9:其他 + */ + private String delFlag; + /** + * 参数内容(挂载能力json参数) + */ + private String parameterContent; + /** + * 参数内容 md5 + */ + private String parameterContentMd5; - /** - * 附件 - */ - private String enclosure; + /** + * 附件 + */ + private String enclosure; + + + /** + * 资源id + */ + private Long resourceId; } \ No newline at end of file