diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java new file mode 100644 index 00000000..221d2560 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/controller/admin/SystemConfigController.java @@ -0,0 +1,41 @@ +package com.ruoyi.cai.controller.admin; + +import com.ruoyi.cai.dto.admin.SystemConfigResponse; +import com.ruoyi.cai.enums.SystemConfigEnum; +import com.ruoyi.cai.manager.SystemConfigManager; +import com.ruoyi.common.core.domain.R; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +@RestController +@RequestMapping("/cai/systemConfig") +public class SystemConfigController { + @Autowired + private SystemConfigManager systemConfigManager; + @GetMapping("/all") + public R> all(){ + List responses = new ArrayList<>(); + Map allSystemConfig = systemConfigManager.getAllSystemConfig(); + SystemConfigEnum[] values = SystemConfigEnum.values(); + for (SystemConfigEnum value : values) { + SystemConfigResponse sys = new SystemConfigResponse(); + sys.setKey(value.getKey()); + sys.setValue(allSystemConfig.getOrDefault(value.getKey(),value.getDefaultValue())); + sys.setDesc(value.getDesc()); + responses.add(sys); + } + return R.ok(responses); + } + + @GetMapping("/update") + public R update(String key,String value){ + systemConfigManager.set(key,value); + return R.ok(true); + } +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/SystemConfigResponse.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/SystemConfigResponse.java new file mode 100644 index 00000000..36f28d67 --- /dev/null +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/admin/SystemConfigResponse.java @@ -0,0 +1,14 @@ +package com.ruoyi.cai.dto.admin; + +import lombok.Data; + +import java.io.Serializable; + +@Data +public class SystemConfigResponse implements Serializable { + + private static final long serialVersionUID = 823337632804304288L; + private String key; + private String desc; + private String value; +} diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java index b0f79d3e..af41f15e 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/dto/app/vo/user/UserListVo.java @@ -9,9 +9,6 @@ import java.time.LocalDateTime; @Data @Schema(description = "用户列表返回") public class UserListVo extends UserBaseVo { - /** - * 最后在线时间 - */ - @Schema(description = "最后在线时间") - private LocalDateTime lastLiveTime; + @Schema(description = "绑定时间") + private LocalDateTime bindTime; } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java index f23ca225..807a7d9c 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/manager/SystemConfigManager.java @@ -98,4 +98,8 @@ public class SystemConfigManager { public void setSystemConfig(SystemConfigEnum systemConfig,String value){ redisTemplate.opsForHash().put(RedisConstant.SYSTEM_CONFIG, systemConfig.name(),value); } + + public void set(String key, String value) { + redisTemplate.opsForHash().put(RedisConstant.SYSTEM_CONFIG, key,value); + } } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java index 22887340..78dae41b 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/mapper/UserInviteMapper.java @@ -18,7 +18,7 @@ public interface UserInviteMapper extends BaseMapper { InviteCountDTO countInviteAndReward(@Param("userId") Long userId); - Page inviteUserPage(@Param("build") Page build, @Param("userId") Long userId); + Page inviteUserPage(@Param("build") Page build, @Param("inviteId") Long inviteId); Page pageAdmin(@Param("build") Page build, @Param("bo") UserInviteAdminVo bo); } diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java index 2739e013..45cbf914 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/UserInviteService.java @@ -20,7 +20,7 @@ public interface UserInviteService extends IService { InviteHomeVo inviteHome(Long userId); - Page inviteUserPage(PageQuery pageQuery, Long userId); + Page inviteUserPage(PageQuery pageQuery, Long inviteId); Page pageAdmin(PageQuery pageQuery, UserInviteAdminVo bo); diff --git a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java index df57b91b..f8d4eef6 100644 --- a/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java +++ b/ruoyi-cai/src/main/java/com/ruoyi/cai/service/impl/UserInviteServiceImpl.java @@ -58,9 +58,12 @@ public class UserInviteServiceImpl extends ServiceImpl inviteUserPage(PageQuery pageQuery, Long userId) { - return baseMapper.inviteUserPage(pageQuery.build(),userId); + public Page inviteUserPage(PageQuery pageQuery, Long inviteId) { + return baseMapper.inviteUserPage(pageQuery.build(),inviteId); } @Override diff --git a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml index c819bb2e..14da1d0b 100644 --- a/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml +++ b/ruoyi-cai/src/main/resources/mapper/cai/UserInviteMapper.xml @@ -11,16 +11,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"