From 47ff4d8018d550a23ca81a964c226ec173326942 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期一, 16 六月 2025 10:37:22 +0800
Subject: [PATCH] 0616-1

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java |   58 ++++++++++++++++++++++++++++++++++++++++++++++++++++------
 1 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java
index cb2232a..8e03e92 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/SysNoticeController.java
@@ -1,9 +1,20 @@
 package com.ltkj.web.controller.system;
 
 import java.util.List;
+import java.util.stream.Collectors;
 
+import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.ltkj.common.core.domain.entity.SysUser;
+import com.ltkj.common.core.domain.model.LoginUser;
+import com.ltkj.common.utils.SecurityUtils;
+import com.ltkj.hosp.domain.SysNoticeUser;
+import com.ltkj.hosp.service.SysNoticeUserService;
+import com.ltkj.system.service.ISysUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.DeleteMapping;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -31,11 +42,15 @@
 public class SysNoticeController extends BaseController {
     @Autowired
     private ISysNoticeService noticeService;
+    @Autowired
+    private SysNoticeUserService sysNoticeUserService;
+    @Autowired
+    private ISysUserService userService;
 
     /**
      * 鑾峰彇閫氱煡鍏憡鍒楄〃
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:list')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:list')")
     @GetMapping("/list")
     public TableDataInfo list(SysNotice notice) {
         startPage();
@@ -46,7 +61,7 @@
     /**
      * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:query')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:query')")
     @GetMapping(value = "/{noticeId}")
     public AjaxResult getInfo(@PathVariable Long noticeId) {
         return success(noticeService.selectNoticeById(noticeId));
@@ -55,18 +70,39 @@
     /**
      * 鏂板閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:add')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:add')")
     @Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
     @PostMapping
+    @Transactional
     public AjaxResult add(@Validated @RequestBody SysNotice notice) {
         notice.setCreateBy(getUsername());
-        return toAjax(noticeService.insertNotice(notice));
+        notice.setNoticeId(IdUtil.getSnowflake().nextId());
+        int insertNotice = noticeService.insertNotice(notice);
+        if (insertNotice > 0){
+            if (notice.getUserIds() == null || notice.getUserIds().isEmpty()){
+                if (StrUtil.isBlank(notice.getDeptId())){
+                    notice.setUserIds(userService.list().stream().map(i -> String.valueOf(i.getUserId())).collect(Collectors.toList()));
+                }else {
+                    LambdaQueryWrapper<SysUser> wrapper = new LambdaQueryWrapper<>();
+                    wrapper.eq(SysUser::getDeptId, notice.getDeptId());
+                    notice.setUserIds(userService.list(wrapper).stream().map(i -> String.valueOf(i.getUserId())).collect(Collectors.toList()));
+                }
+            }
+            for (String userId : notice.getUserIds()) {
+                SysNoticeUser user = new SysNoticeUser();
+                user.setId(IdUtil.getSnowflake().nextId());
+                user.setNoticeId(notice.getNoticeId());
+                user.setUserId(Long.valueOf(userId));
+                sysNoticeUserService.save(user);
+            }
+        }else return AjaxResult.error();
+        return AjaxResult.success();
     }
 
     /**
      * 淇敼閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:edit')")
     @Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
     @PutMapping
     public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
@@ -77,10 +113,20 @@
     /**
      * 鍒犻櫎閫氱煡鍏憡
      */
-    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
+//    @PreAuthorize("@ss.hasPermi('system:notice:remove')")
     @Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
     @DeleteMapping("/{noticeIds}")
     public AjaxResult remove(@PathVariable Long[] noticeIds) {
         return toAjax(noticeService.deleteNoticeByIds(noticeIds));
     }
+
+    @GetMapping("/noticeToday")
+    public AjaxResult noticeToday(){
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser.getUserId().equalsIgnoreCase("1")){
+            return AjaxResult.success(noticeService.selectAllByAdmin());
+        }else {
+            return AjaxResult.success(noticeService.selectAll(loginUser.getUserId()));
+        }
+    }
 }

--
Gitblit v1.8.0