From 5c909da3050d2337015c0454d219d482add19a63 Mon Sep 17 00:00:00 2001
From: liusheng <337615773@qq.com>
Date: 星期三, 27 十二月 2023 18:53:57 +0800
Subject: [PATCH] 代码提交
---
ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java | 43 ++++++++++++++++++++++++-------------------
1 files changed, 24 insertions(+), 19 deletions(-)
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
index aea023b..00af4ce 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/project/BaseFinancesubjectController.java
@@ -1,28 +1,22 @@
package com.ruoyi.web.controller.project;
-import java.util.Arrays;
-import java.util.List;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
-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 com.ruoyi.common.annotation.Log;
import com.ruoyi.common.annotation.RepeatSubmit;
import com.ruoyi.common.core.controller.BaseController;
import com.ruoyi.common.core.domain.AjaxResult;
+import com.ruoyi.common.core.page.TableDataInfo;
import com.ruoyi.common.enums.BusinessType;
+import com.ruoyi.common.utils.poi.ExcelUtil;
import com.ruoyi.project.domain.BaseFinancesubject;
import com.ruoyi.project.service.IBaseFinancesubjectService;
-import com.ruoyi.common.utils.poi.ExcelUtil;
-import com.ruoyi.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.Arrays;
+import java.util.List;
/**
* 鏀跺叆璐圭敤绉戠洰Controller
@@ -30,6 +24,7 @@
* @author ruoyi
* @date 2022-01-11
*/
+@Slf4j
@Api("鏀跺叆璐圭敤绉戠洰")
@RestController
@RequestMapping("/project/financesubject")
@@ -42,10 +37,11 @@
* 鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃
*/
@ApiOperation("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃")
- //@PreAuthorize("@ss.hasPermi('project:financesubject:list')")
+ //@PreAuthorize("@ss.hasPermi('project::list')")
@GetMapping("/list")
public TableDataInfo list(BaseFinancesubject baseFinancesubject)
{
+ log.info("鏌ヨ鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
startPage();
//List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);銆�
List<BaseFinancesubject> list = baseFinancesubjectService.selectBaseFinancesubjectList(baseFinancesubject);
@@ -61,6 +57,7 @@
@GetMapping("/export")
public AjaxResult export(BaseFinancesubject baseFinancesubject)
{
+ log.info("瀵煎嚭鏀跺叆璐圭敤绉戠洰鍒楄〃{}锛�" , baseFinancesubject);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
ExcelUtil<BaseFinancesubject> util = new ExcelUtil<BaseFinancesubject>(BaseFinancesubject.class);
return util.exportExcel(list, "鏀跺叆璐圭敤绉戠洰鏁版嵁");
@@ -74,6 +71,7 @@
@GetMapping(value = "/{id}")
public AjaxResult getInfo(@PathVariable("id") Long id)
{
+ log.info("鑾峰彇鏀跺叆璐圭敤绉戠洰璇︾粏淇℃伅{}锛�" , id);
return AjaxResult.success(baseFinancesubjectService.getById(id));
}
@@ -87,6 +85,7 @@
@RepeatSubmit
public AjaxResult add(@RequestBody BaseFinancesubject baseFinancesubject)
{
+ log.info("鏂板鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
return toAjax(baseFinancesubjectService.save(baseFinancesubject));
}
@@ -96,10 +95,11 @@
@ApiOperation("淇敼鏀跺叆璐圭敤绉戠洰")
//@PreAuthorize("@ss.hasPermi('project:financesubject:edit')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.UPDATE)
- @PutMapping
+ @PostMapping("/edit")
@RepeatSubmit
public AjaxResult edit(@RequestBody BaseFinancesubject baseFinancesubject)
{
+ log.info("淇敼鏀跺叆璐圭敤绉戠洰{}锛�" , baseFinancesubject);
return toAjax(baseFinancesubjectService.updateById(baseFinancesubject));
}
@@ -109,14 +109,16 @@
@ApiOperation("鍒犻櫎鏀跺叆璐圭敤绉戠洰")
//@PreAuthorize("@ss.hasPermi('project:financesubject:remove')")
@Log(title = "鏀跺叆璐圭敤绉戠洰", businessType = BusinessType.DELETE)
- @DeleteMapping("/{ids}")
+ @GetMapping("/remove/{ids}")
public AjaxResult remove(@PathVariable Long[] ids)
{
+ log.info("鍒犻櫎鏀跺叆璐圭敤绉戠洰{}锛�" , ids);
return toAjax(baseFinancesubjectService.removeByIds(Arrays.asList(ids)));
}
@GetMapping(value = "/getItemName/{ItemType}")
public AjaxResult getItemName(@PathVariable("ItemType") String ItemType){
+ log.info("/getItemName鐨勫叆鍙� {}锛�" , ItemType);
return AjaxResult.success(baseFinancesubjectService.getItemName(ItemType));
}
@@ -124,6 +126,7 @@
@Log(title = "鑾峰彇鎹愮尞鎴愭湰", businessType = BusinessType.OTHER)
@GetMapping(value = "/getDonationCost/{DonorNo}")
public AjaxResult getDonationCost(@PathVariable("DonorNo") String DonorNo){
+ log.info("鑾峰彇鎹愮尞鎴愭湰{}锛�" , DonorNo);
return AjaxResult.success(baseFinancesubjectService.getDonationCost(DonorNo));
}
@@ -136,6 +139,7 @@
@GetMapping("/getbyexpensetype/{ExpenseType}")
public AjaxResult getByExpenseType(@PathVariable("ExpenseType") String ExpenseType)
{
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰绫诲瀷{}锛�" , ExpenseType);
/*BaseFinancesubject baseFinancesubject=new BaseFinancesubject();
baseFinancesubject.setExpensetype(ExpenseType);
List<BaseFinancesubject> list = baseFinancesubjectService.queryList(baseFinancesubject);
@@ -153,6 +157,7 @@
@GetMapping("/getDetails/{ExpenseType}")
public AjaxResult getDetails(@PathVariable("ExpenseType") String ExpenseType)
{
+ log.info("鏍规嵁璐圭敤澶х被鑾峰彇椤圭洰鏄庣粏{}锛�" , ExpenseType);
return AjaxResult.success(baseFinancesubjectService.getDetails(ExpenseType));
}
--
Gitblit v1.9.3