From 43bd6595214dc90be0b2557b45c9799fd6291ce9 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Thu, 14 Aug 2025 10:17:05 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BC=83=E7=94=A8commenResult=E5=88=97?= =?UTF-8?q?=E8=A1=A8=EF=BC=8C=E9=98=B2=E6=AD=A2=E6=97=A5=E6=9C=9F=E6=A0=BC?= =?UTF-8?q?=E5=BC=8F=E8=A2=AB=E8=BD=AC=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mall/common/modules/sns/SnsUserReport.java | 2 +- .../controller/admin/SnsUserReportController.java | 14 ++++++++------ .../mobile/SnsUserReportMobileController.java | 5 +++-- .../mall/sns/service/SnsUserReportService.java | 3 ++- .../sns/service/impl/SnsUserReportServiceImpl.java | 6 ++++-- 5 files changed, 18 insertions(+), 12 deletions(-) diff --git a/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsUserReport.java b/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsUserReport.java index 7687a505..8f5bde7a 100644 --- a/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsUserReport.java +++ b/mall-common/src/main/java/com/suisung/mall/common/modules/sns/SnsUserReport.java @@ -100,7 +100,7 @@ public class SnsUserReport implements Serializable { @TableField(value = "deleted_at",updateStrategy = FieldStrategy.NOT_EMPTY) @ApiModelProperty(value = "逻辑删除时间戳（NULL表示未删除）", example = "2023-01-01T00:00:00") - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss",timezone = "GMT+8") private Date deletedAt; @TableField(value = "created_at", updateStrategy = FieldStrategy.NOT_EMPTY) diff --git a/mall-sns/src/main/java/com/suisung/mall/sns/controller/admin/SnsUserReportController.java b/mall-sns/src/main/java/com/suisung/mall/sns/controller/admin/SnsUserReportController.java index c4b358e5..6aa125b6 100644 --- a/mall-sns/src/main/java/com/suisung/mall/sns/controller/admin/SnsUserReportController.java +++ b/mall-sns/src/main/java/com/suisung/mall/sns/controller/admin/SnsUserReportController.java @@ -1,23 +1,25 @@ package com.suisung.mall.sns.controller.admin; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.sns.SnsUserReport; +import com.suisung.mall.common.service.impl.BaseControllerImpl; import com.suisung.mall.sns.service.SnsUserReportService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import org.springframework.web.multipart.MultipartFile; -import javax.annotation.Resource; import java.util.List; @Api(tags = "社交平台用户举报记录控制器") @RequestMapping("/admin/sns/snsUserReport") -@RestController -public class SnsUserReportController { +@RestController("admin-sns-snsUserReport") +public class SnsUserReportController extends BaseControllerImpl { - @Resource + @Autowired private SnsUserReportService snsUserReportService; /** @@ -29,8 +31,8 @@ public class SnsUserReportController { */ @ApiOperation(value = "举报记录表-分页列表查询", notes = "举报记录表-分页列表查询") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult list(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public Page list(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { return snsUserReportService.findPageSnsUserReport(pageNum, pageSize); } diff --git a/mall-sns/src/main/java/com/suisung/mall/sns/controller/mobile/SnsUserReportMobileController.java b/mall-sns/src/main/java/com/suisung/mall/sns/controller/mobile/SnsUserReportMobileController.java index 8aebf639..6fb2655e 100644 --- a/mall-sns/src/main/java/com/suisung/mall/sns/controller/mobile/SnsUserReportMobileController.java +++ b/mall-sns/src/main/java/com/suisung/mall/sns/controller/mobile/SnsUserReportMobileController.java @@ -1,5 +1,6 @@ package com.suisung.mall.sns.controller.mobile; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.sns.SnsUserReport; import com.suisung.mall.common.service.impl.BaseControllerImpl; @@ -30,8 +31,8 @@ public class SnsUserReportMobileController extends BaseControllerImpl { */ @ApiOperation(value = "举报记录表-分页列表查询", notes = "举报记录表-分页列表查询") @RequestMapping(value = "/list", method = RequestMethod.GET) - public CommonResult list(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, - @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { + public Page list(@RequestParam(name = "pageNum", defaultValue = "1") Integer pageNum, + @RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize) { return snsUserReportService.findPageSnsUserReport(pageNum, pageSize); } diff --git a/mall-sns/src/main/java/com/suisung/mall/sns/service/SnsUserReportService.java b/mall-sns/src/main/java/com/suisung/mall/sns/service/SnsUserReportService.java index e7880cce..7fbe338c 100644 --- a/mall-sns/src/main/java/com/suisung/mall/sns/service/SnsUserReportService.java +++ b/mall-sns/src/main/java/com/suisung/mall/sns/service/SnsUserReportService.java @@ -1,5 +1,6 @@ package com.suisung.mall.sns.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.suisung.mall.common.api.CommonResult; import com.suisung.mall.common.modules.sns.SnsUserReport; import com.suisung.mall.core.web.service.IBaseService; @@ -16,7 +17,7 @@ import java.util.List; * @since 2022-04-01 */ public interface SnsUserReportService extends IBaseService { - CommonResult findPageSnsUserReport(int pageNo,int pageSize); + Page findPageSnsUserReport(int pageNo, int pageSize); CommonResult submitReport(SnsUserReport snsUserReport, List files); diff --git a/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserReportServiceImpl.java b/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserReportServiceImpl.java index 65709f43..cf331a2d 100644 --- a/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserReportServiceImpl.java +++ b/mall-sns/src/main/java/com/suisung/mall/sns/service/impl/SnsUserReportServiceImpl.java @@ -3,6 +3,7 @@ package com.suisung.mall.sns.service.impl; import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.PhoneUtil; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.google.gson.Gson; import com.google.gson.GsonBuilder; import com.google.gson.reflect.TypeToken; @@ -27,6 +28,7 @@ import java.util.*; @Service +@lombok.extern.slf4j.Slf4j public class SnsUserReportServiceImpl extends BaseServiceImpl implements SnsUserReportService { @Autowired @@ -44,7 +46,7 @@ public class SnsUserReportServiceImpl extends BaseServiceImpl findPageSnsUserReport(int pageNo, int pageSize) { SnsUserReport snsUserReport = new SnsUserReport(); UserDto userDto= ContextUtil.getCurrentUser(); assert userDto != null; @@ -72,7 +74,7 @@ public class SnsUserReportServiceImpl extends BaseServiceImpl queryWrapper = new QueryWrapper<>(snsUserReport); - return CommonResult.success(this.lists(queryWrapper,pageNo,pageSize)); + return this.lists(queryWrapper,pageNo,pageSize); } @Override