msb_6557
/
opsli-boot
mirror of https://github.com/hiparker/opsli-boot.git
1
1
Code Issues Projects Releases Wiki Activity

perf: 优化基础验证

Browse Source
pull/9/head
Carina 4 years ago
parent 346fdfdcd9
commit cccb7e37dc
14 changed files with 142 additions and 112 deletions
Show Stats Download Patch File Download Diff File

18
opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/column/service/impl/GenTableColumnServiceImpl.java
Unescape View File

@ -59,8 +59,8 @@ public class GenTableColumnServiceImpl extends CrudServiceImpl<GenTableColumnMap
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByFieldName(model); boolean verificationByFieldName = this.uniqueVerificationByFieldName(model);
if(count != null && count > 0){ if(!verificationByFieldName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT);
} }
@ -87,8 +87,8 @@ public class GenTableColumnServiceImpl extends CrudServiceImpl<GenTableColumnMap
ValidatorUtil.verify(model); ValidatorUtil.verify(model);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByFieldName(model); boolean verificationByFieldName = this.uniqueVerificationByFieldName(model);
if(count != null && count > 0){ if(!verificationByFieldName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT);
} }
@ -120,8 +120,8 @@ public class GenTableColumnServiceImpl extends CrudServiceImpl<GenTableColumnMap
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByFieldName(model); boolean verificationByFieldName = this.uniqueVerificationByFieldName(model);
if(count != null && count > 0){ if(!verificationByFieldName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_COLUMN_FIELD_NAME_REPEAT);
} }
@ -179,9 +179,9 @@ public class GenTableColumnServiceImpl extends CrudServiceImpl<GenTableColumnMap
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByFieldName(GenTableColumnModel model){ public boolean uniqueVerificationByFieldName(GenTableColumnModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<GenTableColumn> wrapper = new QueryWrapper<>(); QueryWrapper<GenTableColumn> wrapper = new QueryWrapper<>();
@ -194,7 +194,7 @@ public class GenTableColumnServiceImpl extends CrudServiceImpl<GenTableColumnMap
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
} }

14
opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/table/service/impl/GenTableServiceImpl.java
Unescape View File

@ -71,8 +71,8 @@ public class GenTableServiceImpl extends CrudServiceImpl<GenTableMapper, GenTabl
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByTableName(model); boolean verificationByTableName = this.uniqueVerificationByTableName(model);
if(count != null && count > 0){ if(!verificationByTableName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_NAME_REPEAT);
} }
@ -97,8 +97,8 @@ public class GenTableServiceImpl extends CrudServiceImpl<GenTableMapper, GenTabl
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByTableName(model); boolean verificationByTableName = this.uniqueVerificationByTableName(model);
if(count != null && count > 0){ if(!verificationByTableName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TABLE_NAME_REPEAT);
} }
@ -261,9 +261,9 @@ public class GenTableServiceImpl extends CrudServiceImpl<GenTableMapper, GenTabl
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByTableName(GenTableModel model){ public boolean uniqueVerificationByTableName(GenTableModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<GenTable> wrapper = new QueryWrapper<>(); QueryWrapper<GenTable> wrapper = new QueryWrapper<>();
@ -275,7 +275,7 @@ public class GenTableServiceImpl extends CrudServiceImpl<GenTableMapper, GenTabl
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
} }

19
opsli-modulars/opsli-modulars-generator/src/main/java/org/opsli/modulars/generator/template/service/impl/GenTemplateServiceImpl.java
Unescape View File

