diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java index 5c5a876..a11d6f4 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/ModelProduct.java @@ -47,10 +47,10 @@ public class ModelProduct extends BaseEntity { @ApiModelProperty(value = "用户id") private Long userId; /** - * 模型类型ID + * 模型类型 */ - @ApiModelProperty(value = "模型类型ID") - private Long modelTypeId; + @ApiModelProperty(value = "模型类型") + private Long modelType; /** * 垂类 */ diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelVo.java b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelVo.java index 6d13a6b..36c9031 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelVo.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/domain/vo/ModelVo.java @@ -10,13 +10,18 @@ public class ModelVo { /** * 模型id */ - @ApiModelProperty(value = "模型id", required = true) + @ApiModelProperty(value = "模型id") private Long id; /** * 模型名称 */ - @ApiModelProperty(value = "模型名称", required = true) + @ApiModelProperty(value = "模型名称") private String modelName; + /** + * 模型类型 + */ + @ApiModelProperty(value = "模型类型") + private String modelType; /** * 封面图 */ diff --git a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java index 2028325..1fed1ef 100644 --- a/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java +++ b/mcwl-resource/src/main/java/com/mcwl/resource/service/impl/ModelServiceImpl.java @@ -155,6 +155,13 @@ public class ModelServiceImpl extends ServiceImpl impl for (ModelProduct modelImage : modelImageList) { ModelVo modelVo = new ModelVo(); BeanUtil.copyProperties(modelImage, modelVo); + + // 设置模型类型 + if (Objects.nonNull(modelImage.getModelType())) { + String modelTypeName = DictInit.getDictValue(DictConstants.MODEL_CATEGORY, modelImage.getModelType().toString()); + modelVo.setModelType(modelTypeName); + } + // 获取用户信息 SysUser sysUser = sysUserService.selectUserById(modelImage.getUserId()); if (Objects.isNull(sysUser)) {