From 27be613f1844e2d3da825681ab8141cc1064b76f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 08 八月 2024 17:04:48 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile

---
 ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java |   28 ++++++++++++++++++++++++++--
 1 files changed, 26 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
index 1ce47ac..a224192 100644
--- a/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
+++ b/ruoyi-service/ruoyi-other/src/main/java/com/ruoyi/other/controller/TUserTagController.java
@@ -13,6 +13,9 @@
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -28,6 +31,7 @@
     @Resource
     private TUserTagService tUserTagService;
 
+    //标签分页
     @PostMapping(value = "/page")
     public R<Page<TUserTag>> page(@RequestBody TagListQueryDto tagListQueryDto) {
         Page<TUserTag> page = tUserTagService.lambdaQuery()
@@ -37,20 +41,40 @@
         return R.ok(page);
 
     }
-
+    //标签新增修改
     @PostMapping(value = "/addorUpdateTag")
     public R addorUpdateTag(@RequestBody TUserTag tUserTag) {
         tUserTag.setCreateTime(LocalDateTime.now());
         tUserTagService.saveOrUpdate(tUserTag);
         return R.ok();
     }
-
+    //标签删除
     @PostMapping(value = "/delete")
     public R delete(@RequestParam Integer id) {
         tUserTagService.removeById(id);
         return R.ok();
     }
 
+    //获取标签map
+    @PostMapping(value = "/getTagMap")
+    public R<Map<Integer, String>> getTagMap(@RequestBody List<Integer> ids) {
+
+        List<TUserTag> list = tUserTagService.lambdaQuery().in(!ids.isEmpty(), TUserTag::getId, ids).list();
+        Map<Integer, String> idNameMap = list.stream()
+                .collect(Collectors.toMap(
+                        TUserTag::getId,
+                        TUserTag::getName
+                ));
+        return R.ok(idNameMap);
+    }
+
+    @PostMapping(value = "/getById")
+    public R<TUserTag> getById(@RequestParam Integer id) {
+
+        return R.ok(tUserTagService.getById(id));
+    }
+
+
 
 }
 

--
Gitblit v1.7.1