From 7dcf676dbce347fdd4eaa0ec95ab972cf2657436 Mon Sep 17 00:00:00 2001 From: felixu Date: Sun, 17 Mar 2019 12:10:59 +0800 Subject: [PATCH] fix plus api --- .../com/slife/service/impl/SysDictService.java | 5 +++-- .../com/slife/service/impl/SysMenuService.java | 9 +++++---- .../com/slife/service/impl/SysOfficeService.java | 3 ++- .../com/slife/service/impl/SysRoleService.java | 15 ++++++++------- .../slife/service/impl/SysUserOfficeService.java | 5 +++-- .../com/slife/service/impl/SysUserService.java | 3 ++- 6 files changed, 23 insertions(+), 17 deletions(-) diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java index b69d5af..9e53768 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysDictService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; @@ -68,7 +69,7 @@ public class SysDictService extends BaseService implements @Override public List getDictTree() { log.info("[SysDictService#getDictTree] ---> select tree"); - return list(Wrappers.lambdaQuery(new SysDict()).orderByAsc(SysDict::getSort)).stream().map(dict -> { + return list(new QueryWrapper().lambda().orderByAsc(SysDict::getSort)).stream().map(dict -> { JsTree jt = new JsTree(); jt.setId(dict.getId().toString()); jt.setParent(dict.getParentId().compareTo(0L) > 0 ? dict.getParentId().toString() : "#"); @@ -137,7 +138,7 @@ public class SysDictService extends BaseService implements if (sysDict != null) { //删除 - remove(Wrappers.lambdaQuery(new SysDict()).likeRight(SysDict::getPath, sysDict.getPath())); + remove(new QueryWrapper().lambda().likeRight(SysDict::getPath, sysDict.getPath())); } else { status.setSuccess(false); status.setMessage("该数据不存在"); diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java b/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java index fa66088..adb4e98 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; @@ -42,7 +43,7 @@ public class SysMenuService extends BaseService implements public void disableMenu(Long id) { SysMenu sysMenu = getById(id); Optional.ofNullable(sysMenu).orElseThrow(() -> new SlifeException(HttpCodeEnum.NOT_FOUND)); - List delList = list(Wrappers.lambdaQuery(new SysMenu()).likeRight(SysMenu::getPath, sysMenu.getPath())); + List delList = list(new QueryWrapper().lambda().likeRight(SysMenu::getPath, sysMenu.getPath())); delList.stream().parallel().forEach(menu -> menu.setShowFlag(Global.NO)); updateBatchById(delList); //TODO 判断是否有角色，有角色要清理角色与资源关系 @@ -60,12 +61,12 @@ public class SysMenuService extends BaseService implements public Boolean deleteMenu(Long id) { SysMenu sysMenu = getById(id); Optional.ofNullable(sysMenu).orElseThrow(() -> new SlifeException(HttpCodeEnum.NOT_FOUND)); - List ids = list(Wrappers.lambdaQuery(new SysMenu()).likeRight(SysMenu::getPath, sysMenu.getPath())) + List ids = list(new QueryWrapper().lambda().likeRight(SysMenu::getPath, sysMenu.getPath())) .stream().parallel().map(SysMenu::getId) .collect(Collectors.toList()); removeByIds(ids); //删除对应的角色关联 - sysRoleMenuService.remove(Wrappers.lambdaQuery(new SysRoleMenu()).in(SysRoleMenu::getSysMenuId, ids)); + sysRoleMenuService.remove(new QueryWrapper().lambda().in(SysRoleMenu::getSysMenuId, ids)); return true; } @@ -152,6 +153,6 @@ public class SysMenuService extends BaseService implements */ @Override public List getMenuTree() { - return makeTree(list(Wrappers.lambdaQuery(new SysMenu()).orderByAsc(SysMenu::getSort))); + return makeTree(list(new QueryWrapper().lambda().orderByAsc(SysMenu::getSort))); } } diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java b/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java index bd22168..5a9d331 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.JsTree; @@ -31,7 +32,7 @@ public class SysOfficeService extends BaseService imple */ @Override public List getOfficeTree() { - return makeTree(list(Wrappers.lambdaQuery(new SysOffice()).orderByAsc(SysOffice::getSort))); + return makeTree(list(new QueryWrapper().lambda().orderByAsc(SysOffice::getSort))); } diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java index 2165b05..32c4c7c 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.slife.base.service.impl.BaseService; @@ -70,7 +71,7 @@ public class SysRoleService extends BaseService implements */ @Override public List selectMenuTreeHasSelectDis(Long roleId,Boolean disable) { - List roleMenus = sysRoleMenuService.list(Wrappers.lambdaQuery(new SysRoleMenu()).eq(SysRoleMenu::getSysRoleId, roleId)); + List roleMenus = sysRoleMenuService.list(new QueryWrapper().lambda().eq(SysRoleMenu::getSysRoleId, roleId)); return sysMenuService.list().stream().parallel().map(menu -> { JsTree jt = new JsTree(); jt.setId(menu.getId().toString()); @@ -109,7 +110,7 @@ public class SysRoleService extends BaseService implements */ @Override public List ListSysRoleUseable() { - return list(Wrappers.lambdaQuery(new SysRole()).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); + return list(new QueryWrapper().lambda().eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); } /** @@ -137,11 +138,11 @@ public class SysRoleService extends BaseService implements */ @Override public List listSysRoleByUser(Long userId) { - List roleIds = sysUserRoleService.list(Wrappers.lambdaQuery(new SysUserRole()).eq(SysUserRole::getSysUserId, userId)) + List roleIds = sysUserRoleService.list(new QueryWrapper().lambda().eq(SysUserRole::getSysUserId, userId)) .stream().parallel() .map(SysUserRole::getSysRoleId) .collect(Collectors.toList()); - return list(Wrappers.lambdaQuery(new SysRole()).in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); + return list(new QueryWrapper().lambda().in(SysRole::getId, roleIds).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES)); } /** @@ -155,7 +156,7 @@ public class SysRoleService extends BaseService implements public void insertSysRole(Long userId, Long[] ids) { //删除现有的用户角色 - sysUserRoleService.remove(Wrappers.lambdaQuery(new SysUserRole()).eq(SysUserRole::getSysUserId, userId)); + sysUserRoleService.remove(new QueryWrapper().lambda().eq(SysUserRole::getSysUserId, userId)); if (null != ids && ids.length > 0) { List sysUserRoles = Arrays.stream(ids).parallel() .map(roleId -> new SysUserRole(userId, roleId)) @@ -179,7 +180,7 @@ public class SysRoleService extends BaseService implements saveOrUpdate(sysRole); Long roleId = sysRole.getId(); //删除现有的 角色 菜单 - sysRoleMenuService.remove(Wrappers.lambdaQuery(new SysRoleMenu()).eq(SysRoleMenu::getSysRoleId, roleId)); + sysRoleMenuService.remove(new QueryWrapper().lambda().eq(SysRoleMenu::getSysRoleId, roleId)); if (null != menuIds && menuIds.length > 0) { List sysRoleMenu = Arrays.stream(menuIds).parallel() .map(menuId -> new SysRoleMenu(menuId, roleId)) @@ -198,7 +199,7 @@ public class SysRoleService extends BaseService implements */ @Override public Boolean checkRoleCode(String code, Long id) { - SysRole sysRole = getOne(Wrappers.lambdaQuery(new SysRole()).eq(SysRole::getCode, code)); + SysRole sysRole = getOne(new QueryWrapper().lambda().eq(SysRole::getCode, code)); return sysRole == null || !id.equals(0L) && sysRole.getId().equals(id); } diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysUserOfficeService.java b/slife-sys/src/main/java/com/slife/service/impl/SysUserOfficeService.java index abf1c48..6619445 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysUserOfficeService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysUserOfficeService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.base.vo.DataTable; @@ -51,7 +52,7 @@ public class SysUserOfficeService extends BaseService userIds = userOffices.getRows().stream().parallel() .map(SysUserOffice::getSysUserId) .collect(Collectors.toList()); - sysUsers = sysUserService.list(Wrappers.lambdaQuery(new SysUser()).in(SysUser::getId, userIds)); + sysUsers = sysUserService.list(new QueryWrapper().lambda().in(SysUser::getId, userIds)); } sysUserDataTable.setRows(sysUsers); sysUserDataTable.setTotal(userOffices.getTotal()); @@ -70,7 +71,7 @@ public class SysUserOfficeService extends BaseService().lambda().eq(SysUserOffice::getSysOfficeId, officeId).in(SysUserOffice::getSysUserId, userIds)); } /** diff --git a/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java b/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java index d19a188..292a8df 100644 --- a/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java +++ b/slife-sys/src/main/java/com/slife/service/impl/SysUserService.java @@ -1,5 +1,6 @@ package com.slife.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.toolkit.Wrappers; import com.slife.base.service.impl.BaseService; import com.slife.dao.SysUserDao; @@ -125,7 +126,7 @@ public class SysUserService extends BaseService implements */ @Override public Boolean checkLoginName(String loginName, Long id) { - SysUser sysUser = getOne(Wrappers.lambdaQuery(new SysUser()).eq(SysUser::getLoginName, loginName)); + SysUser sysUser = getOne(new QueryWrapper().lambda().eq(SysUser::getLoginName, loginName)); return sysUser == null || !id.equals(0L) && sysUser.getId().equals(id); }