From 8c47a796880249d2b081d70e306c998cd3caf4b2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 01 三月 2024 14:47:36 +0800
Subject: [PATCH] 用户，资讯，短视频
---
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java | 20 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TVideoQuery.java | 16 +
ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml | 22 ++
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVideoMapper.java | 13 +
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVipPurchaseRecordServiceImpl.java | 13 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVipPurchaseRecordMapper.java | 13 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipPurchaseRecordController.java | 30 +++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipConfigController.java | 36 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java | 12 +
ruoyi-system/src/main/resources/mapper/system/TVipPurchaseRecordMapper.xml | 22 ++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TVipPurchaseRecordVO.java | 18 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java | 12 +
ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml | 11 +
ruoyi-system/src/main/java/com/ruoyi/system/service/TVipPurchaseRecordService.java | 9
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVideoController.java | 57 +++++
ruoyi-system/src/main/java/com/ruoyi/system/query/TUserQuery.java | 24 ++
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java | 76 +++++++
ruoyi-system/src/main/resources/mapper/system/TVideoMapper.xml | 14 +
ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java | 37 +++
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVideoServiceImpl.java | 22 ++
ruoyi-system/src/main/java/com/ruoyi/system/vo/TVideoVO.java | 18 +
ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java | 12 +
ruoyi-system/src/main/java/com/ruoyi/system/query/TVipPurchaseRecordQuery.java | 25 ++
ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java | 16 +
ruoyi-system/src/main/java/com/ruoyi/system/service/TVideoService.java | 19 +
ruoyi-system/src/main/java/com/ruoyi/system/domain/TVipPurchaseRecord.java | 2
ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java | 16 +
ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java | 8
30 files changed, 586 insertions(+), 11 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
index aac770f..4a25ef5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBannerController.java
@@ -82,7 +82,7 @@
* banner上下架
*/
@ApiOperation(value = "banner上下架")
- @PostMapping(value = "/upAndDown")
+ @GetMapping(value = "/upAndDown")
public AjaxResult upAndDown(@RequestParam Long id,
@RequestParam Integer status) {
return AjaxResult.success(bannerService.upAndDown(id,status));
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
index b50c4a0..ec4d8f8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TInformationController.java
@@ -1,8 +1,17 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
+import com.ruoyi.system.query.TVipPurchaseRecordQuery;
+import com.ruoyi.system.service.TInformationService;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -12,9 +21,72 @@
* @author xiaochen
* @since 2024-02-29
*/
+@Api(tags = "资讯管理")
@RestController
@RequestMapping("/tInformation")
public class TInformationController {
+ private final TInformationService informationService;
+
+ @Autowired
+ public TInformationController(TInformationService informationService) {
+ this.informationService = informationService;
+ }
+
+ /**
+ * 获取资讯管理分页列表
+ */
+ @ApiOperation(value = "获取资讯管理分页列表")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TInformation>> pageList(@RequestBody TInformationQuery query) {
+ return AjaxResult.success(informationService.pageList(query));
+ }
+
+ /**
+ * 添加资讯
+ */
+ @ApiOperation(value = "添加资讯")
+ @PostMapping(value = "/addInformation")
+ public AjaxResult addInformation(@RequestBody TInformation information) {
+ return AjaxResult.success(informationService.save(information));
+ }
+
+ /**
+ * 修改资讯
+ */
+ @ApiOperation(value = "修改资讯")
+ @PostMapping(value = "/updateInformation")
+ public AjaxResult updateInformation(@RequestBody TInformation information) {
+ return AjaxResult.success(informationService.updateById(information));
+ }
+
+ /**
+ * 获取资讯管理详情
+ */
+ @ApiOperation(value = "获取资讯管理详情")
+ @GetMapping(value = "/getDetailById")
+ public AjaxResult<TInformation> getDetailById(@RequestParam Long id) {
+ return AjaxResult.success(informationService.getById(id));
+ }
+
+ /**
+ * 通过id删除资讯
+ */
+ @ApiOperation(value = "通过id删除资讯")
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult<TInformation> deleteById(@RequestParam Long id) {
+ return AjaxResult.success(informationService.removeById(id));
+ }
+
+ /**
+ * 资讯上下架
+ */
+ @ApiOperation(value = "资讯上下架")
+ @GetMapping(value = "/upAndDown")
+ public AjaxResult upAndDown(@RequestParam Long id,
+ @RequestParam Integer status) {
+ return AjaxResult.success(informationService.upAndDown(id,status));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java
index 31384fe..b7aecf8 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TUserController.java
@@ -1,9 +1,17 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TBanner;
+import com.ruoyi.system.domain.TUser;
+import com.ruoyi.system.query.TBannerQuery;
+import com.ruoyi.system.query.TUserQuery;
+import com.ruoyi.system.service.TUserService;
import io.swagger.annotations.Api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -18,5 +26,30 @@
@RequestMapping("/tUser")
public class TUserController {
+ private final TUserService userService;
+
+ @Autowired
+ public TUserController(TUserService userService) {
+ this.userService = userService;
+ }
+
+ /**
+ * 获取用户分页列表
+ */
+ @ApiOperation(value = "获取用户分页列表")
+ @PostMapping(value = "/userPageList")
+ public AjaxResult<PageInfo<TUser>> userPageList(@RequestBody TUserQuery query) {
+ return AjaxResult.success(userService.userPageList(query));
+ }
+
+ /**
+ * 获取用户详情
+ */
+ @ApiOperation(value = "获取用户详情")
+ @GetMapping(value = "/getUserDetailById")
+ public AjaxResult<TUser> getUserDetailById(@RequestParam Long id) {
+ return AjaxResult.success(userService.getById(id));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVideoController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVideoController.java
index dbf947a..5f33ce2 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVideoController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVideoController.java
@@ -1,8 +1,16 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TVideo;
+import com.ruoyi.system.query.TVideoQuery;
+import com.ruoyi.system.service.TVideoService;
+import com.ruoyi.system.vo.TVideoVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -12,9 +20,54 @@
* @author xiaochen
* @since 2024-02-29
*/
+@Api(tags = "短视频管理")
@RestController
@RequestMapping("/tVideo")
public class TVideoController {
+ private final TVideoService videoService;
+
+ @Autowired
+ public TVideoController(TVideoService videoService) {
+ this.videoService = videoService;
+ }
+
+ /**
+ * 获取短视频管理分页列表
+ */
+ @ApiOperation(value = "获取短视频管理分页列表")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TVideoVO>> pageList(@RequestBody TVideoQuery query) {
+ return AjaxResult.success(videoService.pageList(query));
+ }
+
+ /**
+ * 获取短视频管理详情
+ */
+ @ApiOperation(value = "获取短视频管理详情")
+ @GetMapping(value = "/getDetailById")
+ public AjaxResult<TVideo> getDetailById(@RequestParam Long id) {
+ return AjaxResult.success(videoService.getById(id));
+ }
+
+ /**
+ * 通过id删除短视频
+ */
+ @ApiOperation(value = "通过id删除短视频")
+ @DeleteMapping(value = "/deleteById")
+ public AjaxResult<TVideo> deleteById(@RequestParam Long id) {
+ return AjaxResult.success(videoService.removeById(id));
+ }
+
+ /**
+ * 短视频上下架
+ */
+ @ApiOperation(value = "短视频上下架")
+ @GetMapping(value = "/upAndDown")
+ public AjaxResult upAndDown(@RequestParam Long id,
+ @RequestParam Integer status) {
+ return AjaxResult.success(videoService.upAndDown(id,status));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipConfigController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipConfigController.java
index 51bf9ba..fbb441b 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipConfigController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipConfigController.java
@@ -1,8 +1,14 @@
package com.ruoyi.web.controller.api;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TUser;
+import com.ruoyi.system.domain.TVipConfig;
+import com.ruoyi.system.service.TVipConfigService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
/**
* <p>
@@ -12,9 +18,35 @@
* @author xiaochen
* @since 2024-02-29
*/
+@Api(tags = "会员设置")
@RestController
@RequestMapping("/tVipConfig")
public class TVipConfigController {
+ private final TVipConfigService vipConfigService;
+
+ @Autowired
+ public TVipConfigController(TVipConfigService vipConfigService) {
+ this.vipConfigService = vipConfigService;
+ }
+
+ /**
+ * 获取会员配置
+ */
+ @ApiOperation(value = "获取会员配置")
+ @GetMapping(value = "/getById")
+ public AjaxResult<TVipConfig> getById(@RequestParam Long id) {
+ return AjaxResult.success(vipConfigService.getById(1));
+ }
+
+ /**
+ * 编辑会员配置
+ */
+ @ApiOperation(value = "编辑会员配置")
+ @PostMapping(value = "/updateById")
+ public AjaxResult updateById(@RequestBody TVipConfig vipConfig) {
+ return AjaxResult.success(vipConfigService.updateById(vipConfig));
+ }
+
}
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipPurchaseRecordController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipPurchaseRecordController.java
index 4316e81..f7f134a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipPurchaseRecordController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TVipPurchaseRecordController.java
@@ -1,6 +1,19 @@
package com.ruoyi.web.controller.api;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.system.domain.TUser;
+import com.ruoyi.system.domain.TVipPurchaseRecord;
+import com.ruoyi.system.query.TUserQuery;
+import com.ruoyi.system.query.TVipPurchaseRecordQuery;
+import com.ruoyi.system.service.TVipPurchaseRecordService;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
@@ -12,9 +25,26 @@
* @author xiaochen
* @since 2024-02-29
*/
+@Api(tags = "会员购买记录")
@RestController
@RequestMapping("/tVipPurchaseRecord")
public class TVipPurchaseRecordController {
+ private final TVipPurchaseRecordService vipPurchaseRecordService;
+
+ @Autowired
+ public TVipPurchaseRecordController(TVipPurchaseRecordService vipPurchaseRecordService) {
+ this.vipPurchaseRecordService = vipPurchaseRecordService;
+ }
+
+ /**
+ * 获取会员购买记录分页列表
+ */
+ @ApiOperation(value = "获取会员购买记录分页列表")
+ @PostMapping(value = "/pageList")
+ public AjaxResult<PageInfo<TVipPurchaseRecordVO>> pageList(@RequestBody TVipPurchaseRecordQuery query) {
+ return AjaxResult.success(vipPurchaseRecordService.pageList(query));
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java
index 58e6f87..3595c30 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TUser.java
@@ -97,7 +97,7 @@
@TableField("openId")
private String openId;
- @ApiModelProperty(value = "状态 1=正常 2=冻结")
+ @ApiModelProperty(value = "状态 1=正常 2=冻结 3=已过期")
@TableField("status")
private Integer status;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVipPurchaseRecord.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVipPurchaseRecord.java
index 0b8a079..28a0aa8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVipPurchaseRecord.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/TVipPurchaseRecord.java
@@ -51,7 +51,7 @@
private Double payMoney;
@ApiModelProperty(value = "支付时间")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm",timezone = "GMT+8")
@TableField("payTime")
private LocalDateTime payTime;
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
index c0d78ed..44f2aaf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TInformationMapper.java
@@ -1,8 +1,13 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -15,4 +20,11 @@
@Mapper
public interface TInformationMapper extends BaseMapper<TInformation> {
+ /**
+ * 获取资讯管理分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TInformation> pageList(@Param("query") TInformationQuery query, @Param("pageInfo") PageInfo<TInformation> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java
index c2bbff5..d5baab3 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TUserMapper.java
@@ -1,7 +1,12 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TUser;
+import com.ruoyi.system.query.TUserQuery;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -13,4 +18,11 @@
*/
public interface TUserMapper extends BaseMapper<TUser> {
+ /**
+ * 获取用户分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TUser> userPageList(@Param("query") TUserQuery query, @Param("pageInfo")PageInfo<TUser> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVideoMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVideoMapper.java
index 5d715af..e16afc8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVideoMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVideoMapper.java
@@ -1,8 +1,14 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TVideo;
+import com.ruoyi.system.query.TVideoQuery;
+import com.ruoyi.system.vo.TVideoVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -15,4 +21,11 @@
@Mapper
public interface TVideoMapper extends BaseMapper<TVideo> {
+ /**
+ * 获取短视频管理分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TVideoVO> pageList(@Param("query") TVideoQuery query,@Param("pageInfo") PageInfo<TVideoVO> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVipPurchaseRecordMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVipPurchaseRecordMapper.java
index c965b38..9fc9278 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVipPurchaseRecordMapper.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/TVipPurchaseRecordMapper.java
@@ -1,8 +1,14 @@
package com.ruoyi.system.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TVipPurchaseRecord;
+import com.ruoyi.system.query.TVipPurchaseRecordQuery;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
/**
* <p>
@@ -15,4 +21,11 @@
@Mapper
public interface TVipPurchaseRecordMapper extends BaseMapper<TVipPurchaseRecord> {
+ /**
+ * 获取会员购买记录分页列表
+ * @param query
+ * @param pageInfo
+ * @return
+ */
+ List<TVipPurchaseRecordVO> pageList(@Param("query") TVipPurchaseRecordQuery query, @Param("pageInfo")PageInfo<TVipPurchaseRecordVO> pageInfo);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java
new file mode 100644
index 0000000..dcd224b
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TInformationQuery.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "资讯管理列表query")
+public class TInformationQuery extends BasePage {
+
+ @ApiModelProperty(value = "资讯标题")
+ private String informationTitle;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TUserQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TUserQuery.java
new file mode 100644
index 0000000..89afe7c
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TUserQuery.java
@@ -0,0 +1,24 @@
+package com.ruoyi.system.query;
+
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "用户列表query")
+public class TUserQuery extends BasePage {
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "手机号")
+ private String userPhone;
+
+ @ApiModelProperty(value = "会员类型 1=个人会员 2=企业会员 3=普通用户")
+ private Integer vipType;
+
+ @ApiModelProperty(value = "页面查询 1=用户管理 2=会员管理")
+ private Integer pageType;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TVideoQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TVideoQuery.java
new file mode 100644
index 0000000..8035cc6
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TVideoQuery.java
@@ -0,0 +1,16 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "短视频列表query")
+public class TVideoQuery extends BasePage {
+
+ @ApiModelProperty(value = "视频标题")
+ private String videoTitle;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/query/TVipPurchaseRecordQuery.java b/ruoyi-system/src/main/java/com/ruoyi/system/query/TVipPurchaseRecordQuery.java
new file mode 100644
index 0000000..48c211e
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/query/TVipPurchaseRecordQuery.java
@@ -0,0 +1,25 @@
+package com.ruoyi.system.query;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePage;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "会员购买记录列表query")
+public class TVipPurchaseRecordQuery extends BasePage {
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "手机号")
+ private String userPhone;
+
+ @ApiModelProperty(value = "购买会员类型 1=个人会员 2=企业会员")
+ private Integer vipType;
+
+ @ApiModelProperty(value = "收费类型 1=新会员 2=会员续费")
+ private Integer chargeType;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
index efedb8d..0953a1e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TInformationService.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TInformation;
+import com.ruoyi.system.query.TInformationQuery;
/**
* <p>
@@ -13,4 +15,18 @@
*/
public interface TInformationService extends IService<TInformation> {
+ /**
+ * 获取资讯管理分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TInformation> pageList(TInformationQuery query);
+
+ /**
+ * 资讯上下架
+ * @param id
+ * @param status
+ * @return
+ */
+ int upAndDown(Long id, Integer status);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java
index 41986b6..ee464ae 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TUserService.java
@@ -1,7 +1,9 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TUser;
+import com.ruoyi.system.query.TUserQuery;
/**
* <p>
@@ -13,4 +15,10 @@
*/
public interface TUserService extends IService<TUser> {
+ /**
+ * 获取用户分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TUser> userPageList(TUserQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TVideoService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TVideoService.java
index 463b24c..db5c347 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TVideoService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TVideoService.java
@@ -1,7 +1,12 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.domain.TInformation;
import com.ruoyi.system.domain.TVideo;
+import com.ruoyi.system.query.TInformationQuery;
+import com.ruoyi.system.query.TVideoQuery;
+import com.ruoyi.system.vo.TVideoVO;
/**
* <p>
@@ -13,4 +18,18 @@
*/
public interface TVideoService extends IService<TVideo> {
+ /**
+ * 短视频上下架
+ * @param id
+ * @param status
+ * @return
+ */
+ int upAndDown(Long id, Integer status);
+
+ /**
+ * 获取短视频管理分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TVideoVO> pageList(TVideoQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/TVipPurchaseRecordService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/TVipPurchaseRecordService.java
index f1cca51..963978f 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/TVipPurchaseRecordService.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/TVipPurchaseRecordService.java
@@ -1,7 +1,10 @@
package com.ruoyi.system.service;
import com.baomidou.mybatisplus.extension.service.IService;
+import com.ruoyi.common.basic.PageInfo;
import com.ruoyi.system.domain.TVipPurchaseRecord;
+import com.ruoyi.system.query.TVipPurchaseRecordQuery;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
/**
* <p>
@@ -13,4 +16,10 @@
*/
public interface TVipPurchaseRecordService extends IService<TVipPurchaseRecord> {
+ /**
+ * 获取会员购买记录分页列表
+ * @param query
+ * @return
+ */
+ PageInfo<TVipPurchaseRecordVO> pageList(TVipPurchaseRecordQuery query);
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
index 4d08baf..f3671bf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TInformationServiceImpl.java
@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.domain.TBanner;
import com.ruoyi.system.domain.TInformation;
import com.ruoyi.system.mapper.TInformationMapper;
+import com.ruoyi.system.query.TInformationQuery;
import com.ruoyi.system.service.TInformationService;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +23,18 @@
@Service
public class TInformationServiceImpl extends ServiceImpl<TInformationMapper, TInformation> implements TInformationService {
+ @Override
+ public PageInfo<TInformation> pageList(TInformationQuery query) {
+ PageInfo<TInformation> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TInformation> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public int upAndDown(Long id, Integer status) {
+ TInformation information = this.baseMapper.selectById(id);
+ information.setStatus(status);
+ return this.baseMapper.updateById(information);
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java
index 6a11195..fcdfdd8 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TUserServiceImpl.java
@@ -1,10 +1,15 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.domain.TBanner;
import com.ruoyi.system.domain.TUser;
import com.ruoyi.system.mapper.TUserMapper;
+import com.ruoyi.system.query.TUserQuery;
import com.ruoyi.system.service.TUserService;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +22,11 @@
@Service
public class TUserServiceImpl extends ServiceImpl<TUserMapper, TUser> implements TUserService {
+ @Override
+ public PageInfo<TUser> userPageList(TUserQuery query) {
+ PageInfo<TUser> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TUser> list = this.baseMapper.userPageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVideoServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVideoServiceImpl.java
index 35ea943..055b074 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVideoServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVideoServiceImpl.java
@@ -1,10 +1,17 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.domain.TInformation;
import com.ruoyi.system.domain.TVideo;
import com.ruoyi.system.mapper.TVideoMapper;
+import com.ruoyi.system.query.TInformationQuery;
+import com.ruoyi.system.query.TVideoQuery;
import com.ruoyi.system.service.TVideoService;
+import com.ruoyi.system.vo.TVideoVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +24,19 @@
@Service
public class TVideoServiceImpl extends ServiceImpl<TVideoMapper, TVideo> implements TVideoService {
+ @Override
+ public PageInfo<TVideoVO> pageList(TVideoQuery query) {
+ PageInfo<TVideoVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TVideoVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
+
+ @Override
+ public int upAndDown(Long id, Integer status) {
+ TVideo video = this.baseMapper.selectById(id);
+ video.setStatus(status);
+ return this.baseMapper.updateById(video);
+ }
+
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVipPurchaseRecordServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVipPurchaseRecordServiceImpl.java
index 5eac82f..8707379 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVipPurchaseRecordServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TVipPurchaseRecordServiceImpl.java
@@ -1,10 +1,16 @@
package com.ruoyi.system.service.impl;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.basic.PageInfo;
+import com.ruoyi.system.domain.TUser;
import com.ruoyi.system.domain.TVipPurchaseRecord;
import com.ruoyi.system.mapper.TVipPurchaseRecordMapper;
+import com.ruoyi.system.query.TVipPurchaseRecordQuery;
import com.ruoyi.system.service.TVipPurchaseRecordService;
+import com.ruoyi.system.vo.TVipPurchaseRecordVO;
import org.springframework.stereotype.Service;
+
+import java.util.List;
/**
* <p>
@@ -17,4 +23,11 @@
@Service
public class TVipPurchaseRecordServiceImpl extends ServiceImpl<TVipPurchaseRecordMapper, TVipPurchaseRecord> implements TVipPurchaseRecordService {
+ @Override
+ public PageInfo<TVipPurchaseRecordVO> pageList(TVipPurchaseRecordQuery query) {
+ PageInfo<TVipPurchaseRecordVO> pageInfo = new PageInfo<>(query.getPageNum(), query.getPageSize());
+ List<TVipPurchaseRecordVO> list = this.baseMapper.pageList(query,pageInfo);
+ pageInfo.setRecords(list);
+ return pageInfo;
+ }
}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVideoVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVideoVO.java
new file mode 100644
index 0000000..4cfb744
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVideoVO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.domain.TVideo;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "短视频列表VO")
+public class TVideoVO extends TVideo {
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "手机号")
+ private String userPhone;
+
+}
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVipPurchaseRecordVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVipPurchaseRecordVO.java
new file mode 100644
index 0000000..eba0f84
--- /dev/null
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TVipPurchaseRecordVO.java
@@ -0,0 +1,18 @@
+package com.ruoyi.system.vo;
+
+import com.ruoyi.system.domain.TVipPurchaseRecord;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+@Data
+@ApiModel(value = "会员购买记录列表VO")
+public class TVipPurchaseRecordVO extends TVipPurchaseRecord {
+
+ @ApiModelProperty(value = "用户名称")
+ private String userName;
+
+ @ApiModelProperty(value = "手机号")
+ private String userPhone;
+
+}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
index 0bb7bcb..7a7c3a3 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TInformationMapper.xml
@@ -22,5 +22,16 @@
<sql id="Base_Column_List">
id, informationTitle, informationCover, detailPicture, informationContent, status, readCount, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.domain.TInformation">
+ SELECT id, informationTitle, informationCover, detailPicture, informationContent, status, readCount, createTime, updateTime, createBy, updateBy, isDelete
+ FROM t_information
+ <where>
+ <if test="query.informationTitle != null and query.informationTitle != ''">
+ AND informationTitle LIKE concat('%',#{query.informationTitle},'%')
+ </if>
+ AND isDelete = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY createTime DESC
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml
index 82735ad..c215d07 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TUserMapper.xml
@@ -36,5 +36,27 @@
<sql id="Base_Column_List">
id, userName, userPhone, vipType, insertTime, graduationInstitution, selfIntroduction, firstVipTime, startTime, endTime, consumptionAmount, provinceName, provinceCode, cityName, cityCode, performerCover, detailPicture, openId, status, auditStatus, auditRemark, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="userPageList" resultType="com.ruoyi.system.domain.TUser">
+ SELECT id, userName, userPhone, vipType, insertTime, graduationInstitution, selfIntroduction, firstVipTime, startTime, endTime,
+ consumptionAmount, provinceName, provinceCode, cityName, cityCode, performerCover, detailPicture, openId, status, auditStatus,
+ auditRemark, createTime, updateTime, createBy, updateBy, isDelete
+ FROM t_user
+ <where>
+ <if test="query.userName != null and query.userName != ''">
+ AND userName LIKE concat('%',#{query.userName},'%')
+ </if>
+ <if test="query.userPhone != null and query.userPhone != ''">
+ AND userPhone LIKE concat('%',#{query.userPhone},'%')
+ </if>
+ <if test="query.vipType != null">
+ AND vipType = #{query.vipType}
+ </if>
+ <if test="query.pageType == 2">
+ AND vipType != 3
+ </if>
+ AND isDelete = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY insertTime DESC
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TVideoMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVideoMapper.xml
index c0119f2..14d3c82 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TVideoMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TVideoMapper.xml
@@ -21,5 +21,19 @@
<sql id="Base_Column_List">
id, userId, videoTitle, videoFile, likeCount, status, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TVideoVO">
+ SELECT tv.id, tv.userId, tv.videoTitle, tv.videoFile, tv.likeCount, tv.status, tv.createTime, tv.updateTime, tv.createBy, tv.updateBy, tv.isDelete,
+ tu.userName,tu.userPhone
+ FROM t_video tv
+ LEFT JOIN t_user tu ON tv.userId = tu.id
+ <where>
+ <if test="query.videoTitle != null and query.videoTitle != ''">
+ AND tv.videoTitle LIKE concat('%',#{query.videoTitle},'%')
+ </if>
+ AND tv.isDelete = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ AND tu.isDelete = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tv.createTime DESC
+ </select>
</mapper>
diff --git a/ruoyi-system/src/main/resources/mapper/system/TVipPurchaseRecordMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TVipPurchaseRecordMapper.xml
index dc7f7de..bfe8ca7 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TVipPurchaseRecordMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TVipPurchaseRecordMapper.xml
@@ -22,5 +22,27 @@
<sql id="Base_Column_List">
id, userId, vipType, chargeType, purchaseCount, payMoney, payTime, createTime, updateTime, createBy, updateBy, isDelete
</sql>
+ <select id="pageList" resultType="com.ruoyi.system.vo.TVipPurchaseRecordVO">
+ SELECT tvpr.id, tvpr.userId, tvpr.vipType, tvpr.chargeType, tvpr.purchaseCount, tvpr.payMoney, tvpr.payTime, tvpr.createTime, tvpr.updateTime, tvpr.createBy,
+ tvpr.updateBy, tvpr.isDelete,tu.userName,tu.userPhone
+ FROM t_vip_purchase_record tvpr
+ LEFT JOIN t_user tu ON tvpr.userId = tu.id
+ <where>
+ <if test="query.userName != null and query.userName != ''">
+ AND tu.userName LIKE concat('%',#{query.userName},'%')
+ </if>
+ <if test="query.userPhone != null and query.userPhone != ''">
+ AND tu.userPhone LIKE concat('%',#{query.userPhone},'%')
+ </if>
+ <if test="query.vipType != null">
+ AND tvpr.vipType = #{query.vipType}
+ </if>
+ <if test="query.chargeType != null">
+ AND tvpr.chargeType = #{query.chargeType}
+ </if>
+ AND tvpr.isDelete = ${@com.ruoyi.common.enums.DisabledEnum@NO.getCode()}
+ </where>
+ ORDER BY tvpr.createTime DESC
+ </select>
</mapper>
--
Gitblit v1.7.1