From d9ae55ada906802c0872f704b8b3d8ca959c73e7 Mon Sep 17 00:00:00 2001 From: haotian <2421912570@qq.com> Date: Sun, 27 Apr 2025 15:21:52 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9--=E5=AE=A1=E6=A0=B8=E9=80=9A?= =?UTF-8?q?=E8=BF=87/=E4=B8=8D=E9=80=9A=E8=BF=87=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E9=80=9A=E7=9F=A5=E6=B6=88=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../backstage/SysWorkReviewController.java | 26 ++++++++++++++++--- .../ruoyi/system/mapper/SysSourceMapper.java | 5 ++++ .../system/service/ISysSourceService.java | 6 +++++ .../service/impl/SysSourceServiceImpl.java | 8 ++++++ .../mapper/system/SysSourceMapper.xml | 3 +++ 5 files changed, 45 insertions(+), 3 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java index 25798f23..06ad7540 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/backstage/SysWorkReviewController.java @@ -323,18 +323,38 @@ public class SysWorkReviewController extends BaseController { //------------------------------新建系统消息---------------------------------------- SysUserNotification sysUserNotification = new SysUserNotification(); + + // 作品关联的资源位 + List sysSourceList = sysSourceService.getSysSourceByWorkId(workId); + + // key 为city+scenic, value为资源位part+c_x+c_y集合 + Map> mapSource = new HashMap<>(); + Map mapTime = new HashMap<>(); + + for(SysSource sysSource:sysSourceList){ + List valueList = mapSource.computeIfAbsent(sysSource.getCity()+sysSource.getScenic(), k -> new ArrayList<>()); + // 添加资源位坐标 + String value = sysSource.getPart()+String.format("%2d", sysSource.getcX())+String.format("%2d", sysSource.getcY()); + valueList.add(value); // 直接添加到 List + mapTime.put(sysSource.getCity()+sysSource.getScenic(), sysSource.getStartTime()+"至"+sysSource.getEndTime()); + } + String msg = ""; // 审核通过 if(workStatus.equals("3")){ sysUserNotification.setType("3"); - msg = "作品<<" + userWork.getWorkName() + ">>审核通过"; - + msg = String.format("您的作品<<%s>>已顺利通过审核,", userWork.getWorkName()); + for(String key:mapSource.keySet()){ + msg = msg + String.format("正式发布于%s%s进行展示,", key, String.join("、 ", mapSource.get(key))) + mapTime.get(key) ; + } + msg = msg + String.format("诚邀您前往%s,近距离感受作品的魅力.", String.join("、 ", mapSource.keySet())); + msg = msg + "\n温馨提示:作品审核通过后,建议尽量保持内容原貌,避免二次修改.如需调整,作品将触发重新审核流程.可能影响展示进度与效果.感谢您的理解与配合! "; } // 审核不通过 else if(workStatus.equals("4")){ sysUserNotification.setType("4"); - msg = "作品<<" + userWork.getWorkName() + ">>审核不通过"; + msg = "很遗憾地通知您,您提交的<<" + userWork.getWorkName() + "在审核过程中未能通过,主要原因是内容涉及了不符合平台规定的违法或敏感字样,请重新提交审核"; } else{ return error("请选择审核状态"); diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java index 9785e42d..7ef90f34 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysSourceMapper.java @@ -98,4 +98,9 @@ public interface SysSourceMapper * 根据订单返回资源位坐标 * */ public List getSourceCoordinateByOrderId(@Param("orderId") Long orderId); + + /** + * 根据work_id 返回资源位 + * */ + public List getSysSourceByWorkId(@Param("workId") Long workId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java index 3212ce3d..13267dee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysSourceService.java @@ -111,4 +111,10 @@ public interface ISysSourceService * 根据订单返回资源位坐标 * */ public List getSourceCoordinateByOrderId(Long orderId); + + + /** + * 根据work_id 返回资源位 + * */ + public List getSysSourceByWorkId(Long workId); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java index 83329d7a..cb30f1fa 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSourceServiceImpl.java @@ -159,4 +159,12 @@ public class SysSourceServiceImpl implements ISysSourceService public List getSourceCoordinateByOrderId(Long orderId){ return sysSourceMapper.getSourceCoordinateByOrderId(orderId); } + + /** + * 根据work_id 返回资源位 + * */ + @Override + public List getSysSourceByWorkId(Long workId){ + return sysSourceMapper.getSysSourceByWorkId(workId); + } } diff --git a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml index 89cec784..826c9577 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysSourceMapper.xml @@ -229,6 +229,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" left join sys_source s on oi.source_id = s.source_id where so.order_id = #{orderId} +