From 9292f925e97bc426c7b58d022b0db9a0d2034246 Mon Sep 17 00:00:00 2001 From: phpcjl <phpcjl@gmail.com> Date: 星期三, 18 十二月 2024 17:03:30 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/PointSettingController.java | 22 ++++++++++++++++++---- 1 files changed, 18 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..c6062e4 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> @@ -32,6 +33,19 @@ PointSetting pointSetting = pointSettingService.getById(id); return R.ok(pointSetting); } + @GetMapping("/search") + @ApiOperation(value = "积分配置查询", tags = {"后台"}) + public R<List<PointSetting>> search(@RequestParam Integer id) { + 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()); + return R.ok(); + } } -- Gitblit v1.7.1