qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

删除、同步对象设置

This commit is contained in:
钱涛 2024-08-06 10:46:33 +08:00
parent 84cb57ccd7
commit 23ed2c5f3f
9 changed files with 89 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/com/engine/salary/entity/auth/param/AuthSyncParam.java Normal file
View File

@ -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;
}

5
src/com/engine/salary/service/auth/AuthDataService.java
View File

@ -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);
}

4
src/com/engine/salary/service/auth/AuthDataServiceImpl.java
View File

@ -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<AuthDataPO> list = list(roleId);

9
src/com/engine/salary/service/auth/AuthMemberService.java
View File

@ -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<Long> ids);
/**
* 同步成员
* @param roleId
* @param param
*/
void sync(Long roleId);
void sync(AuthSyncParam param);
}

41
src/com/engine/salary/service/auth/AuthMemberServiceImpl.java
View File

@ -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<Long> 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<TaxAgentPO> 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<TaxAgentPO> 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("角色不存在！");

4
src/com/engine/salary/service/auth/AuthRoleService.java
View File

@ -26,8 +26,8 @@ public interface AuthRoleService {
/**
* 删除角色
* @param id
* @param ids
*/
void deleteRole(Long id);
void deleteRole(List<Long> ids);
}

34
src/com/engine/salary/service/auth/AuthRoleServiceImpl.java
View File

@ -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<Long> 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<TaxAgentPO> 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<TaxAgentPO> 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);
});
}
}

17
src/com/engine/salary/web/AuthController.java
View File

@ -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<Long> ids) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<Long, Long>(user).run(getAuthWrapper(user)::deleteRole, id);
return new ResponseResult<List<Long>, 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<Long> ids) {
User user = HrmUserVarify.getUser(request, response);
return new ResponseResult<Long, Long>(user).run(getAuthWrapper(user)::deleteMember, id);
return new ResponseResult<List<Long>, 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<Long, Long>(user).run(getAuthWrapper(user)::syncMember, roleId);
return new ResponseResult<AuthSyncParam, Long>(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<Long, AuthOptDTO>(user).run(getAuthWrapper(user)::syncData, roleId);
return new ResponseResult<AuthSyncParam, AuthOptDTO>(user).run(getAuthWrapper(user)::syncData, param);
}
@GET

16
src/com/engine/salary/wrapper/AuthWrapper.java
View File

@ -47,8 +47,8 @@ public class AuthWrapper extends Service {
}
public void deleteRole(Long id) {
getAuthRoleService(user).deleteRole(id);
public void deleteRole(List<Long> ids) {
getAuthRoleService(user).deleteRole(ids);
}
public PageInfo<AuthMemberDTO> 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<Long> 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() {