@ -71,8 +71,8 @@ public class GenTemplateServiceImpl extends CrudServiceImpl<GenTemplateMapper, G
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByTemplateName(model); boolean verificationByTemplateName = this.uniqueVerificationByTemplateName(model);
if(count != null && count > 0){ if(!verificationByTemplateName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT);
} }
@ -103,8 +103,8 @@ public class GenTemplateServiceImpl extends CrudServiceImpl<GenTemplateMapper, G
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByTemplateName(model); boolean verificationByTemplateName = this.uniqueVerificationByTemplateName(model);
if(count != null && count > 0){ if(!verificationByTemplateName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT);
} }
@ -144,10 +144,11 @@ public class GenTemplateServiceImpl extends CrudServiceImpl<GenTemplateMapper, G
GenTemplateModel genTemplateModel = this.get(model.getId()); GenTemplateModel genTemplateModel = this.get(model.getId());
model.setId(null); model.setId(null);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByTemplateName( boolean verificationByTemplateName = this.uniqueVerificationByTemplateName(
WrapperUtil.transformInstance(model, GenTemplateAndDetailModel.class)); WrapperUtil.transformInstance(model, GenTemplateAndDetailModel.class));
if(count != null && count > 0){ if(!verificationByTemplateName){
// 重复 // 重复
throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT); throw new GeneratorException(GeneratorMsg.EXCEPTION_TEMPLATE_NAME_REPEAT);
} }
@ -224,9 +225,9 @@ public class GenTemplateServiceImpl extends CrudServiceImpl<GenTemplateMapper, G
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByTemplateName(GenTemplateAndDetailModel model){ public boolean uniqueVerificationByTemplateName(GenTemplateAndDetailModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<GenTemplate> wrapper = new QueryWrapper<>(); QueryWrapper<GenTemplate> wrapper = new QueryWrapper<>();
@ -238,7 +239,7 @@ public class GenTemplateServiceImpl extends CrudServiceImpl<GenTemplateMapper, G
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
// ==================== // ====================

2
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/SystemMsg.java
Unescape View File

@ -46,7 +46,7 @@ public enum SystemMsg implements BaseMsg {
/** /**
* 角色 * 角色
*/ */
EXCEPTION_ROLE_UNIQUE(20200,"角色编号重复，该角色已存在"), EXCEPTION_ROLE_UNIQUE(20200,"角色编号或名称重复，该角色已存在！"),
EXCEPTION_ROLE_ID_NOT_NULL(20201,"角色Id不可为空"), EXCEPTION_ROLE_ID_NOT_NULL(20201,"角色Id不可为空"),
EXCEPTION_ROLE_PERMS_ERROR(20202,"角色权限设置失败"), EXCEPTION_ROLE_PERMS_ERROR(20202,"角色权限设置失败"),

17
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/area/service/impl/SysAreaServiceImpl.java
Unescape View File

@ -70,8 +70,8 @@ public class SysAreaServiceImpl extends CrudServiceImpl<SysAreaMapper, SysArea,
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_AREA_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_AREA_UNIQUE);
} }
@ -92,8 +92,8 @@ public class SysAreaServiceImpl extends CrudServiceImpl<SysAreaMapper, SysArea,
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_AREA_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_AREA_UNIQUE);
} }
@ -149,22 +149,21 @@ public class SysAreaServiceImpl extends CrudServiceImpl<SysAreaMapper, SysArea,
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByCode(SysAreaModel model){ public boolean uniqueVerificationByCode(SysAreaModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysArea> wrapper = new QueryWrapper<>(); QueryWrapper<SysArea> wrapper = new QueryWrapper<>();
// code 唯一 // code 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("area_code", model.getAreaCode());
.eq("area_code", model.getAreaCode());
// 重复校验排除自身 // 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){ if(StringUtils.isNotEmpty(model.getId())){
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }

17
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictDetailServiceImpl.java
Unescape View File

@ -67,8 +67,8 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
public DictDetailModel insert(DictDetailModel model) { public DictDetailModel insert(DictDetailModel model) {
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByNameOrValue(model); boolean verificationByNameOrValue = this.uniqueVerificationByNameOrValue(model);
if(count != null && count > 0){ if(!verificationByNameOrValue){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_DICT_DETAIL_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_DICT_DETAIL_UNIQUE);
} }
@ -97,8 +97,8 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
public DictDetailModel update(DictDetailModel model) { public DictDetailModel update(DictDetailModel model) {
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByNameOrValue(model); boolean verificationByNameOrValue = this.uniqueVerificationByNameOrValue(model);
if(count != null && count > 0){ if(!verificationByNameOrValue){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_DICT_DETAIL_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_DICT_DETAIL_UNIQUE);
} }
@ -293,15 +293,14 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByNameOrValue(DictDetailModel model){ public boolean uniqueVerificationByNameOrValue(DictDetailModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysDictDetail> wrapper = new QueryWrapper<>(); QueryWrapper<SysDictDetail> wrapper = new QueryWrapper<>();
// name 唯一 // name 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("type_code", model.getTypeCode());
.eq("type_code", model.getTypeCode());
// 名称 或者 Val 重复 // 名称 或者 Val 重复
wrapper.and(wra -> wrapper.and(wra ->
@ -313,7 +312,7 @@ public class DictDetailServiceImpl extends CrudServiceImpl<DictDetailMapper, Sys
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
// ================ // ================

14
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/dict/service/impl/DictServiceImpl.java
Unescape View File

@ -57,8 +57,8 @@ public class DictServiceImpl extends CrudServiceImpl<DictMapper, SysDict, DictMo
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_DICT_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_DICT_UNIQUE);
} }
@ -74,8 +74,8 @@ public class DictServiceImpl extends CrudServiceImpl<DictMapper, SysDict, DictMo
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_DICT_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_DICT_UNIQUE);
} }
@ -165,9 +165,9 @@ public class DictServiceImpl extends CrudServiceImpl<DictMapper, SysDict, DictMo
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByCode(DictModel model){ public boolean uniqueVerificationByCode(DictModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysDict> wrapper = new QueryWrapper<>(); QueryWrapper<SysDict> wrapper = new QueryWrapper<>();
@ -180,7 +180,7 @@ public class DictServiceImpl extends CrudServiceImpl<DictMapper, SysDict, DictMo
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
} }

11
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/menu/service/impl/MenuServiceImpl.java
Unescape View File

@ -334,19 +334,18 @@ public class MenuServiceImpl extends CrudServiceImpl<MenuMapper, SysMenu, MenuMo
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByPermissions(MenuModel model){ public boolean uniqueVerificationByPermissions(MenuModel model){
if(model == null){ if(model == null){
return null; return false;
} }
if(!MenuConstants.BUTTON.equals(model.getType())){ if(!MenuConstants.BUTTON.equals(model.getType())){
return null; return true;
} }
QueryWrapper<SysMenu> wrapper = new QueryWrapper<>(); QueryWrapper<SysMenu> wrapper = new QueryWrapper<>();
// code 唯一 // code 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("permissions", model.getPermissions())
.eq("permissions", model.getPermissions())
.eq("type", MenuConstants.BUTTON); .eq("type", MenuConstants.BUTTON);
// 重复校验排除自身 // 重复校验排除自身
@ -354,7 +353,7 @@ public class MenuServiceImpl extends CrudServiceImpl<MenuMapper, SysMenu, MenuMo
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
/** /**

14
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/options/service/impl/SysOptionsServiceImpl.java
Unescape View File

@ -67,8 +67,8 @@ public class SysOptionsServiceImpl extends CrudServiceImpl<SysOptionsMapper, Sys
ValidatorUtil.verify(model); ValidatorUtil.verify(model);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_OPTIONS_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_OPTIONS_UNIQUE);
} }
@ -113,8 +113,8 @@ public class SysOptionsServiceImpl extends CrudServiceImpl<SysOptionsMapper, Sys
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_OPTIONS_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_OPTIONS_UNIQUE);
} }
@ -249,9 +249,9 @@ public class SysOptionsServiceImpl extends CrudServiceImpl<SysOptionsMapper, Sys
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByCode(OptionsModel model){ public boolean uniqueVerificationByCode(OptionsModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysOptions> wrapper = new QueryWrapper<>(); QueryWrapper<SysOptions> wrapper = new QueryWrapper<>();
wrapper.eq("option_code", model.getOptionCode()); wrapper.eq("option_code", model.getOptionCode());
@ -261,7 +261,7 @@ public class SysOptionsServiceImpl extends CrudServiceImpl<SysOptionsMapper, Sys
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
/** /**

17
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/service/impl/SysOrgServiceImpl.java
Unescape View File

@ -73,8 +73,8 @@ public class SysOrgServiceImpl extends CrudServiceImpl<SysOrgMapper, SysOrg, Sys
model.setParentIds(null); model.setParentIds(null);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_ORG_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_ORG_UNIQUE);
} }
@ -114,8 +114,8 @@ public class SysOrgServiceImpl extends CrudServiceImpl<SysOrgMapper, SysOrg, Sys
model.setParentIds(null); model.setParentIds(null);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ if(!verificationByCode){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_ORG_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_ORG_UNIQUE);
} }
@ -267,13 +267,12 @@ public class SysOrgServiceImpl extends CrudServiceImpl<SysOrgMapper, SysOrg, Sys
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByCode(SysOrgModel model){ public boolean uniqueVerificationByCode(SysOrgModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysOrg> wrapper = new QueryWrapper<>(); QueryWrapper<SysOrg> wrapper = new QueryWrapper<>();
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("org_code", model.getOrgCode());
.eq("org_code", model.getOrgCode());
// 重复校验排除自身 // 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){ if(StringUtils.isNotEmpty(model.getId())){
@ -283,7 +282,7 @@ public class SysOrgServiceImpl extends CrudServiceImpl<SysOrgMapper, SysOrg, Sys
// 租户检测 // 租户检测
wrapper = new QueryTenantHandler().handler(super.entityClazz, wrapper); wrapper = new QueryTenantHandler().handler(super.entityClazz, wrapper);
return super.count(wrapper); return super.count(wrapper) == 0;
} }

3
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/org/web/SysOrgRestController.java
Unescape View File

@ -92,8 +92,7 @@ public class SysOrgRestController extends BaseRestController<SysOrg, SysOrgModel
QueryBuilder<SysOrg> queryBuilder = new GenQueryBuilder<>(); QueryBuilder<SysOrg> queryBuilder = new GenQueryBuilder<>();
QueryWrapper<SysOrg> wrapper = queryBuilder.build(); QueryWrapper<SysOrg> wrapper = queryBuilder.build();
UserModel currUser = UserUtil.getUser(); List<UserOrgRefModel> orgListByUserId = OrgUtil.getOrgByCurrUser();
List<UserOrgRefModel> orgListByUserId = OrgUtil.getOrgListByUserId(currUser.getId());
if(!CollUtil.isEmpty(orgListByUserId)){ if(!CollUtil.isEmpty(orgListByUserId)){
List<String> parentIdList = Lists.newArrayListWithCapacity(orgListByUserId.size()); List<String> parentIdList = Lists.newArrayListWithCapacity(orgListByUserId.size());

51
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/role/service/impl/RoleServiceImpl.java
Unescape View File

@ -72,8 +72,9 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ boolean verificationByName = this.uniqueVerificationByName(model);
if(!verificationByCode || !verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_ROLE_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_ROLE_UNIQUE);
} }
@ -97,8 +98,9 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
} }
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByCode(model); boolean verificationByCode = this.uniqueVerificationByCode(model);
if(count != null && count > 0){ boolean verificationByName = this.uniqueVerificationByName(model);
if(!verificationByCode || !verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_ROLE_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_ROLE_UNIQUE);
} }
@ -176,30 +178,61 @@ public class RoleServiceImpl extends CrudServiceImpl<RoleMapper, SysRole, RoleMo
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByCode(RoleModel model){ public boolean uniqueVerificationByCode(RoleModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysRole> wrapper = new QueryWrapper<>(); QueryWrapper<SysRole> wrapper = new QueryWrapper<>();
// code 唯一 // code 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("role_code", model.getRoleCode());
.eq("role_code", model.getRoleCode());
// 重复校验排除自身 // 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){ if(StringUtils.isNotEmpty(model.getId())){
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
// 租户检测
// 数据处理责任链 // 数据处理责任链
wrapper = new QueryTenantHandler( wrapper = new QueryTenantHandler(
new QueryOrgHandler() new QueryOrgHandler()
).handler(entityClazz, wrapper); ).handler(entityClazz, wrapper);
return super.count(wrapper); return super.count(wrapper) == 0;
} }
/**
* 唯一验证
* @param model model
* @return Integer
*/
@Transactional(readOnly = true)
public boolean uniqueVerificationByName(RoleModel model){
if(model == null){
return false;
}
QueryWrapper<SysRole> wrapper = new QueryWrapper<>();
// code 唯一
wrapper.eq("role_name", model.getRoleName());
// 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
}
// 租户检测
// 数据处理责任链
wrapper = new QueryTenantHandler(
new QueryOrgHandler()
).handler(entityClazz, wrapper);
return super.count(wrapper) == 0;
}
} }

