From 8757ab1e225a74c13d0d688fc1d757ccea9df1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=AC=A8=E8=9B=8B?= <14958938+qianqiao5-6-7@user.noreply.gitee.com> Date: Thu, 21 Nov 2024 16:18:27 +0800 Subject: [PATCH] 2204-11-20 (DDD 1.0) --- .../com/muyu/common/core/model/QueryModel.java | 10 ++++++---- .../muyu/common/core/web/page/PageDomain.java | 9 +++++++++ .../common/core/web/page/TableDataInfo.java | 1 - .../domain/model/ActivityTeamInfoListModel.java | 6 +++--- .../model/ActivityTeamInfoListQueryModel.java | 2 +- .../marketing/domain/req/TeamInfoListReq.java | 10 ++++++++-- .../controller/ActivityTeamInfoController.java | 17 ++++++++++++++--- .../service/ActivityTeamInfoService.java | 1 - .../impl/ActivityTeamInfoServiceImpl.java | 1 - 9 files changed, 41 insertions(+), 16 deletions(-) diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/model/QueryModel.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/model/QueryModel.java index f9ba7ca..273743d 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/model/QueryModel.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/model/QueryModel.java @@ -6,17 +6,19 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.web.page.PageDomain; import lombok.AllArgsConstructor; import lombok.Data; +import lombok.EqualsAndHashCode; import lombok.NoArgsConstructor; import lombok.experimental.SuperBuilder; import java.util.List; -import java.util.OptionalInt; + @Data @AllArgsConstructor @NoArgsConstructor @SuperBuilder + public class QueryModel { /** * 起始页 @@ -41,7 +43,7 @@ public class QueryModel { /** * 构建模型分页对象 */ - public T domainBuild(PageDomain domain) { + public T domainBuild(PageDomain domain) { this.pageNum=domain.getPageNum(); this.pageSize=domain.getPageSize(); this.orderByColum=domain.getOrderByColumn(); @@ -53,8 +55,8 @@ public class QueryModel { * 构建分页对象 * @return查询分页对象 */ - public Page buildPage(){ - Page page = Page.of(this.getPageNum(), this.getPageSize()); + public Page buildPage(){ + Page page = Page.of(this.getPageNum(), this.getPageSize()); page.setOrders(List.of(this.getIsAec() ? OrderItem.asc(this.getOrderByColum()): OrderItem.desc(this.getOrderByColum()))); return page; } diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java index b9c5e45..b65cea5 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java @@ -1,12 +1,21 @@ package com.muyu.common.core.web.page; import com.muyu.common.core.utils.StringUtils; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * 分页数据 * * @author muyu */ +@Data +@AllArgsConstructor +@NoArgsConstructor +@SuperBuilder public class PageDomain { /** * 当前记录起始索引 diff --git a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java index d677cce..471f134 100644 --- a/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java +++ b/muyu-common/muyu-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.poi.ss.formula.functions.T; import java.io.Serializable; import java.util.List; diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java index 642f8b9..a890460 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListModel.java @@ -3,10 +3,10 @@ package com.muyu.marketing.domain.model; import com.baomidou.mybatisplus.annotation.IdType; import com.baomidou.mybatisplus.annotation.TableId; import com.muyu.common.core.model.QueryModel; -import com.muyu.marketing.domain.ActivityTeamInfo; import lombok.*; import lombok.experimental.SuperBuilder; + import java.sql.Timestamp; /** @@ -15,9 +15,9 @@ import java.sql.Timestamp; @Data @AllArgsConstructor @NoArgsConstructor -@Builder +@SuperBuilder @EqualsAndHashCode(callSuper = true) -public class ActivityTeamInfoListModel extends QueryModel { +public class ActivityTeamInfoListModel extends QueryModel { @TableId(type = IdType.AUTO) /** 主键*/ diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java index efbab7e..511a2d2 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/model/ActivityTeamInfoListQueryModel.java @@ -12,7 +12,7 @@ import lombok.experimental.SuperBuilder; @NoArgsConstructor @SuperBuilder @EqualsAndHashCode(callSuper = true) -public class ActivityTeamInfoListQueryModel extends QueryModel { +public class ActivityTeamInfoListQueryModel extends QueryModel{ /** *活动名查询字段 */ diff --git a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java index 98dea88..940c0da 100644 --- a/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java +++ b/muyu-modules/muyu-marketing/marketing-common/src/main/java/com/muyu/marketing/domain/req/TeamInfoListReq.java @@ -1,6 +1,7 @@ package com.muyu.marketing.domain.req; import com.muyu.common.core.web.page.PageDomain; +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import io.swagger.annotations.ApiModel; import lombok.*; import lombok.experimental.SuperBuilder; @@ -9,10 +10,9 @@ import lombok.experimental.SuperBuilder; * 拼团req */ @Data -@Builder +@SuperBuilder @NoArgsConstructor @AllArgsConstructor -@ApiModel(value = "ActivityTeamInfoListReq", description = "拼团") @EqualsAndHashCode(callSuper = true) public class TeamInfoListReq extends PageDomain { @@ -25,4 +25,10 @@ public class TeamInfoListReq extends PageDomain { */ private String status; + public ActivityTeamInfoListQueryModel buildQueryModel(){ + return ActivityTeamInfoListQueryModel.builder() + .name(this.getName()) + .status(this.getStatus()) + .build(); + } } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java index 5d4a893..ef27c33 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/controller/ActivityTeamInfoController.java @@ -1,9 +1,13 @@ package com.muyu.marketing.controller; + import com.muyu.common.core.domain.Result; import com.muyu.common.core.web.page.TableDataInfo; + +import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; + +import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; import com.muyu.marketing.domain.req.TeamInfoListReq; -import com.muyu.marketing.domain.resp.ActivityTeamInfoListResp; import com.muyu.marketing.service.ActivityTeamInfoService; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; @@ -27,9 +31,16 @@ public class ActivityTeamInfoController { */ @ApiOperation("获取拼团列表") @PostMapping("/list") - public Result> ActivityTeamInfoList(TeamInfoListReq teamInfoListReq){ + public Result> ActivityTeamInfoList(TeamInfoListReq teamInfoListReq){ + ActivityTeamInfoListQueryModel queryModel = ActivityTeamInfoListQueryModel.builder() + .name(teamInfoListReq.getName()) + .status(teamInfoListReq.getStatus()) + .build(); - return Result.success(); + TableDataInfo tableDataInfo = activityTeamInfoService.tabDateInfo(queryModel); + + + return Result.success(tableDataInfo); } diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java index f88f3ac..4a3d22f 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/ActivityTeamInfoService.java @@ -6,7 +6,6 @@ import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; -import java.util.List; /** 拼团*/ diff --git a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java index fb90238..935eb78 100644 --- a/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java +++ b/muyu-modules/muyu-marketing/marketing-server/src/main/java/com/muyu/marketing/service/impl/ActivityTeamInfoServiceImpl.java @@ -8,7 +8,6 @@ import com.muyu.common.core.web.page.TableDataInfo; import com.muyu.marketing.domain.ActivityTeamInfo; import com.muyu.marketing.domain.model.ActivityTeamInfoListModel; import com.muyu.marketing.domain.model.ActivityTeamInfoListQueryModel; -import com.muyu.marketing.domain.resp.ActivityTeamInfoListResp; import com.muyu.marketing.mapper.ActivityTeamInfoMapper; import com.muyu.marketing.service.ActivityTeamInfoService; import org.springframework.beans.factory.annotation.Autowired;