From 9fe7ed4ef6451b933289ec7b3f48111b3f4b2e70 Mon Sep 17 00:00:00 2001 From: liyj <1617420630@qq.com> Date: Fri, 15 Aug 2025 09:32:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=90=E8=AF=81=E6=9D=90=E6=96=99=E6=94=B9?= =?UTF-8?q?=E4=B8=BA=E7=94=B1c=E7=AB=AF=E6=8F=90=E4=BA=A4=EF=BC=8C?= =?UTF-8?q?=E5=90=8E=E7=AB=AF=E5=8F=AA=E6=8E=A5=E6=94=B6=E5=AD=97=E7=AC=A6?= =?UTF-8?q?=E4=B8=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/SnsUserReportController.java | 4 +- .../mobile/SnsUserReportMobileController.java | 4 +- .../sns/service/SnsUserReportService.java | 2 +- .../impl/SnsUserReportServiceImpl.java | 73 +++++++++++-------- 4 files changed, 47 insertions(+), 36 deletions(-) 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 6aa125b6..a6588635 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 @@ -45,8 +45,8 @@ public class SnsUserReportController extends BaseControllerImpl { */ @ApiOperation(value = "举报记录表-举报提交", notes = "举报记录表-举报提交") @RequestMapping(value = "/submitReport", method = RequestMethod.POST) - public CommonResult submitReport(@Validated @RequestParam("snsUserReport") SnsUserReport snsUserReport,@RequestParam("files") List files) { - return snsUserReportService.submitReport(snsUserReport,files); + public CommonResult submitReport(@Validated @RequestBody SnsUserReport snsUserReport) { + return snsUserReportService.submitReport(snsUserReport); } /** 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 6fb2655e..36deb2da 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 @@ -45,8 +45,8 @@ public class SnsUserReportMobileController extends BaseControllerImpl { */ @ApiOperation(value = "举报记录表-举报提交", notes = "举报记录表-举报提交") @RequestMapping(value = "/submitReport", method = RequestMethod.POST) - public CommonResult submitReport(@Validated @RequestParam("snsUserReport") SnsUserReport snsUserReport,@RequestParam("files") List files) { - return snsUserReportService.submitReport(snsUserReport,files); + public CommonResult submitReport(@Validated @RequestBody SnsUserReport snsUserReport) { + return snsUserReportService.submitReport(snsUserReport); } 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 7fbe338c..54741644 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 @@ -19,7 +19,7 @@ import java.util.List; public interface SnsUserReportService extends IBaseService { Page findPageSnsUserReport(int pageNo, int pageSize); - CommonResult submitReport(SnsUserReport snsUserReport, List files); + CommonResult submitReport(SnsUserReport snsUserReport); CommonResult dealReport(SnsUserReport snsUserReport); } 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 849a9539..c897ff14 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 @@ -90,41 +90,51 @@ public class SnsUserReportServiceImpl extends BaseServiceImpl files) { + public CommonResult submitReport(SnsUserReport snsUserReport) { - if(files.isEmpty()){ +// if(files.isEmpty()){ +// return CommonResult.failed("举报佐证材料不能为空"); +// } + +// if(files.size()>limtFiels){ +// return CommonResult.failed("文件数量不能超过3个"); +// } + // List reportImageDatas = new ArrayList<>(); +// int i=1;//佐证材料编号 +// for(MultipartFile file:files){ +// int index=0; +// while (index<3){ +// try { +// CommonResult commonResult= shopService.uploadFile(file); +// Map data = (Map) commonResult.getData(); +// ReportImageData reportImageData=new ReportImageData(); +// if(ObjectUtil.isNotEmpty(data.get("url"))){ +// reportImageData.setUrl(String.valueOf(data.get("url"))); +// reportImageData.setDescription("举报佐证材料"+i); +// reportImageDatas.add(reportImageData); +// i++; +// } +// break; +// }catch (Exception e){ +// index++; +// if(index==3){ +// throw new ApiException(e.getMessage()); +// } +// } +// } +// } + //Gson gson = new Gson(); + //String evedenceImageDatas= gson.toJson(reportImageDatas); + + if(StringUtils.isEmpty(snsUserReport.getEvidenceImages())){ return CommonResult.failed("举报佐证材料不能为空"); } - - if(files.size()>limtFiels){ - return CommonResult.failed("文件数量不能超过3个"); + Gson gson=new Gson(); + List reportImageData= gson.fromJson(snsUserReport.getEvidenceImages(), new TypeToken>(){}.getType()); + String evedenceImageDatas= gson.toJson(reportImageData); + if(!checkoutImageUrl(reportImageData)){ + return CommonResult.failed("处理佐证材料格式不正确"); } - List reportImageDatas = new ArrayList<>(); - int i=1;//佐证材料编号 - for(MultipartFile file:files){ - int index=0; - while (index<3){ - try { - CommonResult commonResult= shopService.uploadFile(file); - Map data = (Map) commonResult.getData(); - ReportImageData reportImageData=new ReportImageData(); - if(ObjectUtil.isNotEmpty(data.get("url"))){ - reportImageData.setUrl(String.valueOf(data.get("url"))); - reportImageData.setDescription("举报佐证材料"+i); - reportImageDatas.add(reportImageData); - i++; - } - break; - }catch (Exception e){ - index++; - if(index==3){ - throw new ApiException(e.getMessage()); - } - } - } - } - Gson gson = new Gson(); - String evedenceImageDatas= gson.toJson(reportImageDatas); UserDto userDto= ContextUtil.getCurrentUser(); assert userDto != null; @@ -251,6 +261,7 @@ public class SnsUserReportServiceImpl extends BaseServiceImpl