From 3cd2a5a3bab35cc3695c988a00b556c9855a2276 Mon Sep 17 00:00:00 2001 From: WangHao <43278047@qq.com> Date: Sat, 5 Sep 2020 00:09:10 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E7=94=A8=E6=88=B7=E6=A0=87?= =?UTF-8?q?=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../yunbookmark/SqUserTagController.java | 19 +++++++- .../web/test/controller/SqBookmarkTest.java | 46 ++++++++++++++----- .../bookmark/mapper/SqUserTagMapper.java | 24 ++++++---- .../bookmark/service/ISqUserTagService.java | 28 +++++++---- .../service/impl/SqUserTagServiceImpl.java | 31 +++++++++---- .../mapper/bookmark/SqUserTagMapper.xml | 21 ++++++--- 6 files changed, 126 insertions(+), 43 deletions(-) diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqUserTagController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqUserTagController.java index 20e4936bb..985d8a52f 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqUserTagController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/yunbookmark/SqUserTagController.java @@ -1,6 +1,8 @@ package com.ruoyi.web.controller.yunbookmark; import java.util.List; +import java.util.Map; + import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -27,12 +29,27 @@ import com.ruoyi.common.core.page.TableDataInfo; * @date 2020-09-04 */ @RestController -@RequestMapping("/system/usertag") +@RequestMapping("/usertag/tag") public class SqUserTagController extends BaseController { @Autowired private ISqUserTagService sqUserTagService; + /** + * 获取用戶标签 + */ + + @GetMapping(value = "/selectTagByUserID/{userId}") + public AjaxResult selectSqUserTagByUserId(@PathVariable("userId") Long userId) + { + List> map = sqUserTagService.selectSqUserTagByUserId(userId); + return AjaxResult.success(map); + } + + + + + /** * 查询标签管理列表 */ diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqBookmarkTest.java b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqBookmarkTest.java index 185a41158..92d8502d1 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqBookmarkTest.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/test/controller/SqBookmarkTest.java @@ -2,20 +2,17 @@ package com.ruoyi.web.test.controller; import com.ruoyi.bookmark.mapper.SqMenuMapper; -import com.ruoyi.bookmark.service.impl.SqMenuServiceImpl; +import com.ruoyi.bookmark.service.ISqUserTagService; import com.ruoyi.web.controller.yunbookmark.SqBookmarkController; -import org.assertj.core.api.Assertions; import org.junit.Before; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.web.client.TestRestTemplate; import org.springframework.test.web.servlet.MockMvc; -import org.springframework.test.web.servlet.MvcResult; -import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; -import org.springframework.test.web.servlet.result.MockMvcResultHandlers; -import org.springframework.test.web.servlet.result.MockMvcResultMatchers; import org.springframework.test.web.servlet.setup.MockMvcBuilders; +import java.util.List; +import java.util.Map; + /** * @Auther: Wang * @Date: 2020/08/08 18:51 @@ -28,6 +25,12 @@ public class SqBookmarkTest extends BaseSpringBootTest{ private SqBookmarkController sqBookmarkController; @Autowired private SqMenuMapper sqMenuMapper; + @Autowired + private ISqUserTagService iSqUserTagService; + + + + private MockMvc mockMvc; @@ -46,13 +49,34 @@ public class SqBookmarkTest extends BaseSpringBootTest{ // logger.info(mvcResult.getResponse().getContentAsString()); // // } - @Test - public void demo() throws Exception { - Long[] menuIds={1L,4L,6L}; - sqMenuMapper.updateCountAdd(menuIds,5); +// @Test +// public void demo() throws Exception { +// Long[] menuIds={1L,4L,6L}; +// sqMenuMapper.updateCountAdd(menuIds,5); +// +// logger.info("执行完毕"); +// +// } + /** + * @auther: Wang + * @date: 2020/09/04 23:58 + * 功能描述: 测试查询用户的 标签 + */ + @Test + public void selectSqUserTagByUserId() throws Exception { + List> map = iSqUserTagService.selectSqUserTagByUserId(1L); logger.info("执行完毕"); + for (Map list: map) { + for (Map.Entry entry: list.entrySet() ) { + System.out.println(entry.getKey()+"="+entry.getValue()); + } + logger.info("========================================"); + } + } + + } diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqUserTagMapper.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqUserTagMapper.java index 2bc62cdb8..5006df6f4 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqUserTagMapper.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/mapper/SqUserTagMapper.java @@ -1,19 +1,27 @@ package com.ruoyi.bookmark.mapper; import java.util.List; +import java.util.Map; + import com.ruoyi.bookmark.domain.SqUserTag; /** * 标签管理Mapper接口 - * + * * @author wang * @date 2020-09-04 */ -public interface SqUserTagMapper +public interface SqUserTagMapper { + + /** + *通过用户userID查用户的所有标签 + * + */ + public List> selectSqUserTagByUserId(Long userId); /** * 查询标签管理 - * + * * @param id 标签管理ID * @return 标签管理 */ @@ -21,7 +29,7 @@ public interface SqUserTagMapper /** * 查询标签管理列表 - * + * * @param sqUserTag 标签管理 * @return 标签管理集合 */ @@ -29,7 +37,7 @@ public interface SqUserTagMapper /** * 新增标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -37,7 +45,7 @@ public interface SqUserTagMapper /** * 修改标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -45,7 +53,7 @@ public interface SqUserTagMapper /** * 删除标签管理 - * + * * @param id 标签管理ID * @return 结果 */ @@ -53,7 +61,7 @@ public interface SqUserTagMapper /** * 批量删除标签管理 - * + * * @param ids 需要删除的数据ID * @return 结果 */ diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqUserTagService.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqUserTagService.java index bd53c6d04..c7dc45242 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqUserTagService.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/ISqUserTagService.java @@ -1,19 +1,31 @@ package com.ruoyi.bookmark.service; import java.util.List; +import java.util.Map; + import com.ruoyi.bookmark.domain.SqUserTag; /** * 标签管理Service接口 - * + * * @author wang * @date 2020-09-04 */ -public interface ISqUserTagService +public interface ISqUserTagService { + + + /** + *通过用户userID查用户的所有标签 + * + * + */ + + public List> selectSqUserTagByUserId(Long userId); + /** * 查询标签管理 - * + * * @param id 标签管理ID * @return 标签管理 */ @@ -21,7 +33,7 @@ public interface ISqUserTagService /** * 查询标签管理列表 - * + * * @param sqUserTag 标签管理 * @return 标签管理集合 */ @@ -29,7 +41,7 @@ public interface ISqUserTagService /** * 新增标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -37,7 +49,7 @@ public interface ISqUserTagService /** * 修改标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -45,7 +57,7 @@ public interface ISqUserTagService /** * 批量删除标签管理 - * + * * @param ids 需要删除的标签管理ID * @return 结果 */ @@ -53,7 +65,7 @@ public interface ISqUserTagService /** * 删除标签管理信息 - * + * * @param id 标签管理ID * @return 结果 */ diff --git a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqUserTagServiceImpl.java b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqUserTagServiceImpl.java index 7238bb7a0..7a1ea190b 100644 --- a/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqUserTagServiceImpl.java +++ b/ruoyi-yunbookmark/src/main/java/com/ruoyi/bookmark/service/impl/SqUserTagServiceImpl.java @@ -1,6 +1,8 @@ package com.ruoyi.bookmark.service.impl; import java.util.List; +import java.util.Map; + import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.ruoyi.bookmark.mapper.SqUserTagMapper; @@ -9,19 +11,32 @@ import com.ruoyi.bookmark.service.ISqUserTagService; /** * 标签管理Service业务层处理 - * + * * @author wang * @date 2020-09-04 */ @Service -public class SqUserTagServiceImpl implements ISqUserTagService +public class SqUserTagServiceImpl implements ISqUserTagService { @Autowired private SqUserTagMapper sqUserTagMapper; + + /** + *通过用户userID查用户的所有标签 + * + * + */ + @Override + public List>selectSqUserTagByUserId(Long userId){ + return sqUserTagMapper.selectSqUserTagByUserId(userId); + } + + + /** * 查询标签管理 - * + * * @param id 标签管理ID * @return 标签管理 */ @@ -33,7 +48,7 @@ public class SqUserTagServiceImpl implements ISqUserTagService /** * 查询标签管理列表 - * + * * @param sqUserTag 标签管理 * @return 标签管理 */ @@ -45,7 +60,7 @@ public class SqUserTagServiceImpl implements ISqUserTagService /** * 新增标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -57,7 +72,7 @@ public class SqUserTagServiceImpl implements ISqUserTagService /** * 修改标签管理 - * + * * @param sqUserTag 标签管理 * @return 结果 */ @@ -69,7 +84,7 @@ public class SqUserTagServiceImpl implements ISqUserTagService /** * 批量删除标签管理 - * + * * @param ids 需要删除的标签管理ID * @return 结果 */ @@ -81,7 +96,7 @@ public class SqUserTagServiceImpl implements ISqUserTagService /** * 删除标签管理信息 - * + * * @param id 标签管理ID * @return 结果 */ diff --git a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml index 133fb82dc..ac4617f6d 100644 --- a/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml +++ b/ruoyi-yunbookmark/src/main/resources/mapper/bookmark/SqUserTagMapper.xml @@ -3,7 +3,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd"> - + @@ -18,19 +18,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - + - + insert into sq_user_tag @@ -63,10 +63,17 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - delete from sq_user_tag where id in + delete from sq_user_tag where id in #{id} - - \ No newline at end of file + + + + + + +