14
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/tenant/service/impl/TenantServiceImpl.java
Unescape View File

@ -113,8 +113,8 @@ public class TenantServiceImpl extends CrudServiceImpl<TenantMapper, SysTenant,
model.setEnable(DictType.NO_YES_NO.getValue()); model.setEnable(DictType.NO_YES_NO.getValue());
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByName(model); boolean verificationByName = this.uniqueVerificationByName(model);
if(count != null && count > 0){ if(!verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_TENANT_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_TENANT_UNIQUE);
} }
@ -132,8 +132,8 @@ public class TenantServiceImpl extends CrudServiceImpl<TenantMapper, SysTenant,
model.setEnable(null); model.setEnable(null);
// 唯一验证 // 唯一验证
Integer count = this.uniqueVerificationByName(model); boolean verificationByName = this.uniqueVerificationByName(model);
if(count != null && count > 0){ if(!verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_TENANT_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_TENANT_UNIQUE);
} }
@ -321,9 +321,9 @@ public class TenantServiceImpl extends CrudServiceImpl<TenantMapper, SysTenant,
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByName(TenantModel model){ public boolean uniqueVerificationByName(TenantModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysTenant> wrapper = new QueryWrapper<>(); QueryWrapper<SysTenant> wrapper = new QueryWrapper<>();
@ -336,7 +336,7 @@ public class TenantServiceImpl extends CrudServiceImpl<TenantMapper, SysTenant,
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
/** /**

41
opsli-modulars/opsli-modulars-system/src/main/java/org/opsli/modulars/system/user/service/impl/UserServiceImpl.java
Unescape View File

@ -99,15 +99,15 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
} }
} }
// 唯一验证 // 唯一验证 - 用户名
Integer count = this.uniqueVerificationByName(model); boolean verificationByName = this.uniqueVerificationByName(model);
if(count != null && count > 0){ if(!verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_USER_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_USER_UNIQUE);
} }
// 唯一验证 - 工号 // 唯一验证 - 工号
count = this.uniqueVerificationByNo(model); boolean verificationByNo = this.uniqueVerificationByNo(model);
if(count != null && count > 0){ if(!verificationByNo){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_USER_NO_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_USER_NO_UNIQUE);
} }
@ -190,14 +190,14 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
} }
// 唯一验证 - 用户名 // 唯一验证 - 用户名
Integer count = this.uniqueVerificationByName(model); boolean verificationByName = this.uniqueVerificationByName(model);
if(count != null && count > 0){ if(!verificationByName){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_USER_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_USER_UNIQUE);
} }
// 唯一验证 - 工号 // 唯一验证 - 工号
count = this.uniqueVerificationByNo(model); boolean verificationByNo = this.uniqueVerificationByNo(model);
if(count != null && count > 0){ if(!verificationByNo){
// 重复 // 重复
throw new ServiceException(SystemMsg.EXCEPTION_USER_NO_UNIQUE); throw new ServiceException(SystemMsg.EXCEPTION_USER_NO_UNIQUE);
} }
@ -748,15 +748,14 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByNo(UserModel model){ public boolean uniqueVerificationByNo(UserModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysUser> wrapper = new QueryWrapper<>(); QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
// no 唯一 // no 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("no", model.getNo());
.eq("no", model.getNo());
// 重复校验排除自身 // 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){ if(StringUtils.isNotEmpty(model.getId())){
@ -764,9 +763,12 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
} }
// 租户检测 // 租户检测
wrapper = new QueryTenantHandler().handler(super.entityClazz, wrapper); // 数据处理责任链
wrapper = new QueryTenantHandler(
new QueryOrgHandler()
).handler(entityClazz, wrapper);
return super.count(wrapper); return super.count(wrapper) == 0;
} }
/** /**
@ -775,22 +777,21 @@ public class UserServiceImpl extends CrudServiceImpl<UserMapper, SysUser, UserMo
* @return Integer * @return Integer
*/ */
@Transactional(readOnly = true) @Transactional(readOnly = true)
public Integer uniqueVerificationByName(UserModel model){ public boolean uniqueVerificationByName(UserModel model){
if(model == null){ if(model == null){
return null; return false;
} }
QueryWrapper<SysUser> wrapper = new QueryWrapper<>(); QueryWrapper<SysUser> wrapper = new QueryWrapper<>();
// name 唯一 // name 唯一
wrapper.eq(MyBatisConstants.FIELD_DELETE_LOGIC, DictType.NO_YES_NO.getValue()) wrapper.eq("username", model.getUsername());
.eq("username", model.getUsername());
// 重复校验排除自身 // 重复校验排除自身
if(StringUtils.isNotEmpty(model.getId())){ if(StringUtils.isNotEmpty(model.getId())){
wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId()); wrapper.notIn(MyBatisConstants.FIELD_ID, model.getId());
} }
return super.count(wrapper); return super.count(wrapper) == 0;
} }
// ================== // ==================

Write Preview
Loading…
Cancel
Save