From 57a6735173d59feb6cfd95c9a8ec76d6f87bc578 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期一, 22 四月 2024 12:46:28 +0800
Subject: [PATCH] PDF合并，BUG修改

---
 ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java |   41 +++++++++++++++++++----------------------
 1 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
index 585d6f9..b43ffe4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceSystemmessageController.java
@@ -1,11 +1,14 @@
 package com.ruoyi.web.controller.project;
 
 import java.util.Arrays;
+import java.util.Collections;
+import java.util.Comparator;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.model.LoginUser;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -28,15 +31,15 @@
 
 /**
  * 绯荤粺娑堟伅Controller
- * 
+ *
  * @author ruoyi
  * @date 2022-06-02
  */
+@Slf4j
 @Api("绯荤粺娑堟伅")
 @RestController
 @RequestMapping("/project/systemmessage")
-public class ServiceSystemmessageController extends BaseController
-{
+public class ServiceSystemmessageController extends BaseController {
     @Autowired
     private IServiceSystemmessageService serviceSystemmessageService;
 
@@ -45,8 +48,7 @@
      */
     @ApiOperation("鏌ヨ绯荤粺娑堟伅鍒楄〃")
     @GetMapping("/list")
-    public TableDataInfo list(ServiceSystemmessage serviceSystemmessage)
-    {
+    public TableDataInfo list(ServiceSystemmessage serviceSystemmessage) {
         startPage();
         List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
         return getDataTable(list);
@@ -58,8 +60,7 @@
      */
     @ApiOperation("鏌ヨ鏈娑堟伅鏁伴噺")
     @GetMapping("/noreadcount")
-    public AjaxResult noreadcount()
-    {
+    public AjaxResult noreadcount() {
         LoginUser loginUser = getLoginUser();
         ServiceSystemmessage serviceSystemmessage=new ServiceSystemmessage();
         serviceSystemmessage.setReceiveuserno(loginUser.getUsername());
@@ -75,8 +76,7 @@
     @PreAuthorize("@ss.hasPermi('project:systemmessage:export')")
     @Log(title = "绯荤粺娑堟伅", businessType = BusinessType.EXPORT)
     @GetMapping("/export")
-    public AjaxResult export(ServiceSystemmessage serviceSystemmessage)
-    {
+    public AjaxResult export(ServiceSystemmessage serviceSystemmessage) {
         List<ServiceSystemmessage> list = serviceSystemmessageService.queryList(serviceSystemmessage);
         ExcelUtil<ServiceSystemmessage> util = new ExcelUtil<ServiceSystemmessage>(ServiceSystemmessage.class);
         return util.exportExcel(list, "绯荤粺娑堟伅鏁版嵁");
@@ -87,8 +87,7 @@
      */
     @ApiOperation("鑾峰彇绯荤粺娑堟伅璇︾粏淇℃伅")
     @GetMapping(value = "/{id}")
-    public AjaxResult getInfo(@PathVariable("id") Long id)
-    {
+    public AjaxResult getInfo(@PathVariable("id") Long id) {
         return AjaxResult.success(serviceSystemmessageService.getById(id));
     }
 
@@ -98,11 +97,11 @@
     @ApiOperation("鏂板绯荤粺娑堟伅")
     @PreAuthorize("@ss.hasPermi('project:systemmessage:add')")
     @Log(title = "绯荤粺娑堟伅", businessType = BusinessType.INSERT)
-    @PostMapping
+    @PostMapping("/add")
     @RepeatSubmit
-    public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage)
-    {
-        return toAjax(serviceSystemmessageService.save(serviceSystemmessage));
+    public AjaxResult add(@RequestBody ServiceSystemmessage serviceSystemmessage) {
+        boolean save = serviceSystemmessageService.save(serviceSystemmessage);
+        return AjaxResult.success(serviceSystemmessage);
     }
 
     /**
@@ -110,10 +109,9 @@
      */
     @ApiOperation("淇敼绯荤粺娑堟伅")
     @Log(title = "绯荤粺娑堟伅", businessType = BusinessType.UPDATE)
-    @PutMapping
-    @RepeatSubmit    
-    public AjaxResult edit(@RequestBody ServiceSystemmessage serviceSystemmessage)
-    {
+    @PostMapping("/edit")
+    @RepeatSubmit
+    public AjaxResult edit(@RequestBody ServiceSystemmessage serviceSystemmessage) {
         return toAjax(serviceSystemmessageService.updateById(serviceSystemmessage));
     }
 
@@ -123,9 +121,8 @@
     @ApiOperation("鍒犻櫎绯荤粺娑堟伅")
     @PreAuthorize("@ss.hasPermi('project:systemmessage:remove')")
     @Log(title = "绯荤粺娑堟伅", businessType = BusinessType.DELETE)
-    @DeleteMapping("/{ids}")
-    public AjaxResult remove(@PathVariable Long[] ids)
-    {
+    @GetMapping("/remove/{ids}")
+    public AjaxResult remove(@PathVariable Long[] ids) {
         return toAjax(serviceSystemmessageService.removeByIds(Arrays.asList(ids)));
     }
 }

--
Gitblit v1.9.3