站内信开发

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyLogController.java

@@ -0,0 +1,54 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.CommonResult;
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.convert.notify.NotifyLogConvert;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.service.notify.NotifyLogService;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import javax.annotation.Resource;
+import javax.validation.Valid;
+
+import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Api(tags = "管理后台 - 站内信发送日志")
+@RestController
+@RequestMapping("/system/notify-log")
+@Validated
+public class NotifyLogController {
+
+    @Resource
+    private NotifyLogService notifyLogService;
+
+    @Resource
+    private AdminUserService userService;
+
+    @GetMapping("/page")
+    @ApiOperation("获得发送站内信日志分页")
+    public CommonResult<PageResult<NotifyLogBaseVO>> getNotifyLogPage(@Valid NotifyLogPageReqVO pageVO) {
+        PageResult<NotifyMessageDO> pageResult = notifyLogService.getNotifyMessageSendPage(pageVO);
+        PageResult<NotifyLogBaseVO> result = NotifyLogConvert.INSTANCE.convertPage(pageResult);
+        result.getList().forEach(v -> {
+            v.setReceiveUserName(userService.getUser(v.getUserId()).getNickname());
+        });
+        return success(result);
+    }
+
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyMessageController.java

@@ -18,15 +18,13 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
-
-import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
 
 import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success;
 import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 
-@Api(tags = "管理后台 - 站内信")
+@Api(tags = "管理后台 - 我的站内信")
 @RestController
 @RequestMapping("/system/notify-message")
 @Validated
@@ -48,8 +46,6 @@ public class NotifyMessageController {
     @ApiOperation("获得站内信分页")
     @PreAuthorize("@ss.hasPermission('system:notify-message:query')")
     public CommonResult<PageResult<NotifyMessageRespVO>> getNotifyMessagePage(@Valid NotifyMessagePageReqVO pageVO) {
-        pageVO.setUserId(getLoginUserId());
-        pageVO.setUserType(UserTypeEnum.ADMIN.getValue());
         PageResult<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessagePage(pageVO);
         return success(NotifyMessageConvert.INSTANCE.convertPage(pageResult));
     }
@@ -59,9 +55,6 @@ public class NotifyMessageController {
     @ApiImplicitParam(name = "size", value = "10", defaultValue = "10", dataTypeClass = Integer.class)
     public CommonResult<List<NotifyMessageRespVO>> getRecentList(@RequestParam(name = "size", defaultValue = "10") Integer size) {
         NotifyMessagePageReqVO reqVO = new NotifyMessagePageReqVO();
-        reqVO.setUserId(getLoginUserId());
-        reqVO.setUserType(UserTypeEnum.ADMIN.getValue());
-
         List<NotifyMessageDO> pageResult = notifyMessageService.getNotifyMessageList(reqVO, size);
         if (CollUtil.isNotEmpty(pageResult)) {
             return success(NotifyMessageConvert.INSTANCE.convertList(pageResult));
@@ -75,19 +68,20 @@ public class NotifyMessageController {
         return success(notifyMessageService.getUnreadNotifyMessageCount(getLoginUserId(), UserTypeEnum.ADMIN.getValue()));
     }
 
-    @GetMapping("/update-list-read")
+    @PutMapping("/update-list-read")
     @ApiOperation("批量标记已读")
     @ApiImplicitParam(name = "ids", value = "编号列表", required = true, example = "1024,2048", dataTypeClass = List.class)
-    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestParam("ids") Collection<Long> ids) {
+    public CommonResult<Boolean> batchUpdateNotifyMessageReadStatus(@RequestBody List<Long> ids) {
         notifyMessageService.batchUpdateNotifyMessageReadStatus(ids, getLoginUserId());
         return success(Boolean.TRUE);
     }
 
-    @GetMapping("/update-all-read")
+    @PutMapping("/update-all-read")
     @ApiOperation("所有未读消息标记已读")
     public CommonResult<Boolean> batchUpdateAllNotifyMessageReadStatus() {
         notifyMessageService.batchUpdateAllNotifyMessageReadStatus(getLoginUserId(), UserTypeEnum.ADMIN.getValue());
         return success(Boolean.TRUE);
     }
 
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/NotifyTemplateController.java

@@ -95,6 +95,6 @@ public class NotifyTemplateController {
     @ApiOperation("发送站内信")
     public CommonResult<Long> sendNotify(@Valid @RequestBody NotifyTemplateSendReqVO sendReqVO) {
         return success(notifySendService.sendSingleNotifyToAdmin(sendReqVO.getUserId(),
-                sendReqVO.getTemplateId(), sendReqVO.getTemplateParams()));
+                sendReqVO.getTemplateCode(), sendReqVO.getTemplateParams()));
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogBaseVO.java

@@ -0,0 +1,44 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+/**
+ * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ */
+@Data
+public class NotifyLogBaseVO {
+
+    @ApiModelProperty(value = "模版编码")
+    private String templateCode;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "内容", required = true)
+    private String content;
+
+    @ApiModelProperty(value = "发送时间", required = true)
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date sendTime;
+
+    @ApiModelProperty(value = "芋艿", required = true)
+    private String receiveUserName;
+
+    @ApiModelProperty(value = "1", required = true)
+    private Long userId;
+
+    @ApiModelProperty(value = "是否已读 false-未读  true-已读")
+    private Boolean readStatus;
+
+    @ApiModelProperty(value = "阅读时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date readTime;
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/log/NotifyLogPageReqVO.java

@@ -0,0 +1,30 @@
+package cn.iocoder.yudao.module.system.controller.admin.notify.vo.log;
+
+import cn.iocoder.yudao.framework.common.pojo.PageParam;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+import lombok.ToString;
+import org.springframework.format.annotation.DateTimeFormat;
+
+import java.util.Date;
+
+import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
+
+@ApiModel("管理后台 - 站内信日志分页 Request VO")
+@Data
+@EqualsAndHashCode(callSuper = true)
+@ToString(callSuper = true)
+public class NotifyLogPageReqVO extends PageParam {
+
+    @ApiModelProperty(value = "模版编码")
+    private String templateCode;
+
+    @ApiModelProperty(value = "标题")
+    private String title;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date[] sendTime;
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageBaseVO.java

@@ -1,39 +1,33 @@
 package cn.iocoder.yudao.module.system.controller.admin.notify.vo.message;
 
-import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
-import cn.iocoder.yudao.framework.common.validation.InEnum;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import org.springframework.format.annotation.DateTimeFormat;
 
-import javax.validation.constraints.NotNull;
 import java.util.Date;
 
 import static cn.iocoder.yudao.framework.common.util.date.DateUtils.FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND;
 
 /**
-* 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
+ * 站内信 Base VO，提供给添加、修改、详细的子 VO 使用
-* 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
+ * 如果子 VO 存在差异的字段，请不要添加到这里，影响 Swagger 文档生成
-*/
+ */
 @Data
 public class NotifyMessageBaseVO {
 
-    @ApiModelProperty(value = "用户编号", required = true)
-    @NotNull(message = "用户编号不能为空")
-    private Long userId;
-
-    @ApiModelProperty(value = "用户类型", required = true)
-    @NotNull(message = "用户类型不能为空")
-    @InEnum(value = UserTypeEnum.class, message = "用户类型必须是 {value}")
-    private Integer userType;
-
     @ApiModelProperty(value = "标题")
     private String title;
 
-    @ApiModelProperty(value = "内容", required = true)
+    @ApiModelProperty(value = "内容")
-    @NotNull(message = "内容不能为空")
     private String content;
 
+    @ApiModelProperty(value = "发送时间")
+    @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
+    private Date sendTime;
+
+    @ApiModelProperty(value = "芋艿")
+    private String sendUserName;
+
     @ApiModelProperty(value = "是否已读 false-未读  true-已读")
     private Boolean readStatus;
 

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessagePageReqVO.java

@@ -28,11 +28,4 @@ public class NotifyMessagePageReqVO extends PageParam {
     @DateTimeFormat(pattern = FORMAT_YEAR_MONTH_DAY_HOUR_MINUTE_SECOND)
     private Date[] createTime;
 
-    // TODO 芋艿：去掉 userId 和 userType，不要在 VO 里
-
-    @ApiModelProperty(value = "用户编号", hidden = true)
-    private Long userId;
-
-    @ApiModelProperty(value = "用户类型", hidden = true)
-    private Integer userType;
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/message/NotifyMessageRespVO.java

@@ -13,7 +13,4 @@ public class NotifyMessageRespVO extends NotifyMessageBaseVO {
     @ApiModelProperty(value = "ID", required = true)
     private Long id;
 
-    @ApiModelProperty(value = "创建时间", required = true)
-    private Date createTime;
-
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/notify/vo/template/NotifyTemplateSendReqVO.java

@@ -15,9 +15,9 @@ public class NotifyTemplateSendReqVO {
     @NotNull(message = "用户id不能为空")
     private Long userId;
 
-    @ApiModelProperty(value = "模板Id", required = true, example = "01")
+    @ApiModelProperty(value = "模板编码", required = true, example = "01")
-    @NotNull(message = "模板Id不能为空")
+    @NotNull(message = "模板编码不能为空")
-    private Long templateId;
+    private String templateCode;
 
     @ApiModelProperty(value = "模板参数")
     private Map<String, Object> templateParams;

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyLogConvert.java

@@ -0,0 +1,23 @@
+package cn.iocoder.yudao.module.system.convert.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogBaseVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import org.mapstruct.Mapper;
+import org.mapstruct.factory.Mappers;
+
+/**
+ * <p>
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Mapper
+public interface NotifyLogConvert {
+
+    NotifyLogConvert INSTANCE = Mappers.getMapper(NotifyLogConvert.class);
+
+    PageResult<NotifyLogBaseVO> convertPage(PageResult<NotifyMessageDO> page);
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/convert/notify/NotifyMessageConvert.java

@@ -1,13 +1,12 @@
 package cn.iocoder.yudao.module.system.convert.notify;
 
-import java.util.*;
-
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
-
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessageRespVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import org.mapstruct.Mapper;
 import org.mapstruct.factory.Mappers;
-import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+
+import java.util.List;
 
 /**
  * 站内信 Convert
@@ -25,4 +24,5 @@ public interface NotifyMessageConvert {
 
     PageResult<NotifyMessageRespVO> convertPage(PageResult<NotifyMessageDO> page);
 
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/notify/NotifyMessageDO.java

@@ -35,6 +35,12 @@ public class NotifyMessageDO extends BaseDO {
      * 关联 {@link NotifyTemplateDO#getId()}
      */
     private Long templateId;
+    /**
+     * 站内信模版编码
+     *
+     * 关联 {@link NotifyTemplateDO#getCode()}
+     */
+    private String templateCode;
     /**
      * 用户编号
      *
@@ -55,6 +61,18 @@ public class NotifyMessageDO extends BaseDO {
      * 内容
      */
     private String content;
+    /**
+     * 发送时间
+     */
+    private Date sendTime;
+    /**
+     * 发送用户id
+     */
+    private Long sendUserId;
+    /**
+     * 发送用户名
+     */
+    private String sendUserName;
     /**
      * 是否已读
      */

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/notify/NotifyMessageMapper.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.dal.mysql.notify;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.mybatis.core.mapper.BaseMapperX;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
 import cn.iocoder.yudao.module.system.controller.admin.notify.vo.message.NotifyMessagePageReqVO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import org.apache.ibatis.annotations.Mapper;
@@ -17,23 +18,31 @@ import java.util.List;
 @Mapper
 public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
 
-    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO) {
+    default PageResult<NotifyMessageDO> selectPage(NotifyMessagePageReqVO reqVO, Long userId, Integer userType) {
         return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
+                .eq(NotifyMessageDO::getUserId, userId)
-                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .eq(NotifyMessageDO::getUserType, userType)
                 .orderByDesc(NotifyMessageDO::getId));
     }
 
-    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size) {
+    default PageResult<NotifyMessageDO> selectSendPage(NotifyLogPageReqVO reqVO, Long userId) {
+        return selectPage(reqVO, new LambdaQueryWrapperX<NotifyMessageDO>()
+                .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
+                .betweenIfPresent(NotifyMessageDO::getSendTime, reqVO.getSendTime())
+                .eq(NotifyMessageDO::getSendUserId, userId)
+                .orderByDesc(NotifyMessageDO::getId));
+    }
+
+    default List<NotifyMessageDO> selectList(NotifyMessagePageReqVO reqVO, Integer size,  Long userId, Integer userType) {
         return selectList(new LambdaQueryWrapperX<NotifyMessageDO>()
                 .likeIfPresent(NotifyMessageDO::getTitle, reqVO.getTitle())
                 .eqIfPresent(NotifyMessageDO::getReadStatus, reqVO.getReadStatus())
                 .betweenIfPresent(NotifyMessageDO::getCreateTime, reqVO.getCreateTime())
-                .eqIfPresent(NotifyMessageDO::getUserId, reqVO.getUserId())
+                .eqIfPresent(NotifyMessageDO::getUserId, userId)
-                .eqIfPresent(NotifyMessageDO::getUserType, reqVO.getUserType())
+                .eqIfPresent(NotifyMessageDO::getUserType, userType)
                 .orderByDesc(NotifyMessageDO::getId)
                 .last("limit " + size));
     }
@@ -51,4 +60,5 @@ public interface NotifyMessageMapper extends BaseMapperX<NotifyMessageDO> {
                 .eq(NotifyMessageDO::getUserId, userId)
                 .eq(NotifyMessageDO::getUserType, userType));
     }
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogService.java

@@ -0,0 +1,24 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+
+/**
+ * <p>
+ * 站内信日志 Service 接口
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+public interface NotifyLogService {
+
+
+    /**
+     * 获得站内信发送分页
+     *
+     * @param pageReqVO 分页查询
+     * @return 站内信分页
+     */
+    PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO);
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyLogServiceImpl.java

@@ -0,0 +1,35 @@
+package cn.iocoder.yudao.module.system.service.notify;
+
+import cn.iocoder.yudao.framework.common.pojo.PageResult;
+import cn.iocoder.yudao.module.system.controller.admin.notify.vo.log.NotifyLogPageReqVO;
+import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
+import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import org.springframework.stereotype.Service;
+import org.springframework.validation.annotation.Validated;
+
+import javax.annotation.Resource;
+
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
+
+/**
+ * <p>
+ * 站内信日志 Service 实现类
+ *
+ * </p>
+ *
+ * @author LuoWenFeng
+ */
+@Service
+@Validated
+public class NotifyLogServiceImpl implements NotifyLogService {
+
+    @Resource
+    private NotifyMessageMapper notifyMessageMapper;
+
+    @Override
+    public PageResult<NotifyMessageDO> getNotifyMessageSendPage(NotifyLogPageReqVO pageReqVO) {
+        return notifyMessageMapper.selectSendPage(pageReqVO, getLoginUserId());
+    }
+
+
+}

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageService.java

@@ -49,7 +49,7 @@ public interface NotifyMessageService {
     /**
      * 统计用户未读站内信条数
      *
-     * @param userId 用户ID
+     * @param userId   用户ID
      * @param userType 用户类型
      * @return 返回未读站内信条数
      */
@@ -58,7 +58,7 @@ public interface NotifyMessageService {
     /**
      * 修改站内信阅读状态
      *
-     * @param id 站内信编号
+     * @param id     站内信编号
      * @param status 状态
      */
     void updateNotifyMessageReadStatus(Long id, Boolean status);
@@ -66,7 +66,7 @@ public interface NotifyMessageService {
     /**
      * 批量修改站内信阅读状态
      *
-     * @param ids 站内信编号集合
+     * @param ids    站内信编号集合
      * @param userId 用户ID
      */
     void batchUpdateNotifyMessageReadStatus(Collection<Long> ids, Long userId);
@@ -74,8 +74,9 @@ public interface NotifyMessageService {
     /**
      * 批量修改用户所有未读消息标记已读
      *
-     * @param userId 用户ID
+     * @param userId   用户ID
      * @param userType 用户类型
      */
     void batchUpdateAllNotifyMessageReadStatus(Long userId, Integer userType);
+
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyMessageServiceImpl.java

@@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.service.notify;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.NumberUtil;
 import cn.iocoder.yudao.framework.common.core.KeyValue;
+import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
 import cn.iocoder.yudao.framework.common.util.collection.CollectionUtils;
 import cn.iocoder.yudao.framework.mybatis.core.query.LambdaQueryWrapperX;
@@ -16,11 +17,13 @@ import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.*;
 
 /**
@@ -86,12 +89,12 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
 
     @Override
     public List<NotifyMessageDO> getNotifyMessageList(NotifyMessagePageReqVO pageReqVO, Integer size) {
-        return notifyMessageMapper.selectList(pageReqVO, size);
+        return notifyMessageMapper.selectList(pageReqVO, size, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
     }
 
     @Override
     public PageResult<NotifyMessageDO> getNotifyMessagePage(NotifyMessagePageReqVO pageReqVO) {
-        return notifyMessageMapper.selectPage(pageReqVO);
+        return notifyMessageMapper.selectPage(pageReqVO, getLoginUserId(), UserTypeEnum.ADMIN.getValue());
     }
 
     /**
@@ -160,9 +163,15 @@ public class NotifyMessageServiceImpl implements NotifyMessageService {
         }
     }
 
+
+    /**
+     * 批量修改阅读状态为已读
+     * @param ids
+     */
     private void batchUpdateReadStatus(Collection<Long> ids) {
         NotifyMessageDO updateObj = new NotifyMessageDO();
-        updateObj.setReadStatus(false);
+        updateObj.setReadStatus(true);
+        updateObj.setReadTime(new Date());
         notifyMessageMapper.update(updateObj, new LambdaQueryWrapperX<NotifyMessageDO>().in(NotifyMessageDO::getId, ids));
     }
 }

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendService.java

@@ -12,36 +12,36 @@ public interface NotifySendService {
      * 在 mobile 为空时，使用 userId 加载对应管理员的手机号
      *
      * @param userId 用户编号
-     * @param templateId 短信模板编号
+     * @param templateCode 短信模板编号
      * @param templateParams 短信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotifyToAdmin(Long userId,
-                                 Long templateId, Map<String, Object> templateParams);
+                                 String templateCode, Map<String, Object> templateParams);
     /**
      * 发送单条站内信给用户 APP 的用户
      *
      * 在 mobile 为空时，使用 userId 加载对应会员的手机号
      *
      * @param userId 用户编号
-     * @param templateId 站内信模板编号
+     * @param templateCode 站内信模板编号
      * @param templateParams 站内信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotifyToMember(Long userId,
-                                  Long templateId, Map<String, Object> templateParams);
+                                  String templateCode, Map<String, Object> templateParams);
 
     /**
      * 发送单条站内信给用户
      *
      * @param userId 用户编号
      * @param userType 用户类型
-     * @param templateId 站内信模板编号
+     * @param templateCode 站内信模板编号
      * @param templateParams 站内信模板参数
      * @return 发送日志编号
      */
     Long sendSingleNotify( Long userId, Integer userType,
-                           Long templateId, Map<String, Object> templateParams);
+                           String templateCode, Map<String, Object> templateParams);
 
     default void sendBatchNotify(List<String> mobiles, List<Long> userIds, Integer userType,
                               String templateCode, Map<String, Object> templateParams) {

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifySendServiceImpl.java

@@ -3,7 +3,9 @@ package cn.iocoder.yudao.module.system.service.notify;
 import cn.iocoder.yudao.framework.common.enums.UserTypeEnum;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyMessageDO;
 import cn.iocoder.yudao.module.system.dal.dataobject.notify.NotifyTemplateDO;
+import cn.iocoder.yudao.module.system.dal.dataobject.user.AdminUserDO;
 import cn.iocoder.yudao.module.system.dal.mysql.notify.NotifyMessageMapper;
+import cn.iocoder.yudao.module.system.service.user.AdminUserService;
 import com.google.common.annotations.VisibleForTesting;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -14,6 +16,7 @@ import java.util.Date;
 import java.util.Map;
 
 import static cn.iocoder.yudao.framework.common.exception.util.ServiceExceptionUtil.exception;
+import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId;
 import static cn.iocoder.yudao.module.system.enums.ErrorCodeConstants.NOTICE_NOT_FOUND;
 
 /**
@@ -32,41 +35,48 @@ public class NotifySendServiceImpl implements NotifySendService {
     @Resource
     private NotifyMessageMapper notifyMessageMapper;
 
-    @Override
+    @Resource
-    public Long sendSingleNotifyToAdmin(Long userId, Long templateId, Map<String, Object> templateParams) {
+    private AdminUserService userService;
 
-        return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateId, templateParams);
+    @Override
+    public Long sendSingleNotifyToAdmin(Long userId, String templateCode, Map<String, Object> templateParams) {
+
+        return sendSingleNotify(userId, UserTypeEnum.ADMIN.getValue(), templateCode, templateParams);
     }
 
     @Override
-    public Long sendSingleNotifyToMember(Long userId, Long templateId, Map<String, Object> templateParams) {
+    public Long sendSingleNotifyToMember(Long userId, String templateCode, Map<String, Object> templateParams) {
-        return sendSingleNotify(userId, UserTypeEnum.MEMBER.getValue(), templateId, templateParams);
+        return sendSingleNotify(userId, UserTypeEnum.MEMBER.getValue(), templateCode, templateParams);
     }
 
     @Override
-    public Long sendSingleNotify(Long userId, Integer userType, Long templateId, Map<String, Object> templateParams) {
+    public Long sendSingleNotify(Long userId, Integer userType, String templateCode, Map<String, Object> templateParams) {
         // 校验短信模板是否合法
-        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateId);
+        NotifyTemplateDO template = this.checkNotifyTemplateValid(templateCode);
         String content = notifyTemplateService.formatNotifyTemplateContent(template.getContent(), templateParams);
+        AdminUserDO sendUser = userService.getUser(getLoginUserId());
 
         // todo 模板状态未开启时的业务
         NotifyMessageDO notifyMessageDO = new NotifyMessageDO();
         notifyMessageDO.setContent(content);
         notifyMessageDO.setTitle(template.getTitle());
         notifyMessageDO.setReadStatus(false);
-        notifyMessageDO.setReadTime(new Date());
+        notifyMessageDO.setTemplateId(template.getId());
-        notifyMessageDO.setTemplateId(templateId);
+        notifyMessageDO.setTemplateCode(templateCode);
         notifyMessageDO.setUserId(userId);
         notifyMessageDO.setUserType(userType);
+        notifyMessageDO.setSendTime(new Date());
+        notifyMessageDO.setSendUserId(sendUser.getId());
+        notifyMessageDO.setSendUserName(sendUser.getUsername());
         notifyMessageMapper.insert(notifyMessageDO);
         return notifyMessageDO.getId();
     }
 
     // 此注解的含义
     @VisibleForTesting
-    public NotifyTemplateDO checkNotifyTemplateValid(Long templateId) {
+    public NotifyTemplateDO checkNotifyTemplateValid(String templateCode) {
         // 获得短信模板。考虑到效率，从缓存中获取
-        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplate(templateId);
+        NotifyTemplateDO template = notifyTemplateService.getNotifyTemplateByCodeFromCache(templateCode);
         // 短信模板不存在
         if (template == null) {
             throw exception(NOTICE_NOT_FOUND);

yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/notify/NotifyTemplateServiceImpl.java

@@ -109,7 +109,7 @@ public class NotifyTemplateServiceImpl implements NotifyTemplateService {
         return notifyTemplateMapper.selectList();
     }
 
-    @Scheduled(fixedDelay = SCHEDULER_PERIOD, initialDelay = SCHEDULER_PERIOD)
+    @Scheduled(fixedDelay = SCHEDULER_PERIOD)
     public void schedulePeriodicRefresh() {
         initLocalCache();
     }

yudao-ui-admin/src/api/system/notify/myNotify.js

@@ -0,0 +1,38 @@
+import request from '@/utils/request'
+
+
+// 获得我的站内信分页
+export function getNotifyMessagePage(query) {
+  return request({
+    url: '/system/notify-message/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 获得单条我的站内信
+export function getNotifyMessage(query) {
+  return request({
+    url: '/system/notify-message/get',
+    method: 'get',
+    params: query
+  })
+}
+
+// 批量标记已读
+export function updateNotifyMessageListRead(data) {
+  return request({
+    url: '/system/notify-message/update-list-read',
+    method: 'put',
+    data: data
+  })
+}
+
+// 所有未读消息标记已读
+export function updateNotifyMessageAllRead(data) {
+  return request({
+    url: '/system/notify-message/update-all-read',
+    method: 'put',
+    data: data
+  })
+}

yudao-ui-admin/src/api/system/notify/notifyLog.js

@@ -0,0 +1,11 @@
+import request from '@/utils/request'
+
+
+// 获得我的站内信分页
+export function getNotifyLogPage(query) {
+  return request({
+    url: '/system/notify-log/page',
+    method: 'get',
+    params: query
+  })
+}

yudao-ui-admin/src/api/system/notify/notifyTemplate.js

@@ -0,0 +1,64 @@
+import request from '@/utils/request'
+
+// 创建站内信模板
+export function createNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/create',
+    method: 'post',
+    data: data
+  })
+}
+
+// 更新站内信模板
+export function updateNotifyTemplate(data) {
+  return request({
+    url: '/system/notify-template/update',
+    method: 'put',
+    data: data
+  })
+}
+
+// 删除站内信模板
+export function deleteNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/delete?id=' + id,
+    method: 'delete'
+  })
+}
+
+// 获得站内信模板
+export function getNotifyTemplate(id) {
+  return request({
+    url: '/system/notify-template/get?id=' + id,
+    method: 'get'
+  })
+}
+
+// 获得站内信模板分页
+export function getNotifyTemplatePage(query) {
+  return request({
+    url: '/system/notify-template/page',
+    method: 'get',
+    params: query
+  })
+}
+
+// 创建站内信模板
+export function sendNotify(data) {
+  return request({
+    url: '/system/notify-template/send-notify',
+    method: 'post',
+    data: data
+  })
+}
+
+// 导出站内信模板 Excel
+export function exportNotifyTemplateExcel(query) {
+  return request({
+    url: '/system/notify-template/export-excel',
+    method: 'get',
+    params: query,
+    responseType: 'blob'
+  })
+}
+

yudao-ui-admin/src/utils/dict.js

@@ -24,6 +24,7 @@ export const DICT_TYPE = {
   SYSTEM_SMS_RECEIVE_STATUS: 'system_sms_receive_status',
   SYSTEM_ERROR_CODE_TYPE: 'system_error_code_type',
   SYSTEM_OAUTH2_GRANT_TYPE: 'system_oauth2_grant_type',
+  SYSTEM_NOTIFY_READ_STATUS: "system_notify_read_status",
 
   // ========== INFRA 模块 ==========
   INFRA_BOOLEAN_STRING: 'infra_boolean_string',

yudao-ui-admin/src/views/system/notify/myNotify.vue

@@ -0,0 +1,143 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="读取状态" prop="readStatus">
+        <el-select v-model="queryParams.readStatus" placeholder="请选择状态" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleUpdateList">标记已读</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleUpdateAll">全部已读</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" ref="tables" :data="list">
+      <el-table-column type="selection" width="55" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="发送人" align="center" prop="sendUserName" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="读取状态" align="center" prop="readStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button v-show="!scope.row.readStatus" size="mini" type="text" icon="el-icon-check" @click="handleUpdateSingle(scope.row)">已读</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { getNotifyMessagePage, updateNotifyMessageListRead, updateNotifyMessageAllRead} from "@/api/system/notify/myNotify";
+
+export default {
+  name: "myNotify",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 我的站内信列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        readStatus: null,
+        code: null,
+        title: null,
+        createTime: []
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyMessagePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    handleUpdateList(){
+      let list = this.$refs["tables"].selection;
+      if(list.length != 0){
+        this.handleUpdate(list.map(v=>v.id))
+      }
+    },
+    handleUpdateSingle(row){
+      this.handleUpdate([row.id])
+    },
+    handleUpdate(ids){
+      updateNotifyMessageListRead(ids).then(response => {
+        this.$modal.msgSuccess("修改成功");
+            this.getList();
+      });
+    },
+    handleUpdateAll(){
+      updateNotifyMessageAllRead().then(response => {
+        this.$modal.msgSuccess("修改成功");
+            this.getList();
+      });
+    }
+  }
+}
+</script>

yudao-ui-admin/src/views/system/notify/notifyLog.vue

@@ -0,0 +1,120 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板编码" prop="templateCode">
+        <el-input v-model="queryParams.templateCode" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="发送时间" prop="sendTime">
+        <el-date-picker v-model="queryParams.sendTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <!-- <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:notify-log:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row> -->
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="templateCode" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="阅读状态" align="center" prop="readStatus">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.SYSTEM_NOTIFY_READ_STATUS" :value="scope.row.readStatus"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="接收人" align="center" prop="receiveUserName" />
+      <el-table-column label="发送时间" align="center" prop="sendTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.sendTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="阅读时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.readTime) }}</span>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+  </div>
+</template>
+
+<script>
+import { getNotifyLogPage} from "@/api/system/notify/notifyLog";
+
+export default {
+  name: "notifyLog",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 我的站内信列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        templateCode: null,
+        title: null,
+        sendTime: []
+      },
+    };
+  },
+  created() {
+    this.getList();
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyLogPage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+  }
+}
+</script>
+
+<style>
+
+</style>

yudao-ui-admin/src/views/system/notify/notifyTemplate.vue

@@ -0,0 +1,339 @@
+<template>
+  <div class="app-container">
+    <!-- 搜索工作栏 -->
+    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="150px">
+      <el-form-item label="模板编码" prop="code">
+        <el-input v-model="queryParams.code" placeholder="请输入模板编码" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="模板标题" prop="title">
+        <el-input v-model="queryParams.title" placeholder="请输入模板标题" clearable @keyup.enter.native="handleQuery"/>
+      </el-form-item>
+      <el-form-item label="开启状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="请选择开启状态" clearable>
+          <el-option v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                     :key="dict.value" :label="dict.label" :value="dict.value"/>
+        </el-select>
+      </el-form-item>
+      <el-form-item label="创建时间" prop="createTime">
+        <el-date-picker v-model="queryParams.createTime" style="width: 240px" value-format="yyyy-MM-dd HH:mm:ss" type="daterange"
+                        range-separator="-" start-placeholder="开始日期" end-placeholder="结束日期" :default-time="['00:00:00', '23:59:59']" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="el-icon-search" @click="handleQuery">搜索</el-button>
+        <el-button icon="el-icon-refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <!-- 操作工具栏 -->
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="el-icon-plus" size="mini" @click="handleAdd"
+                   v-hasPermi="['system:notify-template:create']">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="el-icon-download" size="mini" @click="handleExport" :loading="exportLoading"
+                   v-hasPermi="['system:notify-template:export']">导出</el-button>
+      </el-col>
+      <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <!-- 列表 -->
+    <el-table v-loading="loading" :data="list">
+      <el-table-column label="模板编码" align="center" prop="code" />
+      <el-table-column label="模板标题" align="center" prop="title" />
+      <el-table-column label="模板内容" align="center" prop="content" width="300" />
+      <el-table-column label="开启状态" align="center" prop="status">
+        <template slot-scope="scope">
+          <dict-tag :type="DICT_TYPE.COMMON_STATUS" :value="scope.row.status"/>
+        </template>
+      </el-table-column>
+      <el-table-column label="备注" align="center" prop="remark" />
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template slot-scope="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="150">
+        <template slot-scope="scope">
+          <el-button size="mini" type="text" icon="el-icon-share" @click="handleSendNotify(scope.row)"
+                     v-hasPermi="['system:notify-template:send-notify']">发送</el-button>
+          <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
+                     v-hasPermi="['system:notify-template:update']">修改</el-button>
+          <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row)"
+                     v-hasPermi="['system:notify-template:delete']">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <!-- 分页组件 -->
+    <pagination v-show="total > 0" :total="total" :page.sync="queryParams.pageNo" :limit.sync="queryParams.pageSize"
+                @pagination="getList"/>
+
+    <!-- 对话框(添加 / 修改) -->
+    <el-dialog :title="title" :visible.sync="open" width="500px" append-to-body>
+      <el-form ref="form" :model="form" :rules="rules" label-width="140px">
+        <el-form-item label="模板编号" prop="code">
+          <el-input v-model="form.code" placeholder="请输入模板编号" />
+        </el-form-item>
+        <el-form-item label="模板标题" prop="title">
+          <el-input v-model="form.title" placeholder="请输入标题名称" />
+        </el-form-item>
+        <el-form-item label="模板内容" prop="content">
+          <el-input type="textarea" v-model="form.content" placeholder="请输入模板内容" />
+        </el-form-item>
+        <el-form-item label="开启状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio v-for="dict in this.getDictDatas(DICT_TYPE.COMMON_STATUS)"
+                      :key="dict.value" :label="parseInt(dict.value)">{{dict.label}}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" placeholder="请输入备注" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitForm">确 定</el-button>
+        <el-button @click="cancel">取 消</el-button>
+      </div>
+    </el-dialog>
+
+    <!-- 对话框(发送站内信) -->
+    <el-dialog title="发送站内信" :visible.sync="sendNotifyOpen" width="500px" append-to-body>
+      <el-form ref="sendNotifyForm" :model="sendNotifyForm" :rules="sendNotifyRules" label-width="140px">
+        <el-form-item label="模板内容" prop="content">
+          <el-input v-model="sendNotifyForm.content" type="textarea" placeholder="请输入模板内容" readonly />
+        </el-form-item>
+        <el-form-item label="接收人" prop="userId">
+          <el-select v-model="sendNotifyForm.userId" placeholder="请输入接收人" clearable style="width: 100%">
+            <el-option v-for="item in users" :key="parseInt(item.id)" :label="item.nickname" :value="parseInt(item.id)" />
+          </el-select>
+        </el-form-item>
+        <el-form-item v-for="param in sendNotifyForm.params" :key="param" :label="'参数 {' + param + '}'" :prop="'templateParams.' + param">
+          <el-input v-model="sendNotifyForm.templateParams[param]" :placeholder="'请输入 ' + param + ' 参数'" />
+        </el-form-item>
+      </el-form>
+      <div slot="footer" class="dialog-footer">
+        <el-button type="primary" @click="submitSendNotifyForm">确 定</el-button>
+        <el-button @click="cancelSendNotify">取 消</el-button>
+      </div>
+    </el-dialog>
+
+  </div>
+</template>
+
+<script>
+import { createNotifyTemplate, updateNotifyTemplate, deleteNotifyTemplate, getNotifyTemplate, getNotifyTemplatePage,
+  exportNotifyTemplateExcel, sendNotify } from "@/api/system/notify/notifyTemplate";
+import {listSimpleUsers} from "@/api/system/user";
+
+export default {
+  name: "NotifyTemplate",
+  data() {
+    return {
+      // 遮罩层
+      loading: true,
+      // 导出遮罩层
+      exportLoading: false,
+      // 显示搜索条件
+      showSearch: true,
+      // 总条数
+      total: 0,
+      // 短信模板列表
+      list: [],
+      // 弹出层标题
+      title: "",
+      // 是否显示弹出层
+      open: false,
+      // 查询参数
+      queryParams: {
+        pageNo: 1,
+        pageSize: 10,
+        status: null,
+        code: null,
+        title: null,
+        createTime: []
+      },
+      // 表单参数
+      form: {},
+      // 表单校验
+      rules: {
+        status: [{ required: true, message: "开启状态不能为空", trigger: "blur" }],
+        code: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
+        title: [{ required: true, message: "模板标题不能为空", trigger: "blur" }],
+        content: [{ required: true, message: "模板内容不能为空", trigger: "blur" }],
+        userId: [{ required: true, message: "接收人不能为空", trigger: "blur" }]
+      },
+      // 用户列表
+      users: [],
+      // 发送短信
+      sendNotifyOpen: false,
+      sendNotifyForm: {
+        params: [], // 模板的参数列表
+      },
+      sendNotifyRules: {
+        mobile: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        templateCode: [{ required: true, message: "手机不能为空", trigger: "blur" }],
+        templateParams: { }
+      }
+    };
+  },
+  created() {
+    this.getList();
+    // 获得用户列表
+    listSimpleUsers().then(response => {
+      this.users = response.data;
+    })
+  },
+  methods: {
+    /** 查询列表 */
+    getList() {
+      this.loading = true;
+      // 执行查询
+      getNotifyTemplatePage(this.queryParams).then(response => {
+        this.list = response.data.list;
+        this.total = response.data.total;
+        this.loading = false;
+      });
+    },
+    /** 取消按钮 */
+    cancel() {
+      this.open = false;
+      this.reset();
+    },
+    /** 表单重置 */
+    reset() {
+      this.form = {
+        id: undefined,
+        status: undefined,
+        code: undefined,
+        title: undefined,
+        content: undefined,
+        remark: undefined,
+      };
+      this.resetForm("form");
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNo = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    /** 新增按钮操作 */
+    handleAdd() {
+      this.reset();
+      this.open = true;
+      this.title = "添加站内信模板";
+    },
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      this.reset();
+      const id = row.id;
+      getNotifyTemplate(id).then(response => {
+        this.form = response.data;
+        this.open = true;
+        this.title = "修改站内信模板";
+      });
+    },
+    /** 提交按钮 */
+    submitForm() {
+      this.$refs["form"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 修改的提交
+        if (this.form.id != null) {
+          updateNotifyTemplate(this.form).then(response => {
+            this.$modal.msgSuccess("修改成功");
+            this.open = false;
+            this.getList();
+          });
+          return;
+        }
+        // 添加的提交
+        createNotifyTemplate(this.form).then(response => {
+          this.$modal.msgSuccess("新增成功");
+          this.open = false;
+          this.getList();
+        });
+      });
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const id = row.id;
+      this.$modal.confirm('是否确认删除站内信模板编号为"' + id + '"的数据项?').then(function() {
+        return deleteNotifyTemplate(id);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+      // 处理查询参数
+      let params = {...this.queryParams};
+      params.pageNo = undefined;
+      params.pageSize = undefined;
+      // 执行导出
+      this.$modal.confirm('是否确认导出所有站内信模板数据项?', "警告").then(() => {
+        this.exportLoading = true;
+        return exportNotifyTemplateExcel(params);
+      }).then(response => {
+        this.$download.excel(response, '短信模板.xls');
+        this.exportLoading = false;
+      }).catch(() => {});
+    },
+    /** 发送站内信按钮 */
+    handleSendNotify(row) {
+      this.resetSendNotify(row);
+      // 设置参数
+      this.sendNotifyForm.content = row.content;
+      this.sendNotifyForm.params = row.params;
+      this.sendNotifyForm.templateCode = row.code;
+      this.sendNotifyForm.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = undefined;
+        return obj;
+      }, {});
+      // 根据 row 重置 rules
+      this.sendNotifyRules.templateParams = row.params.reduce(function(obj, item) {
+        obj[item] = { required: true, message: '参数 ' + item + " 不能为空", trigger: "change" };
+        return obj;
+      }, {});
+      // 设置打开
+      this.sendNotifyOpen = true;
+    },
+    /** 重置发送站内信的表单 */
+    resetSendNotify() {
+      // 根据 row 重置表单
+      this.sendNotifyForm = {
+        content: undefined,
+        params: undefined,
+        userId: undefined,
+        templateCode: undefined,
+        templateParams: {}
+      };
+      this.resetForm("sendNotifyForm");
+    },
+    /** 取消发送站内信 */
+    cancelSendNotify() {
+      this.sendNotifyOpen = false;
+      this.resetSendNotify();
+    },
+    /** 提交按钮 */
+    submitSendNotifyForm() {
+      this.$refs["sendNotifyForm"].validate(valid => {
+        if (!valid) {
+          return;
+        }
+        // 添加的提交
+        sendNotify(this.sendNotifyForm).then(response => {
+          this.$modal.msgSuccess("提交发送成功！发送结果，见发送日志编号：" + response.data);
+          this.sendNotifyOpen = false;
+        });
+      });
+    },
+  }
+};
+</script>