diff --git a/src/com/engine/salary/service/auth/AuthDataService.java b/src/com/engine/salary/service/auth/AuthDataService.java index a86bae60e..e13edec91 100644 --- a/src/com/engine/salary/service/auth/AuthDataService.java +++ b/src/com/engine/salary/service/auth/AuthDataService.java @@ -25,10 +25,10 @@ public interface AuthDataService { /** * 保存数据 - * @param param + * @param params * @return */ - void save(AuthDataSaveParam param); + void save(List params); /** * 同步 diff --git a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java index 47edf7639..39938cd53 100644 --- a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java @@ -54,30 +54,32 @@ public class AuthDataServiceImpl extends Service implements AuthDataService { } @Override - public void save(AuthDataSaveParam param) { - Date now = new Date(); - Long roleId = param.getRoleId(); - AuthRolePO rolePO = getAuthRoleMapper().getById(roleId); - if (rolePO == null) { - throw new SalaryRunTimeException("角色不存在!"); - } + public void save(List params) { + params.forEach(param -> { + Date now = new Date(); + Long roleId = param.getRoleId(); + AuthRolePO rolePO = getAuthRoleMapper().getById(roleId); + if (rolePO == null) { + throw new SalaryRunTimeException("角色不存在!"); + } - AuthDataPO dataPO = AuthDataPO.builder() - .id(IdGenerator.generate()) - .roleId(param.getRoleId()) - .link(param.getLink().getValue()) - .targetType(param.getTargetType().getValue()) - .target(param.getTarget()) - .targetName(param.getTargetName()) - .sortedIndex(param.getSortedIndex()) - .creator((long) user.getUID()) - .createTime(now) - .updateTime(now) - .deleteType(0) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); + AuthDataPO dataPO = AuthDataPO.builder() + .id(IdGenerator.generate()) + .roleId(param.getRoleId()) + .link(param.getLink().getValue()) + .targetType(param.getTargetType().getValue()) + .target(param.getTarget()) + .targetName(param.getTargetName()) + .sortedIndex(param.getSortedIndex()) + .creator((long) user.getUID()) + .createTime(now) + .updateTime(now) + .deleteType(0) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); - getAuthDataMapper().insertIgnoreNull(dataPO); + getAuthDataMapper().insertIgnoreNull(dataPO); + }); } @Override diff --git a/src/com/engine/salary/service/auth/AuthMemberService.java b/src/com/engine/salary/service/auth/AuthMemberService.java index eb7462c90..d93ccf266 100644 --- a/src/com/engine/salary/service/auth/AuthMemberService.java +++ b/src/com/engine/salary/service/auth/AuthMemberService.java @@ -24,10 +24,10 @@ public interface AuthMemberService { /** * 添加成员 - * @param param + * @param params * @return */ - Long save(AuthMemberSaveParam param); + void save(List params); /** * 删除成员 diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java index 548bd2c33..58427cf2c 100644 --- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java @@ -57,40 +57,38 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService } @Override - public Long save(AuthMemberSaveParam param) { + public void save(List params) { + params.forEach(param -> { + AuthRolePO rolePO = getAuthRoleMapper().getById(param.getRoleId()); + if (rolePO == null) { + throw new SalaryRunTimeException("角色不存在!"); + } - AuthRolePO rolePO = getAuthRoleMapper().getById(param.getRoleId()); - if (rolePO == null) { - throw new SalaryRunTimeException("角色不存在!"); - } + Date now = new Date(); + AuthMemberPO po = AuthMemberPO.builder() + .id(IdGenerator.generate()) + .roleId(param.getRoleId()) + .target(param.getTarget()) + .targetType(param.getTargetType().getValue()) + .targetName(param.getTargetName()) + .creator((long) user.getUID()) + .createTime(now) + .updateTime(now) + .deleteType(0) + .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) + .build(); + getAuthMemberMapper().insertIgnoreNull(po); - Date now = new Date(); - AuthMemberPO po = AuthMemberPO.builder() - .id(IdGenerator.generate()) - .roleId(param.getRoleId()) - .target(param.getTarget()) - .targetType(param.getTargetType().getValue()) - .targetName(param.getTargetName()) - .creator((long) user.getUID()) - .createTime(now) - .updateTime(now) - .deleteType(0) - .tenantKey(SalaryDefaultTenantConstant.DEFAULT_TENANT_KEY) - .build(); - getAuthMemberMapper().insertIgnoreNull(po); - - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); - loggerContext.setTargetName(rolePO.getName() + "成员:" + po.getId()); - loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增成员")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增成员")); - loggerContext.setNewValues(po); - SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); - - - return po.getId(); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); + loggerContext.setTargetName(rolePO.getName() + "成员:" + po.getId()); + loggerContext.setOperateType(OperateTypeEnum.ADD.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "新增成员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "新增成员")); + loggerContext.setNewValues(po); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + }); } @Override diff --git a/src/com/engine/salary/web/AuthController.java b/src/com/engine/salary/web/AuthController.java index 95486b6c7..817a92176 100644 --- a/src/com/engine/salary/web/AuthController.java +++ b/src/com/engine/salary/web/AuthController.java @@ -62,9 +62,9 @@ public class AuthController { @POST @Path("/member/save") @Produces(MediaType.APPLICATION_JSON) - public String saveMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AuthMemberSaveParam param) { + public String saveMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody List param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::saveMember, param); + return new ResponseResult, Long>(user).run(getAuthWrapper(user)::saveMember, param); } @POST @@ -111,9 +111,9 @@ public class AuthController { @POST @Path("/data/save") @Produces(MediaType.APPLICATION_JSON) - public String saveData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AuthDataSaveParam param) { + public String saveData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody List params) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::saveData, param); + return new ResponseResult, Long>(user).run(getAuthWrapper(user)::saveData, params); } @POST diff --git a/src/com/engine/salary/wrapper/AuthWrapper.java b/src/com/engine/salary/wrapper/AuthWrapper.java index de2836574..cfecd13da 100644 --- a/src/com/engine/salary/wrapper/AuthWrapper.java +++ b/src/com/engine/salary/wrapper/AuthWrapper.java @@ -69,9 +69,8 @@ public class AuthWrapper extends Service { return authMemberDTOPageInfo; } - public Long saveMember(AuthMemberSaveParam param) { - ValidUtil.doValidator(param); - return getAuthMemberService(user).save(param); + public void saveMember(List param) { + getAuthMemberService(user).save(param); } public void deleteMember(List ids) { @@ -109,8 +108,8 @@ public class AuthWrapper extends Service { } - public void saveData(AuthDataSaveParam authDataSaveParam) { - getAuthDataService(user).save(authDataSaveParam); + public void saveData(List params) { + getAuthDataService(user).save(params); }