From dd69bfc1fb8e5e28dde754fab7f23bfb1a18faa5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期五, 05 六月 2026 16:58:07 +0800
Subject: [PATCH] config(dev): 更新开发环境配置和文件上传功能 - 调整文件上传路径配置 - 修复OA环境文件链接前缀配置 - 在审批实例服务中添加报销相关数据删除逻辑 - 实现申请人姓名自动填充功能 - 添加文件下载预览路由的正则表达式支持 - 为企业新闻VO添加附件列表兼容别名 - 完善员工入职服务的异常处理 - 新增账户附件管理控制器 - 实现文件上传接口并返回完整文件信息
---
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 187 ++++++++++++++++++++++++----------------------
1 files changed, 96 insertions(+), 91 deletions(-)
diff --git a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
index 0050920..eaba7d0 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -1,91 +1,96 @@
-package com.ruoyi.project.system.controller;
-
-import java.util.List;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.DeleteMapping;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.PutMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-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 com.ruoyi.framework.web.page.TableDataInfo;
-import com.ruoyi.project.system.domain.SysNotice;
-import com.ruoyi.project.system.service.ISysNoticeService;
-
-/**
- * 鍏憡 淇℃伅鎿嶄綔澶勭悊
- *
- * @author ruoyi
- */
-@RestController
-@RequestMapping("/system/notice")
-public class SysNoticeController extends BaseController
-{
- @Autowired
- private ISysNoticeService noticeService;
-
- /**
- * 鑾峰彇閫氱煡鍏憡鍒楄〃
- */
- @PreAuthorize("@ss.hasPermi('system:notice:list')")
- @GetMapping("/list")
- public TableDataInfo list(SysNotice notice)
- {
- startPage();
- List<SysNotice> list = noticeService.selectNoticeList(notice);
- return getDataTable(list);
- }
-
- /**
- * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
- */
- @PreAuthorize("@ss.hasPermi('system:notice:query')")
- @GetMapping(value = "/{noticeId}")
- public AjaxResult getInfo(@PathVariable Long noticeId)
- {
- return success(noticeService.selectNoticeById(noticeId));
- }
-
- /**
- * 鏂板閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:add')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.INSERT)
- @PostMapping
- public AjaxResult add(@Validated @RequestBody SysNotice notice)
- {
- notice.setCreateBy(getUsername());
- return toAjax(noticeService.insertNotice(notice));
- }
-
- /**
- * 淇敼閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:edit')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.UPDATE)
- @PutMapping
- public AjaxResult edit(@Validated @RequestBody SysNotice notice)
- {
- notice.setUpdateBy(getUsername());
- return toAjax(noticeService.updateNotice(notice));
- }
-
- /**
- * 鍒犻櫎閫氱煡鍏憡
- */
- @PreAuthorize("@ss.hasPermi('system:notice:remove')")
- @Log(title = "閫氱煡鍏憡", businessType = BusinessType.DELETE)
- @DeleteMapping("/{noticeIds}")
- public AjaxResult remove(@PathVariable Long[] noticeIds)
- {
- return toAjax(noticeService.deleteNoticeByIds(noticeIds));
- }
-}
+package com.ruoyi.project.system.controller;
+
+import java.util.List;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.ruoyi.framework.web.domain.R;
+import io.swagger.v3.oas.annotations.Operation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.*;
+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 com.ruoyi.framework.web.page.TableDataInfo;
+import com.ruoyi.project.system.domain.SysNotice;
+import com.ruoyi.project.system.service.ISysNoticeService;
+
+/**
+ * 鍏憡 淇℃伅鎿嶄綔澶勭悊
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/system/notice")
+@AllArgsConstructor
+public class SysNoticeController extends BaseController {
+ private ISysNoticeService noticeService;
+
+ /**
+ * 鑾峰彇閫氱煡鍏憡鍒楄〃
+ */
+ @GetMapping("/list")
+ public R<IPage<SysNotice>> list(SysNotice notice, Page page) {
+ IPage<SysNotice> list = noticeService.selectNoticeList(notice, page);
+ return R.ok(list);
+ }
+
+ /**
+ * 鑾峰彇鏈鏁伴噺
+ */
+ @GetMapping("/getCount")
+ public R getCount(Long consigneeId) {
+ return R.ok(noticeService.getCount(consigneeId));
+ }
+
+ /**
+ * 鏍规嵁閫氱煡鍏憡缂栧彿鑾峰彇璇︾粏淇℃伅
+ */
+ @GetMapping(value = "/{noticeId}")
+ public AjaxResult getInfo(@PathVariable Long noticeId) {
+ return success(noticeService.selectNoticeById(noticeId));
+ }
+
+ /**
+ * 鏂板閫氱煡鍏憡
+ */
+ @PostMapping
+ public AjaxResult add(@Validated @RequestBody SysNotice notice) {
+ return toAjax(noticeService.insertNotice(notice));
+ }
+
+ /**
+ * 淇敼閫氱煡鍏憡
+ */
+ @PutMapping
+ public AjaxResult edit(@Validated @RequestBody SysNotice notice) {
+ return toAjax(noticeService.updateNotice(notice));
+ }
+
+ /**
+ * 鍒犻櫎閫氱煡鍏憡
+ */
+ @DeleteMapping("/{noticeIds}")
+ public AjaxResult remove(@PathVariable Long[] noticeIds) {
+ return toAjax(noticeService.deleteNoticeByIds(noticeIds));
+ }
+
+ /**
+ * 涓�閿凡璇�
+ */
+ @PostMapping("/readAll")
+ public AjaxResult readAll() {
+ return toAjax(noticeService.readAll());
+ }
+
+ @PostMapping("appReadNotice")
+ @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
+ public AjaxResult appReadNotice(@RequestParam("noticeId") Long noticeId) {
+ boolean result = noticeService.appReadNotice(noticeId);
+ return toAjax(result);
+ }
+}
--
Gitblit v1.9.3