sxc/Vetti-Service-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of https://github.com/Vetti-AI/Vetti-Service into dev

Browse Source
This commit is contained in:
wangxiangshun
2025-11-02 20:49:04 +08:00
parent 5e88fbd611 79daf16dc6
commit 5cc7915068
8 changed files with 130 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
vetti-admin/src/main/java/com/vetti/web/controller/hotake/HotakeSysNoticeController.java
View File

@@ -4,14 +4,7 @@ import java.util.List;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.PathVariable;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import org.springframework.web.bind.annotation.*;
import com.vetti.common.annotation.Log;
import com.vetti.common.core.controller.BaseController;
import com.vetti.common.core.domain.AjaxResult;
@@ -22,6 +15,7 @@ import com.vetti.hotake.domain.HotakeSysNotice;
import com.vetti.hotake.service.IHotakeSysNoticeService;
import com.vetti.common.utils.poi.ExcelUtil;
import com.vetti.common.core.page.TableDataInfo;
import org.springframework.web.multipart.MultipartFile;
/**
* 通知Controller
@@ -45,6 +39,7 @@ public class HotakeSysNoticeController extends BaseController {
public AjaxResult listView(HotakeSysNotice hotakeSysNotice) {
return AjaxResult.success(hotakeSysNoticeService.selectHotakeSysNoticeViewList(hotakeSysNotice));
}
/**
* 获取通知详细信息
*/
@@ -54,6 +49,7 @@ public class HotakeSysNoticeController extends BaseController {
public AjaxResult viewInfo(@PathVariable("id") Long id) {
return AjaxResult.success(hotakeSysNoticeService.selectHotakeSysNoticeViewById(id));
}
@ApiOperation("全部已读")
@PreAuthorize("@ss.hasPermi('hotake:sysNotice:query')")
@GetMapping(value = "/allread")
@@ -101,8 +97,8 @@ public class HotakeSysNoticeController extends BaseController {
@PreAuthorize("@ss.hasPermi('hotake:sysNotice:add')")
@Log(title = "通知", businessType = BusinessType.INSERT)
@PostMapping
public AjaxResult add(@RequestBody HotakeSysNotice hotakeSysNotice) {
return toAjax(hotakeSysNoticeService.insertHotakeSysNotice(hotakeSysNotice));
public AjaxResult add(@RequestPart(value = "files", required = false) List<MultipartFile> files, HotakeSysNotice hotakeSysNotice) {
return toAjax(hotakeSysNoticeService.insertHotakeSysNotice(files, hotakeSysNotice));
}
/**
@@ -112,8 +108,8 @@ public class HotakeSysNoticeController extends BaseController {
@PreAuthorize("@ss.hasPermi('hotake:sysNotice:edit')")
@Log(title = "通知", businessType = BusinessType.UPDATE)
@PutMapping
public AjaxResult edit(@RequestBody HotakeSysNotice hotakeSysNotice) {
return toAjax(hotakeSysNoticeService.updateHotakeSysNotice(hotakeSysNotice));
public AjaxResult edit(@RequestPart(value = "files", required = false) List<MultipartFile> files, HotakeSysNotice hotakeSysNotice) {
return toAjax(hotakeSysNoticeService.updateHotakeSysNotice(files, hotakeSysNotice));
}
/**