11
This commit is contained in:
dzc committed
1 parent
58dfd2d76a
commit
6cbeeb7837
9 files changed
+32
-16
No files matched your search
+4
-4
@@ -78,8 +78,8 @@ public class FeedbackController {
|
||||
@Operation(summary = "获得用户反馈分页")
|
||||
@PreAuthorize("@ss.hasPermission('member:feedback:query')")
|
||||
public CommonResult<PageResult<FeedbackRespVO>> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) {
|
||||
PageResult<FeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class));
|
||||
PageResult<FeedbackRespVO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
}
|
||||
|
||||
@GetMapping("/export-excel")
|
||||
@@ -88,9 +88,9 @@ public class FeedbackController {
|
||||
@ApiAccessLog(operateType = EXPORT)
|
||||
public void exportFeedbackExcel(@Valid FeedbackPageReqVO pageReqVO, HttpServletResponse response) throws IOException {
|
||||
pageReqVO.setPageSize(PageParam.PAGE_SIZE_NONE);
|
||||
List<FeedbackDO> list = feedbackService.getFeedbackPage(pageReqVO).getList();
|
||||
List<FeedbackRespVO> list = feedbackService.getFeedbackPage(pageReqVO).getList();
|
||||
// 导出 Excel
|
||||
ExcelUtils.write(response, "用户反馈.xls", "数据", FeedbackRespVO.class, BeanUtils.toBean(list, FeedbackRespVO.class));
|
||||
ExcelUtils.write(response, "用户反馈.xls", "数据", FeedbackRespVO.class, list);
|
||||
}
|
||||
|
||||
}
|
||||
+6
@@ -1,10 +1,13 @@
|
||||
package cn.iocoder.yudao.module.member.controller.admin.feedback.vo;
|
||||
|
||||
import lombok.*;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import io.swagger.v3.oas.annotations.media.Schema;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageParam;
|
||||
import org.springframework.format.annotation.DateTimeFormat;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
|
||||
import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
|
||||
@@ -18,6 +21,9 @@ public class FeedbackPageReqVO extends PageParam {
|
||||
@Schema(description = "用户编号", example = "15139")
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "用户名称")
|
||||
private String memberName;
|
||||
|
||||
@Schema(description = "反馈内容")
|
||||
private String content;
|
||||
|
||||
|
||||
+4
@@ -20,6 +20,10 @@ public class FeedbackRespVO {
|
||||
@ExcelProperty("用户编号")
|
||||
private Long memberId;
|
||||
|
||||
@Schema(description = "用户名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "王五")
|
||||
@ExcelProperty("用户名称")
|
||||
private String memberName;
|
||||
|
||||
@Schema(description = "反馈内容")
|
||||
@ExcelProperty("反馈内容")
|
||||
private String content;
|
||||
|
||||
+2
-2
@@ -48,8 +48,8 @@ public class AppFeedbackController {
|
||||
@Operation(summary = "获得用户反馈分页")
|
||||
public CommonResult<PageResult<FeedbackRespVO>> getFeedbackPage(@Valid FeedbackPageReqVO pageReqVO) {
|
||||
pageReqVO.setMemberId(getLoginUserId());
|
||||
PageResult<FeedbackDO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
|
||||
return success(BeanUtils.toBean(pageResult, FeedbackRespVO.class));
|
||||
PageResult<FeedbackRespVO> pageResult = feedbackService.getFeedbackPage(pageReqVO);
|
||||
return success(pageResult);
|
||||
}
|
||||
|
||||
}
|
||||
+11
-5
@@ -2,10 +2,13 @@ package cn.iocoder.yudao.module.member.dal.mysql.feedback;
|
||||
|
||||
import java.util.*;
|
||||
|
||||
import cn.hutool.core.util.ObjectUtil;
|
||||
import cn.iocoder.yudao.framework.common.pojo.PageResult;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
|
||||
import cn.iocoder.yudao.framework.mybatis.core.query.MPJLambdaWrapperX;
|
||||
import cn.iocoder.yudao.module.member.dal.dataobject.feedback.FeedbackDO;
|
||||
import cn.iocoder.yudao.module.member.dal.dataobject.user.MemberUserDO;
|
||||
import org.apache.ibatis.annotations.Mapper;
|
||||
import cn.iocoder.yudao.module.member.controller.admin.feedback.vo.*;
|
||||
|
||||
@@ -15,11 +18,14 @@ import cn.iocoder.yudao.module.member.controller.admin.feedback.vo.*;
|
||||
@Mapper
|
||||
public interface FeedbackMapper extends BaseMapperX<FeedbackDO> {
|
||||
|
||||
default PageResult<FeedbackDO> selectPage(FeedbackPageReqVO reqVO) {
|
||||
return selectPage(reqVO, new LambdaQueryWrapperX<FeedbackDO>()
|
||||
.eqIfPresent(FeedbackDO::getMemberId, reqVO.getMemberId())
|
||||
.likeIfPresent(FeedbackDO::getContent, reqVO.getContent())
|
||||
.betweenIfPresent(FeedbackDO::getCreateTime, reqVO.getCreateTime())
|
||||
default PageResult<FeedbackRespVO> selectPage(FeedbackPageReqVO reqVO) {
|
||||
return selectJoinPage(reqVO, FeedbackRespVO.class, new MPJLambdaWrapperX<FeedbackDO>()
|
||||
.selectAll(FeedbackDO.class)
|
||||
.selectAs(MemberUserDO::getNickname, FeedbackPageReqVO::getMemberName)
|
||||
.leftJoin(MemberUserDO.class, MemberUserDO::getId, FeedbackDO::getMemberId)
|
||||
.eqIfExists(FeedbackDO::getMemberId, reqVO.getMemberId())
|
||||
.likeIfExists(FeedbackDO::getContent, reqVO.getContent())
|
||||
.between(ObjectUtil.isNotEmpty(reqVO.getCreateTime()), FeedbackDO::getCreateTime, reqVO.getCreateTime()[0], reqVO.getCreateTime()[1])
|
||||
.orderByDesc(FeedbackDO::getId));
|
||||
}
|
||||
|
||||
|
||||
+1
-1
@@ -48,6 +48,6 @@ public interface FeedbackService {
|
||||
* @param pageReqVO 分页查询
|
||||
* @return 用户反馈分页
|
||||
*/
|
||||
PageResult<FeedbackDO> getFeedbackPage(FeedbackPageReqVO pageReqVO);
|
||||
PageResult<FeedbackRespVO> getFeedbackPage(FeedbackPageReqVO pageReqVO);
|
||||
|
||||
}
|
||||
+1
-1
@@ -64,7 +64,7 @@ public class FeedbackServiceImpl implements FeedbackService {
|
||||
}
|
||||
|
||||
@Override
|
||||
public PageResult<FeedbackDO> getFeedbackPage(FeedbackPageReqVO pageReqVO) {
|
||||
public PageResult<FeedbackRespVO> getFeedbackPage(FeedbackPageReqVO pageReqVO) {
|
||||
return feedbackMapper.selectPage(pageReqVO);
|
||||
}
|
||||
|
||||
|
||||
@@ -58,7 +58,7 @@ spring:
|
||||
host: 127.0.0.1 # 地址
|
||||
port: 6379 # 端口
|
||||
database: 7 # 数据库索引
|
||||
password: 8mbsc1fRj # 密码，建议生产环境开启
|
||||
password: 179965 # 密码，建议生产环境开启
|
||||
|
||||
--- #################### 定时任务相关配置 ####################
|
||||
|
||||
|
||||
@@ -3,8 +3,8 @@ spring:
|
||||
name: yudao-server
|
||||
|
||||
profiles:
|
||||
# active: prod
|
||||
active: local
|
||||
active: prod
|
||||
# active: local
|
||||
|
||||
main:
|
||||
allow-circular-references: true # 允许循环依赖，因为项目是三层架构，无法避免这个情况。
|
||||
|
||||
Reference in new issue
Block a user