From 797d1d539007a273bf0622c0157490ff7004637f Mon Sep 17 00:00:00 2001 From: "[li_she]" <[li.she@xujiesoft.com]> Date: Mon, 5 Jul 2021 14:04:32 +0800 Subject: [PATCH] =?UTF-8?q?=E6=94=B6=E8=97=8F=E8=8F=9C=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sys/controller/SysMenuController.java | 5 +-- .../UserFavoriteMenuController.java | 42 +++++++++++++++++++ .../modules/sys/dao/FavoriteFunctionsDao.java | 14 +++++++ .../modules/sys/entity/FavoriteFunctions.java | 10 +++++ .../sys/service/FavoriteFunctionsService.java | 15 +++++++ .../impl/FavoriteFunctionsServiceImpl.java | 19 +++++++++ .../mapper/sys/FavoriteFunctionsDao.xml | 23 ++++++++++ 7 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java create mode 100644 src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java create mode 100644 src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java create mode 100644 src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java create mode 100644 src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java create mode 100644 src/main/resources/mapper/sys/FavoriteFunctionsDao.xml diff --git a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java index 916b7c4..73911bf 100644 --- a/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java +++ b/src/main/java/com/gaotao/modules/sys/controller/SysMenuController.java @@ -131,8 +131,8 @@ public class SysMenuController extends AbstractController { sysObjectLanguageMenu.setLanguageValue(menu.getName()); BeanUtils.copyProperties(menu,sysMenuEntity); sysMenuService.save(sysMenuEntity); - sysObjectLanguageMenu.setMenuId(sysMenuEntity.getMenuId()); - sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu); +// sysObjectLanguageMenu.setMenuId(sysMenuEntity.getMenuId()); +// sysObjectLanguageMenuService.saveSysObjectLanguageMenu(sysObjectLanguageMenu); return R.ok(); } @@ -145,7 +145,6 @@ public class SysMenuController extends AbstractController { public R update(@RequestBody SysMenuEntity menu){ //数据校验 verifyForm(menu); - sysMenuService.updateById(menu); return R.ok(); diff --git a/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java b/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java new file mode 100644 index 0000000..bba3892 --- /dev/null +++ b/src/main/java/com/gaotao/modules/sys/controller/UserFavoriteMenuController.java @@ -0,0 +1,42 @@ +package com.gaotao.modules.sys.controller; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.gaotao.common.utils.R; +import com.gaotao.modules.sys.entity.FavoriteFunctions; +import com.gaotao.modules.sys.entity.SysMenuEntity; +import com.gaotao.modules.sys.service.FavoriteFunctionsService; +import oracle.jdbc.proxy.annotation.Post; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +@RestController +@RequestMapping("userFavorite") +public class UserFavoriteMenuController { + + @Resource + private FavoriteFunctionsService favoriteFunctionsService; + + @GetMapping("userFavoriteList/{userId}/{languageCode}") + public R userMenuFavoriteList(@PathVariable("userId")Long userId,@PathVariable("languageCode")String languageCode){ + List sysMenuEntities = favoriteFunctionsService.userMenuFavoriteList(userId, languageCode); + return R.ok().put("list",sysMenuEntities); + } + + @PostMapping("save") + public R saveUserMenuFavorite(@RequestBody FavoriteFunctions favoriteFunctions){ + + favoriteFunctionsService.save(favoriteFunctions); + return R.ok("收藏成功"); + } + + @PostMapping("remove") + public R removeUserMenuFavorite(@RequestBody FavoriteFunctions favoriteFunctions){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("user_id",favoriteFunctions.getUserId()) + .eq("function_id",favoriteFunctions.getFunctionId()); + favoriteFunctionsService.remove(queryWrapper); + return R.ok("取消收藏"); + } +} diff --git a/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java b/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java new file mode 100644 index 0000000..ffec3b7 --- /dev/null +++ b/src/main/java/com/gaotao/modules/sys/dao/FavoriteFunctionsDao.java @@ -0,0 +1,14 @@ +package com.gaotao.modules.sys.dao; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.gaotao.modules.sys.entity.FavoriteFunctions; +import com.gaotao.modules.sys.entity.SysMenuEntity; +import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +@Mapper +public interface FavoriteFunctionsDao extends BaseMapper { + List userMenuFavoriteList(@Param("userId") Long userId,@Param("languageCode") String languageCode); +} diff --git a/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java b/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java new file mode 100644 index 0000000..e3bb5bf --- /dev/null +++ b/src/main/java/com/gaotao/modules/sys/entity/FavoriteFunctions.java @@ -0,0 +1,10 @@ +package com.gaotao.modules.sys.entity; + +import lombok.Data; + +@Data +public class FavoriteFunctions { + + private Long userId; + private Long functionId; +} diff --git a/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java b/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java new file mode 100644 index 0000000..7fb09ef --- /dev/null +++ b/src/main/java/com/gaotao/modules/sys/service/FavoriteFunctionsService.java @@ -0,0 +1,15 @@ +package com.gaotao.modules.sys.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gaotao.modules.sys.entity.FavoriteFunctions; +import com.gaotao.modules.sys.entity.SysMenuEntity; + +import java.util.List; + +public interface FavoriteFunctionsService extends IService { + + List userMenuFavoriteList(Long userId, String languageCode); + + + +} diff --git a/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java b/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java new file mode 100644 index 0000000..666769c --- /dev/null +++ b/src/main/java/com/gaotao/modules/sys/service/impl/FavoriteFunctionsServiceImpl.java @@ -0,0 +1,19 @@ +package com.gaotao.modules.sys.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gaotao.modules.sys.dao.FavoriteFunctionsDao; +import com.gaotao.modules.sys.entity.FavoriteFunctions; +import com.gaotao.modules.sys.entity.SysMenuEntity; +import com.gaotao.modules.sys.service.FavoriteFunctionsService; +import org.springframework.stereotype.Service; + +import java.util.List; + +@Service("favoriteFunctionsService") +public class FavoriteFunctionsServiceImpl extends ServiceImpl implements FavoriteFunctionsService { + + public List userMenuFavoriteList(Long userId,String languageCode){ + List sysMenuEntities = baseMapper.userMenuFavoriteList(userId, languageCode); + return sysMenuEntities; + } +} diff --git a/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml b/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml new file mode 100644 index 0000000..2e46987 --- /dev/null +++ b/src/main/resources/mapper/sys/FavoriteFunctionsDao.xml @@ -0,0 +1,23 @@ + + + + + + + \ No newline at end of file