From 78ee837585bf67ca1b462db6adbdb8135de05fb8 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期二, 19 十二月 2023 17:50:16 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java | 61 +++++++++++++++++++-----------
1 files changed, 39 insertions(+), 22 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
index 94b2df0..8657d9f 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/ServiceDonateannexController.java
@@ -3,11 +3,14 @@
import java.util.Arrays;
import java.util.List;
+import com.ruoyi.common.exception.base.BaseException;
import com.ruoyi.project.domain.vo.DonateAnnexVO;
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.transaction.annotation.Transactional;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -28,15 +31,15 @@
/**
* 鎹愮尞闄勪欢Controller
- *
+ *
* @author ruoyi
* @date 2021-11-11
*/
+@Slf4j
@Api("闄勪欢绠＄悊")
@RestController
@RequestMapping("/project/donateannex")
-public class ServiceDonateannexController extends BaseController
-{
+public class ServiceDonateannexController extends BaseController {
@Autowired
private IServiceDonateannexService serviceDonateannexService;
@@ -46,16 +49,16 @@
@ApiOperation("闄勪欢绠＄悊鍒楄〃")
//@PreAuthorize("@ss.hasPermi('project:donateannex:list')")
@GetMapping("/list")
- public TableDataInfo list(ServiceDonateannex serviceDonateannex)
- {
+ public TableDataInfo list(ServiceDonateannex serviceDonateannex) {
+ log.info("闄勪欢绠＄悊鍒楄〃锛歿}", serviceDonateannex);
startPage();
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
return getDataTable(list);
}
@GetMapping("/listnew")
- public TableDataInfo listnew(DonateAnnexVO donateAnnexVO)
- {
+ public TableDataInfo listnew(DonateAnnexVO donateAnnexVO) {
+ log.info("listnew鐨勫叆鍙傦細{}", donateAnnexVO);
startPage();
List<DonateAnnexVO> list = serviceDonateannexService.selectVOList(donateAnnexVO);
return getDataTable(list);
@@ -69,8 +72,8 @@
//@PreAuthorize("@ss.hasPermi('project:donateannex:export')")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.EXPORT)
@GetMapping("/export")
- public AjaxResult export(ServiceDonateannex serviceDonateannex)
- {
+ public AjaxResult export(ServiceDonateannex serviceDonateannex) {
+ log.info("瀵煎嚭鎹愮尞闄勪欢鍒楄〃锛歿}", serviceDonateannex);
List<ServiceDonateannex> list = serviceDonateannexService.queryList(serviceDonateannex);
ExcelUtil<ServiceDonateannex> util = new ExcelUtil<ServiceDonateannex>(ServiceDonateannex.class);
return util.exportExcel(list, "鎹愮尞闄勪欢鏁版嵁");
@@ -82,8 +85,8 @@
@ApiOperation("閫氳繃id鑾峰緱鎹愮尞闄勪欢淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateannex:query')")
@GetMapping(value = "/{id}")
- public AjaxResult getInfo(@PathVariable("id") Long id)
- {
+ public AjaxResult getInfo(@PathVariable("id") Long id) {
+ log.info("閫氳繃id鑾峰緱鎹愮尞闄勪欢淇℃伅锛歿}", id);
return AjaxResult.success(serviceDonateannexService.getById(id));
}
@@ -93,11 +96,11 @@
@ApiOperation("鏂板鎹愮尞闄勪欢淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateannex:add')")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.INSERT)
- @PostMapping
+ @PostMapping("/add")
@RepeatSubmit
- public AjaxResult add(@RequestBody ServiceDonateannex serviceDonateannex)
- {
- return toAjax(serviceDonateannexService.save(serviceDonateannex));
+ public AjaxResult add(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("鏂板鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannexs.size());
+ return toAjax(serviceDonateannexService.saveData(serviceDonateannexs));
}
/**
@@ -106,11 +109,25 @@
@ApiOperation("淇敼鎹愮尞闄勪欢淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateannex:edit')")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.UPDATE)
- @PutMapping
- @RepeatSubmit
- public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex)
- {
+ @PostMapping("/edit")
+ @RepeatSubmit
+ public AjaxResult edit(@RequestBody ServiceDonateannex serviceDonateannex) {
+ log.info("淇敼鎹愮尞闄勪欢淇℃伅锛歿}", serviceDonateannex);
return toAjax(serviceDonateannexService.updateById(serviceDonateannex));
+ }
+
+
+ /**
+ * 淇敼鎹愮尞闄勪欢
+ */
+ @ApiOperation("淇敼娼滃湪鎹愮尞銆佷鸡鐞嗗鏌ャ�佸畬鎴愮櫥璁般�佸尰瀛﹁瘎浼伴檮浠朵俊鎭�")
+ //@PreAuthorize("@ss.hasPermi('project:donateannex:edit')")
+ @Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.UPDATE)
+ @PostMapping("/editannexfiles")
+ @RepeatSubmit
+ public AjaxResult editannexfiles(@RequestBody List<ServiceDonateannex> serviceDonateannexs) {
+ log.info("淇敼娼滃湪鎹愮尞銆佷鸡鐞嗗鏌ャ�佸畬鎴愮櫥璁般�佸尰瀛﹁瘎浼伴檮浠朵俊鎭細{}", serviceDonateannexs.size());
+ return toAjax(serviceDonateannexService.updateOrSave(serviceDonateannexs));
}
/**
@@ -119,9 +136,9 @@
@ApiOperation("鍒犻櫎鎹愮尞鏂囦欢淇℃伅")
//@PreAuthorize("@ss.hasPermi('project:donateannex:remove')")
@Log(title = "鎹愮尞闄勪欢", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
- public AjaxResult remove(@PathVariable Long[] ids)
- {
+ @GetMapping("/remove/{ids}")
+ public AjaxResult remove(@PathVariable Long[] ids) {
+ log.info("鍒犻櫎鎹愮尞鏂囦欢淇℃伅锛歿}", ids);
return toAjax(serviceDonateannexService.removeByIds(Arrays.asList(ids)));
}
--
Gitblit v1.9.3