Alawn/slife
1
0
Fork 0
mirror of https://gitee.com/jamen/slife.git synced 2026-10-27 20:43:38 +00:00
Code Issues Releases Wiki Activity

fix plus api

Browse Source
This commit is contained in:
felixu
2019-03-17 12:10:59 +08:00
parent 05f1e5e8e4
commit 7dcf676dbc
6 changed files with 23 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
slife-sys/src/main/java/com/slife/service/impl/SysDictService.java
+3 -2
View File
@@ -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<SysDictDao, SysDict> implements
@Override
public List<JsTree> getDictTree() {
log.info("[SysDictService#getDictTree] ---> select tree");
return list(Wrappers.lambdaQuery(new SysDict()).orderByAsc(SysDict::getSort)).stream().map(dict -> {
return list(new QueryWrapper<SysDict>().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<SysDictDao, SysDict> implements
if (sysDict != null) {
//删除
remove(Wrappers.lambdaQuery(new SysDict()).likeRight(SysDict::getPath, sysDict.getPath()));
remove(new QueryWrapper<SysDict>().lambda().likeRight(SysDict::getPath, sysDict.getPath()));
} else {
status.setSuccess(false);
status.setMessage("该数据不存在");
slife-sys/src/main/java/com/slife/service/impl/SysMenuService.java
+5 -4
View File
@@ -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<SysMenuDao, SysMenu> implements
public void disableMenu(Long id) {
SysMenu sysMenu = getById(id);
Optional.ofNullable(sysMenu).orElseThrow(() -> new SlifeException(HttpCodeEnum.NOT_FOUND));
List<SysMenu> delList = list(Wrappers.lambdaQuery(new SysMenu()).likeRight(SysMenu::getPath, sysMenu.getPath()));
List<SysMenu> delList = list(new QueryWrapper<SysMenu>().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<SysMenuDao, SysMenu> implements
public Boolean deleteMenu(Long id) {
SysMenu sysMenu = getById(id);
Optional.ofNullable(sysMenu).orElseThrow(() -> new SlifeException(HttpCodeEnum.NOT_FOUND));
List<Long> ids = list(Wrappers.lambdaQuery(new SysMenu()).likeRight(SysMenu::getPath, sysMenu.getPath()))
List<Long> ids = list(new QueryWrapper<SysMenu>().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<SysRoleMenu>().lambda().in(SysRoleMenu::getSysMenuId, ids));
return true;
}
@@ -152,6 +153,6 @@ public class SysMenuService extends BaseService<SysMenuDao, SysMenu> implements
*/
@Override
public List<JsTree> getMenuTree() {
return makeTree(list(Wrappers.lambdaQuery(new SysMenu()).orderByAsc(SysMenu::getSort)));
return makeTree(list(new QueryWrapper<SysMenu>().lambda().orderByAsc(SysMenu::getSort)));
}
}
slife-sys/src/main/java/com/slife/service/impl/SysOfficeService.java
+2 -1
View File
@@ -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<SysOfficeDao, SysOffice> imple
*/
@Override
public List<JsTree> getOfficeTree() {
return makeTree(list(Wrappers.lambdaQuery(new SysOffice()).orderByAsc(SysOffice::getSort)));
return makeTree(list(new QueryWrapper<SysOffice>().lambda().orderByAsc(SysOffice::getSort)));
}
slife-sys/src/main/java/com/slife/service/impl/SysRoleService.java
+8 -7
View File
@@ -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<SysRoleDao, SysRole> implements
*/
@Override
public List<JsTree> selectMenuTreeHasSelectDis(Long roleId,Boolean disable) {
List<SysRoleMenu> roleMenus = sysRoleMenuService.list(Wrappers.lambdaQuery(new SysRoleMenu()).eq(SysRoleMenu::getSysRoleId, roleId));
List<SysRoleMenu> roleMenus = sysRoleMenuService.list(new QueryWrapper<SysRoleMenu>().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<SysRoleDao, SysRole> implements
*/
@Override
public List<SysRole> ListSysRoleUseable() {
return list(Wrappers.lambdaQuery(new SysRole()).eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES));
return list(new QueryWrapper<SysRole>().lambda().eq(SysRole::getDelFlag, Global.DEL_FLAG_NORMAL).eq(SysRole::getUseable, Global.YES));
}
/**
@@ -137,11 +138,11 @@ public class SysRoleService extends BaseService<SysRoleDao, SysRole> implements
*/
@Override
public List<SysRole> listSysRoleByUser(Long userId) {
List<Long> roleIds = sysUserRoleService.list(Wrappers.lambdaQuery(new SysUserRole()).eq(SysUserRole::getSysUserId, userId))
List<Long> roleIds = sysUserRoleService.list(new QueryWrapper<SysUserRole>().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<SysRole>().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<SysRoleDao, SysRole> implements
public void insertSysRole(Long userId, Long[] ids) {
//删除现有的用户角色
sysUserRoleService.remove(Wrappers.lambdaQuery(new SysUserRole()).eq(SysUserRole::getSysUserId, userId));
sysUserRoleService.remove(new QueryWrapper<SysUserRole>().lambda().eq(SysUserRole::getSysUserId, userId));
if (null != ids && ids.length > 0) {
List<SysUserRole> sysUserRoles = Arrays.stream(ids).parallel()
.map(roleId -> new SysUserRole(userId, roleId))
@@ -179,7 +180,7 @@ public class SysRoleService extends BaseService<SysRoleDao, SysRole> implements
saveOrUpdate(sysRole);
Long roleId = sysRole.getId();
//删除现有的 角色 菜单
sysRoleMenuService.remove(Wrappers.lambdaQuery(new SysRoleMenu()).eq(SysRoleMenu::getSysRoleId, roleId));
sysRoleMenuService.remove(new QueryWrapper<SysRoleMenu>().lambda().eq(SysRoleMenu::getSysRoleId, roleId));
if (null != menuIds && menuIds.length > 0) {
List<SysRoleMenu> sysRoleMenu = Arrays.stream(menuIds).parallel()
.map(menuId -> new SysRoleMenu(menuId, roleId))
@@ -198,7 +199,7 @@ public class SysRoleService extends BaseService<SysRoleDao, SysRole> 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<SysRole>().lambda().eq(SysRole::getCode, code));
return sysRole == null || !id.equals(0L) && sysRole.getId().equals(id);
}
slife-sys/src/main/java/com/slife/service/impl/SysUserOfficeService.java
+3 -2
View File
@@ -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<SysUserOfficeDao, SysUserO
List<Long> 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<SysUser>().lambda().in(SysUser::getId, userIds));
}
sysUserDataTable.setRows(sysUsers);
sysUserDataTable.setTotal(userOffices.getTotal());
@@ -70,7 +71,7 @@ public class SysUserOfficeService extends BaseService<SysUserOfficeDao, SysUserO
@Transactional(rollbackFor = Exception.class)
@Override
public void removeUsers(Long officeId, Long[] userIds) {
remove(Wrappers.lambdaQuery(new SysUserOffice()).eq(SysUserOffice::getSysOfficeId, officeId).in(SysUserOffice::getSysUserId, userIds));
remove(new QueryWrapper<SysUserOffice>().lambda().eq(SysUserOffice::getSysOfficeId, officeId).in(SysUserOffice::getSysUserId, userIds));
}
/**
slife-sys/src/main/java/com/slife/service/impl/SysUserService.java
+2 -1
View File
@@ -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<SysUserDao, SysUser> 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<SysUser>().lambda().eq(SysUser::getLoginName, loginName));
return sysUser == null || !id.equals(0L) && sysUser.getId().equals(id);
}