From da9a4f7ad988c452f3a356989eaf7a6c06ae5032 Mon Sep 17 00:00:00 2001
From: kongdeqiang <kongdeqiang960204@163.com>
Date: 星期四, 26 九月 2024 23:03:05 +0800
Subject: [PATCH] fix:合并代码
---
src/main/java/com/boying/controller/CostRuleController.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/boying/controller/CostRuleController.java b/src/main/java/com/boying/controller/CostRuleController.java
index 5f72406..2007a6b 100644
--- a/src/main/java/com/boying/controller/CostRuleController.java
+++ b/src/main/java/com/boying/controller/CostRuleController.java
@@ -13,8 +13,7 @@
import com.boying.service.ParkService;
import com.boying.util.DateUtilOther;
import com.fasterxml.jackson.databind.ObjectMapper;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.tags.Tag;
+
import lombok.RequiredArgsConstructor;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
@@ -27,21 +26,18 @@
@RestController
@RequestMapping("ffzf/rule")
@RequiredArgsConstructor
-@Tag(description = "ffzf/rule" , name = "缂磋垂瑙勫垯" )
public class CostRuleController{
private final CostRuleService costRuleService;
private final ParkService parkService;
@GetMapping("test")
- @Operation(summary = "娴嬭瘯" , description = "娴嬭瘯" )
public Object save(String start,String end) throws ParseException {
double money = costRuleService.getMoney(4, DateUtilOther.stringToLocalDate(start,null), DateUtilOther.stringToLocalDate(end, null), 1);
return R.ok(money);
}
@PostMapping("/findPage")
- @Operation(summary = "鍒嗛〉鏌ヨ" , description = "鍒嗛〉鏌ヨ" )
public Object findPage(Page page,CostRule costRule) {
QueryWrapper<CostRule> wrapper = new QueryWrapper<>();
wrapper.lambda()
@@ -56,7 +52,6 @@
return R.ok(page1);}
@PostMapping("/save")
- @Operation(summary = "鏂板瑙勫垯" , description = "鏂板瑙勫垯" )
public Object save(CostRule costRule) {
costRuleService.saveOrUpdate(costRule);
return R.ok("淇濆瓨鎴愬姛");
@@ -64,7 +59,6 @@
@PostMapping("/delete")
- @Operation(summary = "鍒犻櫎瑙勫垯" , description = "鍒犻櫎瑙勫垯" )
public Object delete(Long id) {
costRuleService.removeById(id);
return R.ok("鍒犻櫎鎴愬姛");
--
Gitblit v1.9.1