Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-03-16 2e6bb454f42a28f719e40abeeeb87e12b4efa93f

 ruoyi/src/main/java/com/ruoyi/project/system/controller/SysNoticeController.java

@@ -1,91 +1,92 @@
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.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.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 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 AjaxResult.success(noticeService.selectNoticeById(noticeId));

    }



    /**

     * 新增通知公告

     */

    @PreAuthorize("@ss.hasPermi('system:notice:add')")

    @Log(title = "通知公告", businessType = BusinessType.INSERT)

    @PostMapping

    public AjaxResult add(@RequestBody SysNotice notice)

    {

        notice.setCreateBy(SecurityUtils.getUsername());

        return toAjax(noticeService.insertNotice(notice));

    }



    /**

     * 修改通知公告

     */

    @PreAuthorize("@ss.hasPermi('system:notice:edit')")

    @Log(title = "通知公告", businessType = BusinessType.UPDATE)

    @PutMapping

    public AjaxResult edit(@RequestBody SysNotice notice)

    {

        notice.setUpdateBy(SecurityUtils.getUsername());

        return toAjax(noticeService.updateNotice(notice));

    }



    /**

     * 删除通知公告

     */

    @PreAuthorize("@ss.hasPermi('system:notice:remove')")

    @Log(title = "通知公告", businessType = BusinessType.DELETE)

    @DeleteMapping("/{noticeId}")

    public AjaxResult remove(@PathVariable Long noticeId)

    {

        return toAjax(noticeService.deleteNoticeById(noticeId));

    }

}

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.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 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 AjaxResult.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(SecurityUtils.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(SecurityUtils.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));
    }
}