From 2f80b7085c4eabce06d3491306b75eecc275275f Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期四, 30 四月 2026 17:31:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java | 35 +++++++++++++++++++++++++++--------
1 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
index df8e248..ba1df00 100644
--- a/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
+++ b/src/main/java/com/ruoyi/collaborativeApproval/controller/NoticeController.java
@@ -1,52 +1,71 @@
package com.ruoyi.collaborativeApproval.controller;
+import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.collaborativeApproval.dto.NoticeDTO;
+import com.ruoyi.collaborativeApproval.pojo.Notice;
import com.ruoyi.collaborativeApproval.service.NoticeService;
+import com.ruoyi.common.utils.SecurityUtils;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.AjaxResult;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import com.ruoyi.project.system.service.ISysNoticeService;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import io.swagger.v3.oas.annotations.Operation;
import lombok.AllArgsConstructor;
import org.springframework.util.CollectionUtils;
import org.springframework.web.bind.annotation.*;
+import java.security.Security;
import java.util.List;
@RestController
@AllArgsConstructor
-@Api(tags = "閫氱煡鍏憡")
+@Tag(name = "閫氱煡鍏憡")
@RequestMapping("/collaborativeApproval/notice")
public class NoticeController extends BaseController {
private final NoticeService noticeService;
+ private final ISysNoticeService sysNoticeService;
@GetMapping("/page")
@Log(title = "鍒嗛〉鏌ヨ", businessType = BusinessType.OTHER)
- @ApiOperation("鍒嗛〉鏌ヨ")
+ @Operation(summary = "鍒嗛〉鏌ヨ")
public AjaxResult listPage(Page page, NoticeDTO noticeDTO){
return AjaxResult.success(noticeService.listPage(page, noticeDTO));
}
@PostMapping("/add")
@Log(title = "鏂板", businessType = BusinessType.INSERT)
- @ApiOperation("鏂板")
+ @Operation(summary = "鏂板")
public AjaxResult add(@RequestBody NoticeDTO noticeDTO){
+ if (noticeDTO.getStatus()==1){
+ //姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
+ sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
+ noticeDTO.getTitle(),
+ "/collaborativeApproval/noticeManagement?type="+noticeDTO.getType());
+ }
return AjaxResult.success(noticeService.save(noticeDTO));
}
@PutMapping("/update")
@Log(title = "淇敼", businessType = BusinessType.UPDATE)
- @ApiOperation("淇敼")
+ @Operation(summary = "淇敼")
public AjaxResult update(@RequestBody NoticeDTO noticeDTO){
+ if (ObjectUtils.isNotNull(noticeDTO.getStatus()) && noticeDTO.getStatus()==1){
+ Notice notice = noticeService.getById(noticeDTO.getId());
+ //姝ｅ紡鍙戝竷閫氱煡鎵�鏈変汉鐨勬秷鎭�氱煡
+ sysNoticeService.simpleNoticeAll("閫氱煡鍏憡",
+ notice.getTitle(),
+ "/collaborativeApproval/noticeManagement?type="+notice.getType());
+ }
return AjaxResult.success(noticeService.updateById(noticeDTO));
}
@DeleteMapping("/{ids}")
@Log(title = "鍒犻櫎", businessType = BusinessType.DELETE)
- @ApiOperation("鍒犻櫎")
+ @Operation(summary = "鍒犻櫎")
public AjaxResult delete(@PathVariable("ids") List<Long> ids){
if (CollectionUtils.isEmpty(ids)) {
throw new RuntimeException("璇蜂紶鍏ヨ鍒犻櫎鐨処D");
@@ -56,7 +75,7 @@
@GetMapping("/count")
@Log(title = "鑾峰彇鍏憡鏁伴噺", businessType = BusinessType.OTHER)
- @ApiOperation("鑾峰彇鍏憡鏁伴噺")
+ @Operation(summary = "鑾峰彇鍏憡鏁伴噺")
public AjaxResult count(){
return AjaxResult.success(noticeService.selectCount());
}
--
Gitblit v1.9.3