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 | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 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 abecabd..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
@@ -1,16 +1,17 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.controller.BaseController;
import com.ruoyi.other.api.domain.PointSetting;
+import com.ruoyi.other.dto.PointSettingDto;
import com.ruoyi.other.service.PointSettingService;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import io.swagger.annotations.ApiOperation;
+import org.springframework.web.bind.annotation.*;
import javax.annotation.Resource;
+import java.util.List;
/**
* <p>
@@ -27,11 +28,30 @@
@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);
return R.ok(pointSetting);
}
+ @GetMapping("/search")
+ @ApiOperation(value = "积分配置查询", tags = {"后台"})
+ 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.saveOrUpdateBatch(pointSettingDto.getPointSettings());
+ return R.ok();
+ }
}
--
Gitblit v1.7.1