diff --git a/base/src/main/java/com/tinyengine/it/model/entity/User.java b/base/src/main/java/com/tinyengine/it/model/entity/User.java index f8238a94..7c26cade 100644 --- a/base/src/main/java/com/tinyengine/it/model/entity/User.java +++ b/base/src/main/java/com/tinyengine/it/model/entity/User.java @@ -12,6 +12,7 @@ package com.tinyengine.it.model.entity; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; import com.tinyengine.it.common.base.BaseEntity; @@ -38,6 +39,7 @@ public class User extends BaseEntity { @Schema(name = "email", description = "邮箱") private String email; + @TableField("enable") @Schema(name = "enable", description = "账号是否可用") private Boolean isEnable; diff --git a/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java b/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java index 4033bb1c..39a8f60f 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java +++ b/base/src/main/java/com/tinyengine/it/service/material/ComponentService.java @@ -13,6 +13,7 @@ package com.tinyengine.it.service.material; import com.tinyengine.it.common.base.Result; +import com.tinyengine.it.model.dto.BundleDto; import com.tinyengine.it.model.dto.BundleResultDto; import com.tinyengine.it.model.dto.CustComponentDto; import com.tinyengine.it.model.dto.FileResult; @@ -92,6 +93,22 @@ public interface ComponentService { */ Result bundleSplit(MultipartFile file); + /** + * 解析bundleDto为component集合 + * + * @param bundleDto bundleDto + * @return BundleResultDto BundleResultDto + */ + Result parseBundle(BundleDto bundleDto); + + /** + * 批量创建/更新组件 + * + * @param componentList componentList + * @return FileResult FileResult + */ + Result bulkCreate(List componentList); + /** * 批量创建component * diff --git a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java index 33b733dd..4e6680f1 100644 --- a/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java +++ b/base/src/main/java/com/tinyengine/it/service/material/impl/ComponentServiceImpl.java @@ -195,7 +195,17 @@ public Result bundleSplit(MultipartFile file) { data = (Map) dataObj; } BundleDto bundleDto = BeanUtil.mapToBean(data, BundleDto.class, true); + return this.parseBundle(bundleDto); + } + /** + * 解析bundleDto为component集合 + * + * @param bundleDto bundleDto + * @return BundleResultDto BundleResultDto + */ + @Override + public Result parseBundle(BundleDto bundleDto) { List> components = bundleDto.getMaterials().getComponents(); List snippets = bundleDto.getMaterials().getSnippets();