From e93aad02d2dd2a6e624e81ea0adb3611a8fc43e5 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 26 十二月 2024 17:16:19 +0800
Subject: [PATCH] 合并代码
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java | 12 +++++++++---
1 files changed, 9 insertions(+), 3 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
index c6062e4..596c161 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java
@@ -28,6 +28,13 @@
@Resource
private PointSettingService pointSettingService;
+
+ @PostMapping("/getPointSetting")
+ public R<PointSetting> getPointSetting(@RequestParam("id") Integer id) {
+ PointSetting pointSetting = pointSettingService.getById(id);
+ return R.ok(pointSetting);
+ }
+
@GetMapping("/getBaseSetting")
public R<PointSetting> getBaseSetting(@RequestParam Integer id) {
PointSetting pointSetting = pointSettingService.getById(id);
@@ -35,15 +42,14 @@
}
@GetMapping("/search")
@ApiOperation(value = "积分配置查询", tags = {"后台"})
- public R<List<PointSetting>> search(@RequestParam Integer id) {
+ public R<List<PointSetting>> search() {
List<PointSetting> list = pointSettingService.list();
return R.ok(list);
}
@PostMapping("/save")
@ApiOperation(value = "积分配置", tags = {"后台"})
public R<PointSetting> save(@RequestBody PointSettingDto pointSettingDto) {
- pointSettingService.remove(Wrappers.lambdaQuery());
- pointSettingService.saveBatch(pointSettingDto.getPointSettings());
+ pointSettingService.saveOrUpdateBatch(pointSettingDto.getPointSettings());
return R.ok();
}
--
Gitblit v1.7.1