From 0c0ca0349e7392cd08d8bb1417f51c320e77088d Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期六, 17 八月 2024 15:58:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
index 6b55808..bd06451 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TEvaluationTagController.java
@@ -1,6 +1,7 @@
package com.ruoyi.other.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.ruoyi.common.core.domain.R;
import com.ruoyi.common.core.web.domain.AjaxResult;
import com.ruoyi.common.core.web.page.BasePage;
@@ -79,13 +80,12 @@
@ResponseBody
- @DeleteMapping("/delEvaluationTag/{id}")
+ @DeleteMapping("/delEvaluationTag")
@ApiOperation(value = "删除评价标签", tags = {"管理后台-评价标签设置"})
- public AjaxResult<TInvoiceType> delEvaluationTag(@PathVariable Integer[] id){
+ public AjaxResult<TInvoiceType> delEvaluationTag(@RequestParam("id") Integer[] id){
List<TEvaluationTag> tEvaluationTags = evaluationTagService.listByIds(Arrays.asList(id));
for (TEvaluationTag evaluationTag : tEvaluationTags) {
- evaluationTag.setDelFlag(true);
- evaluationTagService.updateById(evaluationTag);
+ evaluationTagService.removeById(evaluationTag);
}
return AjaxResult.success();
}
@@ -96,10 +96,20 @@
* @param tagIds
* @return
*/
- @GetMapping("/getListByIds")
- public R<List<TEvaluationTag>> getListByIds(List<Integer> tagIds){
+ @PostMapping("/getListByIds")
+ public R<List<TEvaluationTag>> getListByIds(@RequestBody List<Integer> tagIds){
List<TEvaluationTag> tEvaluationTags = evaluationTagService.listByIds(tagIds);
return R.ok(tEvaluationTags);
}
+
+
+
+ @ResponseBody
+ @GetMapping("/getRandomEvaluationTag")
+ @ApiOperation(value = "获取随机的4个评价标签", tags = {"小程序-充电记录"})
+ public AjaxResult<List<TEvaluationTag>> getRandomEvaluationTag(){
+ List<TEvaluationTag> list = evaluationTagService.list(new LambdaQueryWrapper<TEvaluationTag>().last(" order by RAND() limit 0, 4"));
+ return AjaxResult.success(list);
+ }
}
--
Gitblit v1.7.1