From cf3fac6f884a439151a32f25c5796872427a4aca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B0=AD=E5=87=AF=E5=87=AF?= Date: Tue, 1 Apr 2025 09:02:15 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9F=AD=E5=89=A7=E6=96=B0=E9=9C=80=E6=B1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ext/controller/ExtSysController.java | 14 ++ .../com/sqx/modules/ext/dao/ExtSysDao.java | 11 +- .../modules/ext/dto/LotteryCountQueryDTO.java | 57 +++++++ .../sqx/modules/ext/dto/LotteryDetailDTO.java | 39 +++++ .../com/sqx/modules/ext/dto/SignInNumDTO.java | 3 +- .../modules/ext/service/ExtSysService.java | 4 + .../ext/service/impl/ExtSysServiceImpl.java | 31 ++-- src/main/resources/application-dev.yml | 144 +++++++++--------- src/main/resources/mapper/ext/ExtSysDao.xml | 96 ++++++++---- 9 files changed, 283 insertions(+), 116 deletions(-) create mode 100644 src/main/java/com/sqx/modules/ext/dto/LotteryCountQueryDTO.java create mode 100644 src/main/java/com/sqx/modules/ext/dto/LotteryDetailDTO.java diff --git a/src/main/java/com/sqx/modules/ext/controller/ExtSysController.java b/src/main/java/com/sqx/modules/ext/controller/ExtSysController.java index 8aa33b54..20628501 100644 --- a/src/main/java/com/sqx/modules/ext/controller/ExtSysController.java +++ b/src/main/java/com/sqx/modules/ext/controller/ExtSysController.java @@ -71,4 +71,18 @@ public class ExtSysController { PageUtils data = extSysService.queryInviteAwardDetailRecord(page, limit, Convert.toLong(userId)); return Result.success().put("data", data); } + + @GetMapping("/lottery/count/query/page") + @ApiOperation("抽奖次数查询-分页") + public Result getLotteryCountQueryPage(Integer page, Integer limit, String keywords) { + PageUtils data = extSysService.queryLotteryCountPage(page, limit, keywords); + return Result.success().put("data", data); + } + + @GetMapping("/lottery/detail/page") + @ApiOperation("抽奖详情查询-分页") + public Result getLotteryDetailPage(Integer page, Integer limit, String userId) { + PageUtils data = extSysService.queryLotteryDetailPage(page, limit, Convert.toLong(userId)); + return Result.success().put("data", data); + } } diff --git a/src/main/java/com/sqx/modules/ext/dao/ExtSysDao.java b/src/main/java/com/sqx/modules/ext/dao/ExtSysDao.java index 11c261af..2750ec90 100644 --- a/src/main/java/com/sqx/modules/ext/dao/ExtSysDao.java +++ b/src/main/java/com/sqx/modules/ext/dao/ExtSysDao.java @@ -1,8 +1,6 @@ package com.sqx.modules.ext.dao; -import com.sqx.modules.ext.dto.InviteAwardDTO; -import com.sqx.modules.ext.dto.InviteFriendDTO; -import com.sqx.modules.ext.dto.SignInNumDTO; +import com.sqx.modules.ext.dto.*; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -10,6 +8,7 @@ import java.util.List; /** * 扩展系统数据访问层 + * * @author tankaikai * @since 2025-03-28 10:39 */ @@ -20,4 +19,10 @@ public interface ExtSysDao { List findInviteSignInList(@Param("userId") Long userId); List findInviteAwardDetailList(@Param("userId") Long userId); + + List findLotteryCountList(@Param("keywords") String keywords); + + List findLotteryDetailPage(@Param("userId") Long userId); + + } diff --git a/src/main/java/com/sqx/modules/ext/dto/LotteryCountQueryDTO.java b/src/main/java/com/sqx/modules/ext/dto/LotteryCountQueryDTO.java new file mode 100644 index 00000000..706c1ae0 --- /dev/null +++ b/src/main/java/com/sqx/modules/ext/dto/LotteryCountQueryDTO.java @@ -0,0 +1,57 @@ +package com.sqx.modules.ext.dto; + +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; + +/** + * 抽奖次数查询DTO + * + * @author tankaikai + * @since 2025-03-28 10:24 + */ +@Data +public class LotteryCountQueryDTO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 账号ID + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long userId; + /** + * 头像地址 + */ + private String avatar; + /** + * 用户名称 + */ + private String userName; + /** + * 手机号 + */ + private String phone; + /** + * 共解锁 + */ + private Integer unlocked; + /** + * 今日解锁 + */ + private Integer todayUnlocked; + /** + * 共获得抽奖次数 + */ + private Integer totalDrawCount; + /** + * 剩余抽奖次数 + */ + private Integer residueDrawCount; + /** + * 今日抽奖次数 + */ + private Integer todayDrawCount; + +} diff --git a/src/main/java/com/sqx/modules/ext/dto/LotteryDetailDTO.java b/src/main/java/com/sqx/modules/ext/dto/LotteryDetailDTO.java new file mode 100644 index 00000000..35cc9784 --- /dev/null +++ b/src/main/java/com/sqx/modules/ext/dto/LotteryDetailDTO.java @@ -0,0 +1,39 @@ +package com.sqx.modules.ext.dto; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.fasterxml.jackson.databind.annotation.JsonSerialize; +import com.fasterxml.jackson.databind.ser.std.ToStringSerializer; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + +/** + * 抽奖详情DTO类 + * + * @author tankaikai + * @since 2025-03-28 10:24 + */ +@Data +public class LotteryDetailDTO implements Serializable { + + private static final long serialVersionUID = 1L; + /** + * 抽奖id + */ + @JsonSerialize(using = ToStringSerializer.class) + private Long id; + /** + * 用户名称 + */ + private String name; + /** + * 手机号 + */ + private String number; + /** + * 发放时间 + */ + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date createTime; +} diff --git a/src/main/java/com/sqx/modules/ext/dto/SignInNumDTO.java b/src/main/java/com/sqx/modules/ext/dto/SignInNumDTO.java index 535c83ae..09829155 100644 --- a/src/main/java/com/sqx/modules/ext/dto/SignInNumDTO.java +++ b/src/main/java/com/sqx/modules/ext/dto/SignInNumDTO.java @@ -68,6 +68,5 @@ public class SignInNumDTO implements Serializable { /** * 发放时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") - private Date createTime; + private String createTime; } diff --git a/src/main/java/com/sqx/modules/ext/service/ExtSysService.java b/src/main/java/com/sqx/modules/ext/service/ExtSysService.java index 45e118df..be082b1e 100644 --- a/src/main/java/com/sqx/modules/ext/service/ExtSysService.java +++ b/src/main/java/com/sqx/modules/ext/service/ExtSysService.java @@ -19,4 +19,8 @@ public interface ExtSysService { PageUtils queryInviteSignInRecord(Integer page, Integer limit, Long userId); PageUtils queryInviteAwardDetailRecord(Integer page, Integer limit, Long userId); + + PageUtils queryLotteryCountPage(Integer page, Integer limit, String keywords); + + PageUtils queryLotteryDetailPage(Integer page, Integer limit, Long userId); } diff --git a/src/main/java/com/sqx/modules/ext/service/impl/ExtSysServiceImpl.java b/src/main/java/com/sqx/modules/ext/service/impl/ExtSysServiceImpl.java index 63ccfe21..814c2f66 100644 --- a/src/main/java/com/sqx/modules/ext/service/impl/ExtSysServiceImpl.java +++ b/src/main/java/com/sqx/modules/ext/service/impl/ExtSysServiceImpl.java @@ -7,19 +7,12 @@ import cn.hutool.core.util.StrUtil; import com.github.pagehelper.PageHelper; import com.github.pagehelper.PageInfo; import com.sqx.common.utils.PageUtils; -import com.sqx.common.utils.Result; -import com.sqx.modules.app.entity.UserEntity; -import com.sqx.modules.app.entity.VipDetails; import com.sqx.modules.common.dao.CommonInfoDao; import com.sqx.modules.common.entity.CommonInfo; -import com.sqx.modules.common.service.CommonInfoService; import com.sqx.modules.ext.dao.ExtSysDao; -import com.sqx.modules.ext.dto.InviteAwardDTO; -import com.sqx.modules.ext.dto.InviteFriendDTO; -import com.sqx.modules.ext.dto.SignInNumDTO; +import com.sqx.modules.ext.dto.*; import com.sqx.modules.ext.param.InviteFriendConfigParam; import com.sqx.modules.ext.service.ExtSysService; -import com.sqx.modules.utils.TimeCompleteUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,7 +74,7 @@ public class ExtSysServiceImpl implements ExtSysService { @Override public PageUtils queryInviteFriendRecord(Integer page, Integer limit, String keywords) { - PageHelper.startPage(page,limit); + PageHelper.startPage(page, limit); List list = extSysDao.findInviteFriendList(keywords); PageInfo pageInfo = new PageInfo<>(list); return PageUtils.page(pageInfo); @@ -89,7 +82,7 @@ public class ExtSysServiceImpl implements ExtSysService { @Override public PageUtils queryInviteSignInRecord(Integer page, Integer limit, Long userId) { - PageHelper.startPage(page,limit); + PageHelper.startPage(page, limit); List list = extSysDao.findInviteSignInList(userId); PageInfo pageInfo = new PageInfo<>(list); return PageUtils.page(pageInfo); @@ -97,9 +90,25 @@ public class ExtSysServiceImpl implements ExtSysService { @Override public PageUtils queryInviteAwardDetailRecord(Integer page, Integer limit, Long userId) { - PageHelper.startPage(page,limit); + PageHelper.startPage(page, limit); List list = extSysDao.findInviteAwardDetailList(userId); PageInfo pageInfo = new PageInfo<>(list); return PageUtils.page(pageInfo); } + + @Override + public PageUtils queryLotteryCountPage(Integer page, Integer limit, String keywords) { + PageHelper.startPage(page, limit); + List list = extSysDao.findLotteryCountList(keywords); + PageInfo pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo); + } + + @Override + public PageUtils queryLotteryDetailPage(Integer page, Integer limit, Long userId) { + PageHelper.startPage(page, limit); + List list = extSysDao.findLotteryDetailPage(userId); + PageInfo pageInfo = new PageInfo<>(list); + return PageUtils.page(pageInfo); + } } diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml index b5f4816c..95897d4f 100644 --- a/src/main/resources/application-dev.yml +++ b/src/main/resources/application-dev.yml @@ -121,66 +121,66 @@ spring: max-lifetime: ${max-lifetime} connection-timeout: ${connection-timeout} - duanju-slave: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - duanju-slave-0: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - duanju-slave-1: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - duanju-slave-2: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - duanju-slave-3: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} - duanju-slave-4: - driver-class-name: ${driver-class-name} - jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT - username: root - password: 0fd6497c308ccfa8 - minimum-idle: ${minimum-idle} - maximum-pool-size: ${maximum-pool-size} - idle-timeout: ${idle-timeout} - max-lifetime: ${max-lifetime} - connection-timeout: ${connection-timeout} +# duanju-slave: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} +# duanju-slave-0: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-0?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} +# duanju-slave-1: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-1?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} +# duanju-slave-2: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-2?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} +# duanju-slave-3: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-3?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} +# duanju-slave-4: +# driver-class-name: ${driver-class-name} +# jdbc-url: jdbc:mysql://47.122.26.160:3306/duanju-4?useUnicode=true&characterEncoding=utf-8&useSSL=false&serverTimezone=CTT +# username: root +# password: 0fd6497c308ccfa8 +# minimum-idle: ${minimum-idle} +# maximum-pool-size: ${maximum-pool-size} +# idle-timeout: ${idle-timeout} +# max-lifetime: ${max-lifetime} +# connection-timeout: ${connection-timeout} # 数据源配置end # 读写分离配置begin @@ -189,31 +189,31 @@ spring: duanju: masterDataSourceName: duanju slaveDataSourceNames: - # - duanju - - duanju-slave + - duanju + #- duanju-slave duanju-0: masterDataSourceName: duanju-0 slaveDataSourceNames: - # - duanju-0 - - duanju-slave-0 + - duanju-0 + #- duanju-slave-0 duanju-1: masterDataSourceName: duanju-1 slaveDataSourceNames: - # - duanju-1 - - duanju-slave-1 + - duanju-1 + #- duanju-slave-1 duanju-2: masterDataSourceName: duanju-2 slaveDataSourceNames: - # - duanju-2 - - duanju-slave-2 + - duanju-2 + #- duanju-slave-2 duanju-3: masterDataSourceName: duanju-3 slaveDataSourceNames: - # - duanju-3 - - duanju-slave-3 + - duanju-3 + #- duanju-slave-3 duanju-4: masterDataSourceName: duanju-4 slaveDataSourceNames: - # - duanju-4 - - duanju-slave-4 + - duanju-4 + #- duanju-slave-4 diff --git a/src/main/resources/mapper/ext/ExtSysDao.xml b/src/main/resources/mapper/ext/ExtSysDao.xml index 8c8b6c1f..7cdc6418 100644 --- a/src/main/resources/mapper/ext/ExtSysDao.xml +++ b/src/main/resources/mapper/ext/ExtSysDao.xml @@ -4,56 +4,43 @@ + + \ No newline at end of file