From e3c3ca6dcc26a77354a9b885516f5653336cc651 Mon Sep 17 00:00:00 2001 From: zhangzhiqiang Date: Fri, 16 Dec 2022 14:32:00 +0800 Subject: [PATCH] 1 --- .../modules/common/utils/SecurityUtils.java | 2 +- .../modules/common/utils/dto/CurrentUser.java | 2 +- .../service/impl/QuartzJobServiceImpl.java | 2 +- .../modules/system/rest/RoleController.java | 4 ++ .../service/impl/DictDetailServiceImpl.java | 6 +- .../system/service/impl/DictService2Impl.java | 8 +-- .../service/impl/GenCodeServiceImpl.java | 2 +- .../service/impl/GridFieldServiceImpl.java | 4 +- .../system/service/impl/GridServiceImpl.java | 2 +- .../service/impl/LocalStorageServiceImpl.java | 2 +- .../impl/DataPermissionServiceImpl.java | 12 ++-- .../service/dict/impl/SysDictServiceImpl.java | 20 +++---- .../system/service/menu/ISysMenuService.java | 2 +- .../menu/dao/mapper/SysMenuMapper.java | 2 +- .../service/menu/impl/SysMenuServiceImpl.java | 2 +- .../param/impl/SysParamServiceImpl.java | 10 ++-- .../service/role/impl/SysRoleServiceImpl.java | 4 +- .../template/generator/admin/ServiceImpl.ftl | 6 +- .../src/test/java/org/nl/sso/DictTest.java | 56 ------------------- .../src/test/java/org/nl/sso/MybatisTest.java | 28 ---------- .../nl/sso/NlssoServerApplicationTests.java | 13 ----- .../src/test/java/org/nl/sso/ParamTest.java | 56 ------------------- 22 files changed, 48 insertions(+), 197 deletions(-) delete mode 100644 nladmin-system/nlsso-server/src/test/java/org/nl/sso/DictTest.java delete mode 100644 nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java delete mode 100644 nladmin-system/nlsso-server/src/test/java/org/nl/sso/NlssoServerApplicationTests.java delete mode 100644 nladmin-system/nlsso-server/src/test/java/org/nl/sso/ParamTest.java diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/SecurityUtils.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/SecurityUtils.java index aa31f86..d031dd1 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/SecurityUtils.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/SecurityUtils.java @@ -58,7 +58,7 @@ public class SecurityUtils { * * @return 系统用户Id */ - public static Long getCurrentUserId() { + public static String getCurrentUserId() { return getCurrentUser().getId(); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java index 276948e..decc97d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/common/utils/dto/CurrentUser.java @@ -17,7 +17,7 @@ import java.util.List; @Data public class CurrentUser implements Serializable { @JsonSerialize(using = ToStringSerializer.class) - private Long id; + private String id; //账号 private String username; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java index a4f5537..fd6d93f 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/quartz/service/impl/QuartzJobServiceImpl.java @@ -61,7 +61,7 @@ public class QuartzJobServiceImpl implements QuartzJobService { throw new BadRequestException("cron表达式格式错误"); } WQLObject quartzTab = WQLObject.getWQLObject("sys_quartz_job"); - Long userId = SecurityUtils.getCurrentUserId(); + String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); resources.put("job_id", IdUtil.getSnowflake(1,1).nextId()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java index 1040754..9be185c 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/rest/RoleController.java @@ -3,6 +3,7 @@ package org.nl.modules.system.rest; import cn.dev33.satoken.annotation.SaCheckPermission; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.google.common.collect.Lists; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import lombok.RequiredArgsConstructor; @@ -10,6 +11,9 @@ import org.nl.modules.logging.annotation.Log; import org.nl.modules.system.domain.vo.RoleVo; import org.nl.modules.system.service.RoleService; import org.nl.modules.wql.core.bean.WQLObject; +import org.nl.system.service.role.ISysRoleService; +import org.nl.system.service.role.dao.SysRole; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.domain.Pageable; import org.springframework.http.HttpStatus; import org.springframework.http.ResponseEntity; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java index bbcffe8..2adb5ee 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictDetailServiceImpl.java @@ -86,10 +86,10 @@ public class DictDetailServiceImpl implements DictDetailService { resources.setDict_id(IdUtil.getSnowflake(1, 1).nextId()); resources.setCode(dictObj.getString("code")); resources.setName(dictObj.getString("name")); - resources.setCreate_id(SecurityUtils.getCurrentUserId()); + resources.setCreate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); resources.setCreate_name(SecurityUtils.getCurrentNickName()); resources.setCreate_time(DateUtil.now()); - resources.setUpdate_id(SecurityUtils.getCurrentUserId()); + resources.setUpdate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); resources.setUpdate_optname(SecurityUtils.getCurrentNickName()); resources.setUpdate_time(DateUtil.now()); JSONObject json = JSONObject.parseObject(JSON.toJSONString(resources)); @@ -106,7 +106,7 @@ public class DictDetailServiceImpl implements DictDetailService { } dto.setUpdate_time(DateUtil.now()); dto.setUpdate_optname(SecurityUtils.getCurrentNickName()); - dto.setUpdate_id(SecurityUtils.getCurrentUserId()); + dto.setUpdate_id(Long.valueOf(SecurityUtils.getCurrentUserId())); JSONObject json = JSONObject.parseObject(JSON.toJSONString(dto)); dictTab.update(json); // 清理缓存 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictService2Impl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictService2Impl.java index 8f9931f..b4f50e9 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictService2Impl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/DictService2Impl.java @@ -75,13 +75,13 @@ public class DictService2Impl implements DictService2 { WQLObject wo = WQLObject.getWQLObject("sys_dict"); JSONObject object = wo.query("code = '" + dto.getCode() + "'").uniqueResult(0); if (ObjectUtil.isNotEmpty(object)) throw new BadRequestException("字典[" + dto.getCode() + "]已存在"); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String date = DateUtil.now(); dto.setDict_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); + dto.setCreate_id(Long.valueOf(currentUserId)); dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); + dto.setUpdate_id(Long.valueOf(currentUserId)); dto.setUpdate_optname(nickName); dto.setUpdate_time(date); dto.setCreate_time(date); @@ -93,7 +93,7 @@ public class DictService2Impl implements DictService2 { @Transactional(rollbackFor = Exception.class) public void update(DictDto dto) { WQLObject wo = WQLObject.getWQLObject("sys_dict"); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); JSONObject otherObj = wo.query("dict_id = '" + dto.getDict_id() + "'").uniqueResult(0); JSONArray dictArray = wo.query("code = '" + otherObj.getString("code") + "'").getResultJSONArray(0); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java index 52640b0..87324e3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GenCodeServiceImpl.java @@ -48,7 +48,7 @@ public class GenCodeServiceImpl implements GenCodeService { @Override public void create(Map form) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String currentUsername = SecurityUtils.getCurrentUsername(); WQLObject wql = WQLObject.getWQLObject("sys_code_rule"); JSONObject json = new JSONObject(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java index 8e73bd6..5ce2b94 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridFieldServiceImpl.java @@ -47,7 +47,7 @@ public class GridFieldServiceImpl implements GridFieldService { @Transactional(rollbackFor = Exception.class) public void create(GridFieldDto dto) { String currentUsername = SecurityUtils.getCurrentUsername(); - Long uid = SecurityUtils.getCurrentUserId(); + String uid = SecurityUtils.getCurrentUserId(); String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); @@ -108,7 +108,7 @@ public class GridFieldServiceImpl implements GridFieldService { JSONArray fieldDatas = json.getJSONArray("gridFieldData"); WQLObject wo = WQLObject.getWQLObject("sys_grid_field"); String currentUsername = SecurityUtils.getCurrentUsername(); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); // 先删除原先所有的数据 wo.delete("grid_id = '" + grid_id + "'"); // 然后添加 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java index 6e53552..c8d6a26 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/system/service/impl/GridServiceImpl.java @@ -44,7 +44,7 @@ public class GridServiceImpl implements GridService { @Transactional(rollbackFor = Exception.class) public void create(GridDto dto) { String currentUsername = SecurityUtils.getCurrentUsername(); - Long uid = SecurityUtils.getCurrentUserId(); + String uid = SecurityUtils.getCurrentUserId(); String now = DateUtil.now(); dto.setId(IdUtil.simpleUUID()); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java index 4179342..0cc0db4 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/modules/tools/service/impl/LocalStorageServiceImpl.java @@ -71,7 +71,7 @@ public class LocalStorageServiceImpl implements LocalStorageService { throw new BadRequestException("上传失败"); } try { - Long userId = SecurityUtils.getCurrentUserId(); + String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); name = StrUtil.isEmpty(name) ? FileUtil.getFileNameNoEx(multipartFile.getOriginalFilename()) : name; diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/service/impl/DataPermissionServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/service/impl/DataPermissionServiceImpl.java index b398698..2e85d90 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/sso/service/impl/DataPermissionServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/sso/service/impl/DataPermissionServiceImpl.java @@ -74,14 +74,14 @@ public class DataPermissionServiceImpl implements DataPermissionService { @Override @Transactional(rollbackFor = Exception.class) public void create(DataPermissionDto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); dto.setPermission_id(IdUtil.getSnowflake(1, 1).nextId()); - dto.setCreate_id(currentUserId); + dto.setCreate_id(Long.valueOf(currentUserId)); dto.setCreate_name(nickName); - dto.setUpdate_id(currentUserId); + dto.setUpdate_id(Long.valueOf(currentUserId)); dto.setUpdate_optname(nickName); dto.setUpdate_time(now); dto.setCreate_time(now); @@ -97,12 +97,12 @@ public class DataPermissionServiceImpl implements DataPermissionService { DataPermissionDto entity = this.findById(dto.getPermission_id()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); dto.setUpdate_time(now); - dto.setUpdate_id(currentUserId); + dto.setUpdate_id(Long.valueOf(currentUserId)); dto.setUpdate_optname(nickName); WQLObject wo = WQLObject.getWQLObject("sys_data_permission"); @@ -113,7 +113,7 @@ public class DataPermissionServiceImpl implements DataPermissionService { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(Long[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java index ad0b3fc..2a76616 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/dict/impl/SysDictServiceImpl.java @@ -54,7 +54,7 @@ public class SysDictServiceImpl extends ServiceImpl impleme @Override @Transactional(rollbackFor = Exception.class) public void create(Dict dict) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String date = DateUtil.now(); Dict oldDict = sysDictMapper.selectOne(new LambdaQueryWrapper() @@ -64,8 +64,8 @@ public class SysDictServiceImpl extends ServiceImpl impleme dict.setCreateId(currentUserId); dict.setCreateName(nickName); dict.setCreateTime(date); - dict.setupdateId(currentUserId); - dict.setupdateName(nickName); + dict.setUpdateId(currentUserId); + dict.setUpdateName(nickName); dict.setUpdateTime(date); sysDictMapper.insert(dict); } @@ -76,15 +76,15 @@ public class SysDictServiceImpl extends ServiceImpl impleme Dict dict1 = sysDictMapper.selectOne(new LambdaQueryWrapper().eq(Dict::getCode, dto.getCode())); if (ObjectUtil.isNotEmpty(dict1)) throw new BadRequestException("字典[" + dict1.getCode() + "]已存在"); Dict dict = sysDictMapper.selectById(dto.getDictId()); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String currentNickName = SecurityUtils.getCurrentNickName(); // 根据code获取所有字典 List dicts = sysDictMapper.selectList(new LambdaQueryWrapper().eq(Dict::getCode, dict.getCode())); dicts.forEach(di -> { di.setCode(dto.getCode()); di.setName(dto.getName()); - di.setupdateId(currentUserId); - di.setupdateName(currentNickName); + di.setUpdateId(currentUserId); + di.setUpdateName(currentNickName); di.setUpdateTime(DateUtil.now()); sysDictMapper.updateById(di); }); @@ -139,8 +139,8 @@ public class SysDictServiceImpl extends ServiceImpl impleme dict.setCreateId(SecurityUtils.getCurrentUserId()); dict.setCreateName(SecurityUtils.getCurrentNickName()); dict.setCreateTime(DateUtil.now()); - dict.setupdateId(SecurityUtils.getCurrentUserId()); - dict.setupdateName(SecurityUtils.getCurrentNickName()); + dict.setUpdateId(SecurityUtils.getCurrentUserId()); + dict.setUpdateName(SecurityUtils.getCurrentNickName()); dict.setUpdateTime(DateUtil.now()); sysDictMapper.insert(dict); } @@ -154,8 +154,8 @@ public class SysDictServiceImpl extends ServiceImpl impleme Dict one = sysDictMapper.selectOne(new LambdaQueryWrapper().eq(Dict::getLabel, dict.getLabel()) .eq(Dict::getCode, dict.getCode())); if (ObjectUtil.isNotEmpty(one)) throw new BadRequestException("标签[" + dict.getLabel() + "]已存在"); - resources.setupdateId(SecurityUtils.getCurrentUserId()); - resources.setupdateName(SecurityUtils.getCurrentNickName()); + resources.setUpdateId(SecurityUtils.getCurrentUserId()); + resources.setUpdateName(SecurityUtils.getCurrentNickName()); resources.setUpdateTime(DateUtil.now()); sysDictMapper.updateById(resources); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java index e813601..fc312bc 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/ISysMenuService.java @@ -73,7 +73,7 @@ public interface ISysMenuService extends IService { void update(SysMenu menu); - List findByUser(Long userId); + List findByUser(String userId); /** * 构建菜单树 diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java index 5bdff7f..56838c8 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/dao/mapper/SysMenuMapper.java @@ -28,6 +28,6 @@ public interface SysMenuMapper extends BaseMapper { * @param userId 用户标识 * @return 当前用户拥有的菜单列表 */ - List findByUser(@Param("userId") Long userId); + List findByUser(@Param("userId") String userId); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java index af079ba..5ce6f32 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/menu/impl/SysMenuServiceImpl.java @@ -163,7 +163,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl } @Override - public List findByUser(Long userId) { + public List findByUser(String userId) { return baseMapper.findByUser(userId).stream().map(menu -> this.doToDto(menu)).collect(Collectors.toList()); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java index 625b6f4..07f660d 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/param/impl/SysParamServiceImpl.java @@ -48,14 +48,14 @@ public class SysParamServiceImpl extends ServiceImpl impl List code = paramMapper.selectByMap(MapOf.of("code", param.getCode())); if (ObjectUtil.isNotEmpty(code)) throw new BadRequestException("编码不能一致"); param.setId(IdUtil.getSnowflake(1,1).nextIdStr()); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); param.setCreateId(currentUserId); param.setCreateName(nickName); param.setCreateTime(now); - param.setupdateId(currentUserId); - param.setupdateName(nickName); + param.setUpdateId(currentUserId); + param.setUpdateName(nickName); param.setUpdateTime(now); paramMapper.insert(param); } @@ -65,8 +65,8 @@ public class SysParamServiceImpl extends ServiceImpl impl public void update(Param param) { Param paramObj = paramMapper.selectById(param.getId()); if (ObjectUtil.isEmpty(paramObj)) throw new BadRequestException("被删除或无权限，操作失败!"); - param.setupdateId(SecurityUtils.getCurrentUserId()); - param.setupdateName(SecurityUtils.getCurrentNickName()); + param.setUpdateId(SecurityUtils.getCurrentUserId()); + param.setUpdateName(SecurityUtils.getCurrentNickName()); param.setUpdateTime(DateUtil.now()); paramMapper.updateById(param); } diff --git a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java index c6af28c..5a773b3 100644 --- a/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java +++ b/nladmin-system/nlsso-server/src/main/java/org/nl/system/service/role/impl/SysRoleServiceImpl.java @@ -67,7 +67,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl //判断角色名字是否存在 SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName())); if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); - Long userId = SecurityUtils.getCurrentUserId(); + String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); // 插入 @@ -93,7 +93,7 @@ public class SysRoleServiceImpl extends ServiceImpl impl SysRole role = roleMapper.selectOne(new LambdaQueryWrapper().eq(SysRole::getName, sysRole.getName()) .ne(SysRole::getRoleId, sysRole.getRoleId())); if (ObjectUtil.isNotEmpty(role)) throw new BadRequestException("角色【" + name + "】已存在!"); - Long userId = SecurityUtils.getCurrentUserId(); + String userId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); sysRole.setUpdateId(userId); diff --git a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl index a5d945f..21226bf 100644 --- a/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl +++ b/nladmin-system/nlsso-server/src/main/resources/template/generator/admin/ServiceImpl.ftl @@ -73,7 +73,7 @@ public class ${className}ServiceImpl implements ${className}Service { @Override @Transactional(rollbackFor = Exception.class) public void create(${className}Dto dto) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -96,7 +96,7 @@ public class ${className}ServiceImpl implements ${className}Service { ${className}Dto entity = this.findById(dto.get${pkChangeColName ? cap_first }()); if (entity == null) throw new BadRequestException("被删除或无权限，操作失败!"); - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); @@ -112,7 +112,7 @@ public class ${className}ServiceImpl implements ${className}Service { @Override @Transactional(rollbackFor = Exception.class) public void deleteAll(${pkColumnType}[] ids) { - Long currentUserId = SecurityUtils.getCurrentUserId(); + String currentUserId = SecurityUtils.getCurrentUserId(); String nickName = SecurityUtils.getCurrentNickName(); String now = DateUtil.now(); diff --git a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/DictTest.java b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/DictTest.java deleted file mode 100644 index 8c647ba..0000000 --- a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/DictTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.sso; - -import cn.hutool.core.util.ObjectUtil; -import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; -import com.baomidou.mybatisplus.core.metadata.IPage; -import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import org.junit.jupiter.api.Test; -import org.nl.AppRun; -import org.nl.system.service.dict.ISysDictService; -import org.nl.system.service.dict.dao.Dict; -import org.nl.system.service.dict.dao.mapper.SysDictMapper; -import org.nl.system.service.role.dao.mapper.SysRoleMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -/** - * @Author: lyd - * @Description: - * @Date: 2022/12/14 - */ -@SpringBootTest(classes = AppRun.class) -public class DictTest { - - @Autowired - SysDictMapper sysDictMapper; - @Autowired - SysRoleMapper sysRoleMapper; - - @Autowired - ISysDictService ISysDictService; - @Test - void QueryTest() { - String blurry = null; -// QueryWrapper queryWrapper = new QueryWrapper<>(); -// if (ObjectUtil.isNotEmpty(blurry)) { -// queryWrapper.like("code", blurry) -// .or() -// .like("name", blurry); -// } -// queryWrapper.orderBy(true, true, "code"); -// Page dictPage = new Page<>(0, 3); -// IPage dictIPage = dictMapper.selectPage(dictPage, queryWrapper); - LambdaQueryWrapper lam = new LambdaQueryWrapper<>(); - lam.like(ObjectUtil.isNotEmpty(blurry), Dict::getCode, blurry) - .or(ObjectUtil.isNotEmpty(blurry)) - .like(ObjectUtil.isNotEmpty(blurry), Dict::getName, blurry); - IPage pages = new Page<>(0, 3); - sysDictMapper.selectPage(pages, lam); - pages.getRecords().forEach(System.out::println); - } - - @Test - void show() { - sysRoleMapper.list().forEach(sysRole -> System.out.println(sysRole)); - } -} diff --git a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java deleted file mode 100644 index a143fa6..0000000 --- a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/MybatisTest.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.nl.sso; - -import org.junit.jupiter.api.Test; -import org.nl.AppRun; -import org.nl.system.service.menu.ISysMenuService; -import org.nl.system.service.menu.dao.SysMenu; -import org.springframework.boot.test.context.SpringBootTest; - -import javax.annotation.Resource; -import java.util.List; - -/* - * @author ZZQ - * @Date 2022/12/14 4:59 下午 - */ -//@RunWith(SpringRunner.class) -@SpringBootTest(classes = AppRun.class) -public class MybatisTest { - - @Resource - ISysMenuService iSysMenuService; - @Test - public void mybatisTest(){ - List sysUsers = iSysMenuService.findByPid(1597878521852727297L); - System.out.println(sysUsers); - } - -} diff --git a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/NlssoServerApplicationTests.java b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/NlssoServerApplicationTests.java deleted file mode 100644 index afd42c7..0000000 --- a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/NlssoServerApplicationTests.java +++ /dev/null @@ -1,13 +0,0 @@ -package org.nl.sso; - -import org.junit.jupiter.api.Test; -import org.springframework.boot.test.context.SpringBootTest; - -@SpringBootTest -class NlssoServerApplicationTests { - - @Test - void contextLoads() { - } - -} diff --git a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/ParamTest.java b/nladmin-system/nlsso-server/src/test/java/org/nl/sso/ParamTest.java deleted file mode 100644 index d91a664..0000000 --- a/nladmin-system/nlsso-server/src/test/java/org/nl/sso/ParamTest.java +++ /dev/null @@ -1,56 +0,0 @@ -package org.nl.sso; - -import cn.hutool.core.date.DateUtil; -import org.junit.jupiter.api.Test; -import org.nl.AppRun; -import org.nl.modules.tools.IdUtil; -import org.nl.modules.tools.MapOf; -import org.nl.system.service.param.ISysParamService; -import org.nl.system.service.param.dao.Param; -import org.nl.system.service.param.dao.mapper.SysParamMapper; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.boot.test.context.SpringBootTest; - -import java.util.Arrays; - -/** - * @Author: lyd - * @Description: - * @Date: 2022/12/14 - */ -@SpringBootTest(classes = AppRun.class) -public class ParamTest { - - @Autowired - ISysParamService paramService; - @Autowired - SysParamMapper paramMapper; - - @Test - public void createTest(){ - Param param = new Param(); - param.setId(IdUtil.getStringId()); - param.setCode("ccc"); - param.setName("测试code"); - param.setValue("1"); - param.setCreateId(1L); - param.setCreateName("admin"); - param.setCreateTime(DateUtil.now()); - paramService.create(param); - } - - @Test - public void updateTest(){ - Param o = (Param) paramMapper.selectByMap(MapOf.of("code", "ccc")).get(0); - o.setName("测试2"); - paramService.update(o); - } - - @Test - public void deleteTest(){ - Param o = (Param) paramMapper.selectByMap(MapOf.of("code", "codess")).get(0); - String[] ids = new String[2]; - ids[0] = o.getId(); - paramService.removeByIds(Arrays.asList(ids)); - } -}