diff --git a/src/com/engine/salary/entity/auth/param/AuthSyncParam.java b/src/com/engine/salary/entity/auth/param/AuthSyncParam.java new file mode 100644 index 000000000..1ac9be40c --- /dev/null +++ b/src/com/engine/salary/entity/auth/param/AuthSyncParam.java @@ -0,0 +1,17 @@ +package com.engine.salary.entity.auth.param; + + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class AuthSyncParam { + + private Long roleId; + +} \ No newline at end of file diff --git a/src/com/engine/salary/service/auth/AuthDataService.java b/src/com/engine/salary/service/auth/AuthDataService.java index 8e3a43721..a86bae60e 100644 --- a/src/com/engine/salary/service/auth/AuthDataService.java +++ b/src/com/engine/salary/service/auth/AuthDataService.java @@ -1,6 +1,7 @@ package com.engine.salary.service.auth; import com.engine.salary.entity.auth.param.AuthDataSaveParam; +import com.engine.salary.entity.auth.param.AuthSyncParam; import com.engine.salary.entity.auth.po.AuthDataPO; import java.util.List; @@ -31,7 +32,7 @@ public interface AuthDataService { /** * 同步 - * @param roleId + * @param param */ - void sync(Long roleId); + void sync(AuthSyncParam param); } diff --git a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java index 7cb54fa82..47edf7639 100644 --- a/src/com/engine/salary/service/auth/AuthDataServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthDataServiceImpl.java @@ -3,6 +3,7 @@ package com.engine.salary.service.auth; import com.engine.core.impl.Service; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.auth.param.AuthDataSaveParam; +import com.engine.salary.entity.auth.param.AuthSyncParam; import com.engine.salary.entity.auth.po.AuthDataPO; import com.engine.salary.entity.auth.po.AuthRoleDataPO; import com.engine.salary.entity.auth.po.AuthRolePO; @@ -80,7 +81,8 @@ public class AuthDataServiceImpl extends Service implements AuthDataService { } @Override - public void sync(Long roleId) { + public void sync(AuthSyncParam param) { + Long roleId = param.getRoleId(); Date now = new Date(); List list = list(roleId); diff --git a/src/com/engine/salary/service/auth/AuthMemberService.java b/src/com/engine/salary/service/auth/AuthMemberService.java index e6ed6edaf..eb7462c90 100644 --- a/src/com/engine/salary/service/auth/AuthMemberService.java +++ b/src/com/engine/salary/service/auth/AuthMemberService.java @@ -1,6 +1,7 @@ package com.engine.salary.service.auth; import com.engine.salary.entity.auth.param.AuthMemberSaveParam; +import com.engine.salary.entity.auth.param.AuthSyncParam; import com.engine.salary.entity.auth.po.AuthMemberPO; import java.util.List; @@ -30,14 +31,14 @@ public interface AuthMemberService { /** * 删除成员 - * @param id + * @param ids */ - void delete(Long id); + void delete(List ids); /** * 同步成员 - * @param roleId + * @param param */ - void sync(Long roleId); + void sync(AuthSyncParam param); } diff --git a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java index 9f98968d7..548bd2c33 100644 --- a/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthMemberServiceImpl.java @@ -7,6 +7,7 @@ import com.engine.hrmelog.entity.dto.LoggerContext; import com.engine.salary.config.SalaryElogConfig; import com.engine.salary.constant.SalaryDefaultTenantConstant; import com.engine.salary.entity.auth.param.AuthMemberSaveParam; +import com.engine.salary.entity.auth.param.AuthSyncParam; import com.engine.salary.entity.auth.po.AuthMemberPO; import com.engine.salary.entity.auth.po.AuthRoleEmpPO; import com.engine.salary.entity.auth.po.AuthRolePO; @@ -93,28 +94,34 @@ public class AuthMemberServiceImpl extends Service implements AuthMemberService } @Override - public void delete(Long id) { - AuthMemberPO po = getAuthMemberMapper().getById(id); - if (po == null) { - throw new SalaryRunTimeException("成员不存在！"); - } + public void delete(List ids) { + + ids.forEach(id -> { + AuthMemberPO po = getAuthMemberMapper().getById(id); + if (po == null) { + throw new SalaryRunTimeException("成员不存在！"); + } + + getAuthMemberMapper().deleteByIds(Collections.singleton(id)); + + AuthRolePO rolePO = getAuthRoleMapper().getById(po.getRoleId()); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); + loggerContext.setTargetName(rolePO.getName() + "成员：" + po.getId()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除成员")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除成员")); + loggerContext.setNewValues(po); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + }); - getAuthMemberMapper().deleteByIds(Collections.singleton(id)); - AuthRolePO rolePO = getAuthRoleMapper().getById(po.getRoleId()); - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(rolePO.getTaxAgentId() + ""); - loggerContext.setTargetName(rolePO.getName() + "成员：" + po.getId()); - loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除成员")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除成员")); - loggerContext.setNewValues(po); - SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); } @Override - public void sync(Long roleId) { + public void sync(AuthSyncParam param) { + Long roleId = param.getRoleId(); AuthRolePO rolePO = getAuthRoleMapper().getById(roleId); if (rolePO == null) { throw new SalaryRunTimeException("角色不存在！"); diff --git a/src/com/engine/salary/service/auth/AuthRoleService.java b/src/com/engine/salary/service/auth/AuthRoleService.java index e792ffe69..41a8b4622 100644 --- a/src/com/engine/salary/service/auth/AuthRoleService.java +++ b/src/com/engine/salary/service/auth/AuthRoleService.java @@ -26,8 +26,8 @@ public interface AuthRoleService { /** * 删除角色 - * @param id + * @param ids */ - void deleteRole(Long id); + void deleteRole(List ids); } diff --git a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java index 58c0bad20..2abdf44e3 100644 --- a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java @@ -107,24 +107,26 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { } @Override - public void deleteRole(Long id) { - AuthRolePO po = getAuthRoleMapper().getById(id); - if (po == null) { - throw new SalaryRunTimeException("角色不存在！"); - } + public void deleteRole(List ids) { + ids.forEach(id -> { + AuthRolePO po = getAuthRoleMapper().getById(id); + if (po == null) { + throw new SalaryRunTimeException("角色不存在！"); + } - getAuthMemberMapper().deleteByRoleId(id); - getAuthRoleMapper().deleteByIds(Collections.singleton(id)); + getAuthMemberMapper().deleteByRoleId(id); + getAuthRoleMapper().deleteByIds(Collections.singleton(id)); - LoggerContext loggerContext = new LoggerContext<>(); - loggerContext.setUser(user); - loggerContext.setTargetId(po.getTaxAgentId() + ""); - loggerContext.setTargetName("角色：" + po.getName()); - loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); - loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除角色")); - loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除角色")); - loggerContext.setNewValues(po); - SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + LoggerContext loggerContext = new LoggerContext<>(); + loggerContext.setUser(user); + loggerContext.setTargetId(po.getTaxAgentId() + ""); + loggerContext.setTargetName("角色：" + po.getName()); + loggerContext.setOperateType(OperateTypeEnum.DELETE.getValue()); + loggerContext.setOperateTypeName(SalaryI18nUtil.getI18nLabel(0, "删除角色")); + loggerContext.setOperatedesc(SalaryI18nUtil.getI18nLabel(0, "删除角色")); + loggerContext.setNewValues(po); + SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); + }); } } diff --git a/src/com/engine/salary/web/AuthController.java b/src/com/engine/salary/web/AuthController.java index 1d2fc833e..95486b6c7 100644 --- a/src/com/engine/salary/web/AuthController.java +++ b/src/com/engine/salary/web/AuthController.java @@ -18,6 +18,7 @@ import javax.servlet.http.HttpServletResponse; import javax.ws.rs.*; import javax.ws.rs.core.Context; import javax.ws.rs.core.MediaType; +import java.util.List; /** * 数据采集-其他免税扣除 @@ -45,9 +46,9 @@ public class AuthController { @POST @Path("/role/delete") @Produces(MediaType.APPLICATION_JSON) - public String deleteRole(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Long id) { + public String deleteRole(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody List ids) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::deleteRole, id); + return new ResponseResult, Long>(user).run(getAuthWrapper(user)::deleteRole, ids); } @POST @@ -69,17 +70,17 @@ public class AuthController { @POST @Path("/member/delete") @Produces(MediaType.APPLICATION_JSON) - public String deleteMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Long id) { + public String deleteMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody List ids) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::deleteMember, id); + return new ResponseResult, Long>(user).run(getAuthWrapper(user)::deleteMember, ids); } @POST @Path("/member/sync") @Produces(MediaType.APPLICATION_JSON) - public String syncMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Long roleId) { + public String syncMember(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AuthSyncParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::syncMember, roleId); + return new ResponseResult(user).run(getAuthWrapper(user)::syncMember, param); } @@ -118,9 +119,9 @@ public class AuthController { @POST @Path("/data/sync") @Produces(MediaType.APPLICATION_JSON) - public String syncData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody Long roleId) { + public String syncData(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody AuthSyncParam param) { User user = HrmUserVarify.getUser(request, response); - return new ResponseResult(user).run(getAuthWrapper(user)::syncData, roleId); + return new ResponseResult(user).run(getAuthWrapper(user)::syncData, param); } @GET diff --git a/src/com/engine/salary/wrapper/AuthWrapper.java b/src/com/engine/salary/wrapper/AuthWrapper.java index ec03226dd..de2836574 100644 --- a/src/com/engine/salary/wrapper/AuthWrapper.java +++ b/src/com/engine/salary/wrapper/AuthWrapper.java @@ -47,8 +47,8 @@ public class AuthWrapper extends Service { } - public void deleteRole(Long id) { - getAuthRoleService(user).deleteRole(id); + public void deleteRole(List ids) { + getAuthRoleService(user).deleteRole(ids); } public PageInfo memberList(AuthMemberQueryParam param) { @@ -74,12 +74,12 @@ public class AuthWrapper extends Service { return getAuthMemberService(user).save(param); } - public void deleteMember(Long id) { - getAuthMemberService(user).delete(id); + public void deleteMember(List ids) { + getAuthMemberService(user).delete(ids); } - public void syncMember(Long roleId) { - getAuthMemberService(user).sync(roleId); + public void syncMember(AuthSyncParam param) { + getAuthMemberService(user).sync(param); } public AuthOptDTO optTree(Long roleId) { @@ -114,8 +114,8 @@ public class AuthWrapper extends Service { } - public void syncData(Long roleId) { - getAuthDataService(user).sync(roleId); + public void syncData(AuthSyncParam param) { + getAuthDataService(user).sync(param); } private AuthMapper getAuthMapper() {