wip: 通知公告开发临时提交

通知公告开发临时提交

src/main/java/com/youlai/boot/system/service/UserService.java

@@ -4,6 +4,7 @@ package com.youlai.boot.system.service;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 import com.youlai.boot.common.enums.ContactType;
+import com.youlai.boot.common.model.Option;
 import com.youlai.boot.system.model.dto.UserAuthInfo;
 import com.youlai.boot.system.model.dto.UserExportDTO;
 import com.youlai.boot.system.model.entity.User;
@@ -147,7 +148,14 @@ public interface UserService extends IService<User> {
      * 修改当前用户邮箱
      *
      * @param data 表单数据
-     * @return
+     * @return {@link Boolean} 是否绑定成功
      */
     boolean bindEmail(EmailChangeForm data);
+
+    /**
+     * 获取用户选项列表
+     *
+     * @return {@link List<Option<String>>} 用户选项列表
+     */
+    List<Option<String>> listUserOptions();
 }

src/main/java/com/youlai/boot/system/service/impl/NoticeServiceImpl.java

@@ -12,6 +12,7 @@ import com.youlai.boot.core.security.util.SecurityUtils;
 import com.youlai.boot.platform.websocket.service.WebsocketService;
 import com.youlai.boot.system.converter.NoticeConverter;
 import com.youlai.boot.system.mapper.NoticeMapper;
+import com.youlai.boot.system.model.bo.NoticeBO;
 import com.youlai.boot.system.model.entity.Notice;
 import com.youlai.boot.system.model.entity.NoticeStatus;
 import com.youlai.boot.system.model.entity.User;
@@ -68,10 +69,11 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
      */
     @Override
     public IPage<NoticeVO> getNoticePage(NoticeQuery queryParams) {
-        return this.baseMapper.getNoticePage(
+        Page<NoticeBO> noticePage = this.baseMapper.getNoticePage(
                 new Page<>(queryParams.getPageNum(), queryParams.getPageSize()),
                 queryParams
         );
+        return noticeConverter.toPageVo(noticePage);
     }
 
     /**
@@ -95,6 +97,8 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     @Override
     public boolean saveNotice(NoticeForm formData) {
         Notice entity = noticeConverter.toEntity(formData);
+        entity.setReleaseStatus(0);
+        entity.setCreateBy(SecurityUtils.getUserId());
         if (entity.getTarType() == 1) {
             Assert.notBlank(entity.getTarIds(), "指定用户不能为空");
         }
@@ -111,6 +115,7 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     @Override
     public boolean updateNotice(Long id, NoticeForm formData) {
         Notice entity = noticeConverter.toEntity(formData);
+        entity.setUpdateBy(SecurityUtils.getUserId());
         if (entity.getTarType() == 1) {
             Assert.notBlank(entity.getTarIds(), "指定用户不能为空");
         }
@@ -150,8 +155,9 @@ public class NoticeServiceImpl extends ServiceImpl<NoticeMapper, Notice> impleme
     public boolean releaseNotice(Long id) {
         Notice notice = this.getById(id);
         Assert.notNull(notice, "通知公告不存在");
-        Assert.isTrue(notice.getReleaseStatus() == 0, "通知公告已发布");
+        Assert.isTrue(notice.getReleaseStatus() != 1, "通知公告已发布");
         notice.setReleaseStatus(1);
+        notice.setReleaseBy(SecurityUtils.getUserId());
         notice.setReleaseTime(LocalDateTime.now());
         this.updateById(notice);
         //发布通知公告的同时，需要将通知公告发送给目标用户

src/main/java/com/youlai/boot/system/service/impl/UserServiceImpl.java

@@ -11,6 +11,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.youlai.boot.common.constant.RedisConstants;
 import com.youlai.boot.common.constant.SystemConstants;
 import com.youlai.boot.common.enums.ContactType;
+import com.youlai.boot.common.model.Option;
 import com.youlai.boot.platform.mail.service.MailService;
 import com.youlai.boot.platform.sms.service.SmsService;
 import com.youlai.boot.system.model.entity.User;
@@ -39,6 +40,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.List;
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
@@ -419,4 +421,18 @@ public class UserServiceImpl extends ServiceImpl<UserMapper, User> implements Us
                 .set(User::getEmail, email)
         );
     }
+
+    /**
+     * 获取用户选项列表
+     *
+     * @return {@link List<Option<String>>} 用户选项列表
+     */
+    @Override
+    public List<Option<String>> listUserOptions() {
+        List<User> list = this.list();
+        if (CollectionUtil.isNotEmpty(list)) {
+            return list.stream().map(user -> new Option<>(user.getId().toString(), user.getNickname())).collect(Collectors.toList());
+        }
+        return Collections.emptyList();
+    }
 }