From f27f3a1da27ff11e3c12dc1841094a0419a4279a Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 27 九月 2024 10:36:44 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/mx_charging_pile
---
ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java | 33 +++++++++++++++++++++++++++++----
1 files changed, 29 insertions(+), 4 deletions(-)
diff --git a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
index ec0648d..6c8218b 100644
--- a/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
+++ b/ruoyi-service/ruoyi-account/src/main/java/com/ruoyi/account/controller/TAppUserTagController.java
@@ -1,6 +1,7 @@
package com.ruoyi.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.ruoyi.common.log.annotation.Log;
import com.ruoyi.common.log.enums.BusinessType;
@@ -71,14 +72,38 @@
public R delete(String ids) {
//拿到单位列表
String[] split = ids.split(",");
+
+ List<TAppUserTag> list = appUserTagService.lambdaQuery().in(TAppUserTag::getUserTagId).list();
+ if (!list.isEmpty()){
+ return R.fail("当前标签已有用户获取，无法删除");
+ }
for (String id : split) {
otherClient.deleteTag(Integer.valueOf(id));
}
return R.ok();
}
-
-
-
-
+
+
+ /**
+ * 获取用户标签关系
+ * @param appUserTag
+ * @return
+ */
+ @PostMapping(value = "/tags/getUserTag")
+ public R<TAppUserTag> getUserTag(@RequestBody TAppUserTag appUserTag){
+ TAppUserTag one = appUserTagService.getOne(new LambdaQueryWrapper<TAppUserTag>().eq(TAppUserTag::getAppUserId, appUserTag.getAppUserId())
+ .eq(TAppUserTag::getUserTagId, appUserTag.getUserTagId()));
+ return R.ok(one);
+ }
+
+
+ /**
+ * 保存用户标签关系数据
+ * @param appUserTag
+ */
+ @PostMapping(value = "/tags/addUserTag")
+ public void addUserTag(@RequestBody TAppUserTag appUserTag){
+ appUserTagService.save(appUserTag);
+ }
}
--
Gitblit v1.7.1