From 1e65dd236eea1bb57552bf241d1f167d0be5b3e4 Mon Sep 17 00:00:00 2001 From: b2baccline <23131013+b2baccline@users.noreply.github.com> Date: Fri, 26 Jun 2020 20:54:05 +0800 Subject: [PATCH] =?UTF-8?q?:sparkles:=20=E6=8F=90=E4=BE=9B=E6=A8=A1?= =?UTF-8?q?=E6=9D=BF=E5=B1=9E=E6=80=A7=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=96=B9=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../TemplatePropertyController.java | 13 ++++++++++ .../converter/TemplatePropertyConverter.java | 24 +++++++++++++++++++ .../service/TemplatePropertyService.java | 11 ++++++++- .../impl/TemplatePropertyServiceImpl.java | 16 +++++++++++++ 4 files changed, 63 insertions(+), 1 deletion(-) create mode 100644 ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/converter/TemplatePropertyConverter.java diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java index ee42cb90..f5a7e284 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/controller/TemplatePropertyController.java @@ -13,6 +13,8 @@ import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; import org.springframework.web.bind.annotation.*; +import java.util.List; + /** * 模板属性配置 * @@ -27,6 +29,17 @@ public class TemplatePropertyController { private final TemplatePropertyService templatePropertyService; + /** + * 分页查询 + * @param templateGroupId 模板组ID + * @return R + */ + @ApiOperation(value = "分页查询", notes = "分页查询") + @GetMapping("/list/{groupId}") + public R> getTemplatePropertyList(@PathVariable("groupId") Integer templateGroupId) { + return R.ok(templatePropertyService.list(templateGroupId)); + } + /** * 分页查询 * @param page 分页对象 diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/converter/TemplatePropertyConverter.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/converter/TemplatePropertyConverter.java new file mode 100644 index 00000000..3b0fc62e --- /dev/null +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/model/converter/TemplatePropertyConverter.java @@ -0,0 +1,24 @@ +package com.hccake.ballcat.codegen.model.converter; + +import com.hccake.ballcat.codegen.model.entity.TemplateProperty; +import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; +import org.mapstruct.Mapper; +import org.mapstruct.factory.Mappers; + +/** + * @author Hccake 2020/6/26 + * @version 1.0 + */ +@Mapper +public interface TemplatePropertyConverter { + + TemplatePropertyConverter INSTANCE = Mappers.getMapper(TemplatePropertyConverter.class); + + /** + * po转换为Vo + * @param property 模板属性 + * @return 模板配置VO + */ + TemplatePropertyVO poToVo(TemplateProperty property); + +} diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java index a87a353b..47743c1b 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/TemplatePropertyService.java @@ -3,8 +3,10 @@ package com.hccake.ballcat.codegen.service; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.IService; import com.hccake.ballcat.codegen.model.entity.TemplateProperty; -import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; +import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; + +import java.util.List; /** * 模板属性配置 @@ -22,4 +24,11 @@ public interface TemplatePropertyService extends IService { */ IPage selectPageVo(IPage page, TemplatePropertyQO qo); + /** + * 获取模板组的所有配置 + * @param templateGroupId 模板组ID + * @return List 配置列表 + */ + List list(Integer templateGroupId); + } \ No newline at end of file diff --git a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java index 1b461c1f..b4e4b4a4 100644 --- a/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java +++ b/ballcat-codegen/ballcat-codegen-backend/src/main/java/com/hccake/ballcat/codegen/service/impl/TemplatePropertyServiceImpl.java @@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.hccake.ballcat.codegen.model.converter.TemplatePropertyConverter; import com.hccake.ballcat.codegen.model.entity.TemplateProperty; import com.hccake.ballcat.codegen.model.vo.TemplatePropertyVO; import com.hccake.ballcat.codegen.model.qo.TemplatePropertyQO; @@ -12,6 +13,9 @@ import com.hccake.ballcat.codegen.mapper.TemplatePropertyMapper; import com.hccake.ballcat.codegen.service.TemplatePropertyService; import org.springframework.stereotype.Service; +import java.util.List; +import java.util.stream.Collectors; + /** * 模板属性配置 * @@ -38,4 +42,16 @@ public class TemplatePropertyServiceImpl extends ServiceImpl 配置列表 + */ + @Override + public List list(Integer templateGroupId) { + List templateProperties = baseMapper + .selectList(Wrappers.lambdaQuery().eq(TemplateProperty::getGroupId, templateGroupId)); + return templateProperties.stream().map(TemplatePropertyConverter.INSTANCE::poToVo).collect(Collectors.toList()); + } + }