Merge branch 'preview' into feature/admin

mcwl-admin/src/main/java/com/mcwl/web/controller/resource/SysAdviceController.java

@@ -64,6 +64,16 @@ public class SysAdviceController {
         return R.ok(adviceVo);
     }
 
+    /**
+     * 获取官方通知
+     */
+    @GetMapping("getOfficialMsg")
+    @ApiOperation(value = "获取官方通知")
+    public R<List<AdviceVo>> getOfficialMsg() {
+        List<AdviceVo> adviceVo = sysAdviceService.getOfficialMsg();
+        return R.ok(adviceVo);
+    }
+
 
     /**
      * 获取评论通知

mcwl-common/src/main/java/com/mcwl/common/annotation/RepeatSubmit.java

@@ -22,7 +22,7 @@ public @interface RepeatSubmit
     /**
      * 间隔时间(ms)，小于此时间视为重复提交
      */
-    public int interval() default 5000;
+    public int interval() default 1000;
 
     /**
      * 提示消息

mcwl-resource/src/main/java/com/mcwl/resource/service/ISysAdviceService.java

@@ -32,4 +32,6 @@ public interface ISysAdviceService extends IService<SysAdvice> {
      * 一键已读
      */
     void readAll();
+
+    List<AdviceVo> getOfficialMsg();
 }

mcwl-resource/src/main/java/com/mcwl/resource/service/impl/SysAdviceServiceImpl.java

@@ -253,6 +253,18 @@ public class SysAdviceServiceImpl extends ServiceImpl<SysAdviceMapper, SysAdvice
         }
     }
 
+    @Override
+    public List<AdviceVo> getOfficialMsg() {
+
+        List<SysAdvice> sysAdviceList = baseMapper.selectList(new LambdaQueryWrapper<SysAdvice>()
+                .eq(SysAdvice::getType, AdviceEnum.SYSTEM_NOTICE)
+                .eq(SysAdvice::getReceiverId, SecurityUtils.getUserId()));
+
+
+
+        return BeanUtil.copyToList(sysAdviceList, AdviceVo.class);
+    }
+
     public void postConstruct() {
         Long userId = SecurityUtils.getUserId();