nnnn

ruoyi-admin/src/main/java/com/ruoyi/web/controller/cai/admin/UnreadController.java

@@ -1,8 +1,11 @@
 package com.ruoyi.web.controller.cai.admin;
 
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.cai.dto.admin.vo.unread.UnreadData;
 import com.ruoyi.cai.manager.UnreadManager;
 import com.ruoyi.common.core.domain.R;
+import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.mapper.SysNoticeMapper;
 import lombok.RequiredArgsConstructor;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
@@ -10,6 +13,8 @@ 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;
+
 @Validated
 @RequiredArgsConstructor
 @RestController
@@ -18,6 +23,8 @@ public class UnreadController {
 
     @Autowired
     public UnreadManager unreadManager;
+    @Resource
+    private SysNoticeMapper sysNoticeMapper;
 
     @GetMapping("/data")
     public R<UnreadData> list() {
@@ -31,4 +38,19 @@ public class UnreadController {
         boolean checkCount = unreadManager.checkCount();
         return R.ok(checkCount?1:0);
     }
+
+    @GetMapping("/checkNotice")
+    public R<String> checkNotice() {
+        SysNotice sysNotice = sysNoticeMapper.selectOne(Wrappers.lambdaQuery(SysNotice.class)
+                .eq(SysNotice::getStatus, 0)
+                .eq(SysNotice::getNoticeType, 3)
+                .orderByDesc(SysNotice::getNoticeId)
+                .last("limit 1"));
+        if(sysNotice == null){
+            return R.ok();
+        }
+        R<String> ok = R.ok();
+        ok.setData("最新告警："+sysNotice.getNoticeTitle());
+        return ok;
+    }
 }

ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysNoticeController.java

@@ -1,18 +1,26 @@
 package com.ruoyi.web.controller.system;
 
 import cn.dev33.satoken.annotation.SaCheckPermission;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.PageQuery;
 import com.ruoyi.common.core.domain.R;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.helper.LoginHelper;
 import com.ruoyi.system.domain.SysNotice;
+import com.ruoyi.system.domain.bo.SysNoticeDealData;
+import com.ruoyi.system.mapper.SysNoticeMapper;
 import com.ruoyi.system.service.ISysNoticeService;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 
+import javax.annotation.Resource;
+import java.time.LocalDateTime;
+
 /**
  * 公告 信息操作处理
  *
@@ -65,6 +73,25 @@ public class SysNoticeController extends BaseController {
     public R<Void> edit(@Validated @RequestBody SysNotice notice) {
         return toAjax(noticeService.updateNotice(notice));
     }
+    @Resource
+    private SysNoticeMapper noticeMapper;
+
+    /**
+     * 修改通知公告
+     */
+    @SaCheckPermission("system:notice:edit")
+    @Log(title = "处理公告", businessType = BusinessType.UPDATE)
+    @PostMapping("deal")
+    public R<Void> deal(@Validated @RequestBody SysNoticeDealData notice) {
+        noticeMapper.update(Wrappers.lambdaUpdate(SysNotice.class)
+                .eq(SysNotice::getNoticeId, notice.getNoticeId())
+                .set(SysNotice::getStatus, 1)
+                .set(SysNotice::getRemark, notice.getRemark())
+                .set(SysNotice::getNoticeId, notice.getNoticeId())
+                .set(SysNotice::getDealBy, LoginHelper.getUsername())
+                .set(SysNotice::getDealTime, LocalDateTime.now()));
+        return R.ok();
+    }
 
     /**
      * 删除通知公告