From d06ef3f44d6dc19dae223ab420165369ea13cc16 Mon Sep 17 00:00:00 2001
From: huminmin <mac@MacBook-Pro.local>
Date: 星期三, 20 五月 2026 16:29:35 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java | 195 ++++++++++++++++++++++++------------------------
1 files changed, 99 insertions(+), 96 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 5aa3413..40458bf 100644
--- a/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
+++ b/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java
@@ -1,96 +1,99 @@
-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);
- }
-}
+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.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 R<?> getInfo(@PathVariable Long noticeId) {
+ return R.ok(noticeService.selectNoticeById(noticeId));
+ }
+
+ /**
+ * 鏂板閫氱煡鍏憡
+ */
+ @PostMapping
+ public R<?> add(@Validated @RequestBody SysNotice notice) {
+ noticeService.insertNotice(notice);
+ return R.ok();
+ }
+
+ /**
+ * 淇敼閫氱煡鍏憡
+ */
+ @PutMapping
+ public R<?> edit(@Validated @RequestBody SysNotice notice) {
+ noticeService.updateNotice(notice);
+ return R.ok();
+ }
+
+ /**
+ * 鍒犻櫎閫氱煡鍏憡
+ */
+ @DeleteMapping("/{noticeIds}")
+ public R<?> remove(@PathVariable Long[] noticeIds) {
+ noticeService.deleteNoticeByIds(noticeIds);
+ return R.ok();
+ }
+
+ /**
+ * 涓�閿凡璇�
+ */
+ @PostMapping("/readAll")
+ public R<?> readAll() {
+ noticeService.readAll();
+ return R.ok();
+ }
+
+ @PostMapping("appReadNotice")
+ @Operation(summary = "绉诲姩绔牴鎹秷鎭疘D杩涜宸茶")
+ public R<?> appReadNotice(@RequestParam("noticeId") Long noticeId) {
+ noticeService.appReadNotice(noticeId);
+ return R.ok();
+ }
+}
\ No newline at end of file
--
Gitblit v1.9.3