Merge remote-tracking branch 'origin/dev_pro_河南鹤壁' into dev_鹤壁_强信宇_pro

yuan

5 天以前 66d041ed14b3ed3ed7183a28a5c588e235fc21d0

 src/main/java/com/ruoyi/approve/controller/NotificationManagementController.java

@@ -8,8 +8,9 @@
import com.ruoyi.approve.pojo.NotificationManagement;
import com.ruoyi.approve.pojo.OnlineMeeting;
import com.ruoyi.approve.service.NotificationManagementService;
import com.ruoyi.framework.web.controller.BaseController;
import com.ruoyi.framework.web.domain.R;
import com.ruoyi.framework.aspectj.lang.annotation.Log;
import com.ruoyi.framework.aspectj.lang.enums.BusinessType;
import com.ruoyi.framework.web.domain.AjaxResult;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@@ -19,7 +20,7 @@
@RestController
@RequestMapping("/notificationManagement")
@AllArgsConstructor
public class NotificationManagementController extends BaseController {
public class NotificationManagementController {
    private NotificationManagementService notificationManagementService ;
    private OnlineMeetingMapper onlineMeetingMapper;
    private FileSharingMapper fileSharingMapper;
@@ -28,52 +29,57 @@
     * @return
     */
    @GetMapping("/getList")
    public R<?> getList(@RequestParam(defaultValue = "1") long current,
    public AjaxResult getList(@RequestParam(defaultValue = "1") long current,
                              @RequestParam(defaultValue = "50") long size, NotificationManagement notificationManagement) {
        Page page = new Page(current, size);
        return R.ok(notificationManagementService.listpage(page,notificationManagement));
        return AjaxResult.success(notificationManagementService.listpage(page,notificationManagement));
    }
    /**、
     * 增添
     * @return
     */
    @Log(title = "增添通知管理", businessType = BusinessType.INSERT)
    @PostMapping("/add")
    public R<?> add(@RequestBody NotificationManagement notificationManagement){
        return R.ok(notificationManagementService.save(notificationManagement));
    public AjaxResult add(@RequestBody NotificationManagement notificationManagement){
        return AjaxResult.success(notificationManagementService.save(notificationManagement));
    }
    /**
     * 更新
     * @return
     */
    @Log(title = "更新通知管理", businessType = BusinessType.UPDATE)
    @PostMapping("/update")
    public R<?> update(@RequestBody NotificationManagement notificationManagement){
        return R.ok(notificationManagementService.updateById(notificationManagement));
    public AjaxResult update(@RequestBody NotificationManagement notificationManagement){
        return AjaxResult.success(notificationManagementService.updateById(notificationManagement));
    }
    /**
     * 删除
     * @return
     */
    @Log(title = "删除通知管理", businessType = BusinessType.DELETE)
    @DeleteMapping("/delete")
    public R<?> delete(@RequestBody List<Long> ids){
        if(CollectionUtils.isEmpty(ids)) return R.fail("请传入要删除的ID");
        return R.ok(notificationManagementService.removeByIds(ids));
    public AjaxResult delete(@RequestBody List<Long> ids){
        if(CollectionUtils.isEmpty(ids)) return AjaxResult.error("请传入要删除的ID");
        return AjaxResult.success(notificationManagementService.removeByIds(ids));
    }
    /**
     *新增会议
     * @param onlineMeeting
     * @return
     */
    @Log(title = "新增线上会议", businessType = BusinessType.INSERT)
    @PostMapping("/addOnlineMeeting")
    public R<?> addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
        return R.ok(onlineMeetingMapper.insert(onlineMeeting));
    public AjaxResult addOnlineMeeting(@RequestBody OnlineMeeting onlineMeeting){
        return AjaxResult.success(onlineMeetingMapper.insert(onlineMeeting));
    }
    /**
     *新增文件共享
     *
     */
    @Log(title = "新增文件共享", businessType = BusinessType.INSERT)
    @PostMapping("/addFileSharing")
    public R<?> addFileSharing(@RequestBody FileSharing fileSharing){
        return R.ok(fileSharingMapper.insert(fileSharing));
    public AjaxResult addFileSharing(@RequestBody FileSharing fileSharing){
        return AjaxResult.success(fileSharingMapper.insert(fileSharing));
    }
}