From 7f17c2a9b7973b5eaae21bbfe94bb949042a3fc3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com> Date: Thu, 26 Sep 2024 17:52:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E7=BA=BF=E5=90=8C=E6=AD=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../engine/salary/service/auth/AuthRoleService.java | 3 +++ .../salary/service/auth/AuthRoleServiceImpl.java | 5 +++++ src/com/engine/salary/timer/SyncTaxAgentEmpJob.java | 11 +++++++++++ src/com/engine/salary/web/AuthController.java | 12 ++++++++++++ src/com/engine/salary/wrapper/AuthWrapper.java | 13 +++++++++++++ 5 files changed, 44 insertions(+) diff --git a/src/com/engine/salary/service/auth/AuthRoleService.java b/src/com/engine/salary/service/auth/AuthRoleService.java index d94b737a1..32527ec54 100644 --- a/src/com/engine/salary/service/auth/AuthRoleService.java +++ b/src/com/engine/salary/service/auth/AuthRoleService.java @@ -3,6 +3,7 @@ package com.engine.salary.service.auth; import com.engine.salary.entity.auth.dto.AuthRoleDTO; import com.engine.salary.entity.auth.param.AuthRoleListQueryParam; import com.engine.salary.entity.auth.param.AuthRoleSaveParam; +import com.engine.salary.entity.auth.po.AuthRolePO; import com.engine.salary.util.page.PageInfo; import java.util.List; @@ -34,4 +35,6 @@ public interface AuthRoleService { */ void deleteRole(List ids); + List listAll(); + } diff --git a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java index e41144ca0..fee967361 100644 --- a/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java +++ b/src/com/engine/salary/service/auth/AuthRoleServiceImpl.java @@ -237,4 +237,9 @@ public class AuthRoleServiceImpl extends Service implements AuthRoleService { SalaryElogConfig.taxAgentLoggerTemplate.write(loggerContext); }); } + + @Override + public List listAll() { + return getAuthRoleMapper().listAll(); + } } diff --git a/src/com/engine/salary/timer/SyncTaxAgentEmpJob.java b/src/com/engine/salary/timer/SyncTaxAgentEmpJob.java index ea16e2022..f4e3df83a 100644 --- a/src/com/engine/salary/timer/SyncTaxAgentEmpJob.java +++ b/src/com/engine/salary/timer/SyncTaxAgentEmpJob.java @@ -1,6 +1,7 @@ package com.engine.salary.timer; import com.engine.common.util.ServiceUtil; +import com.engine.salary.wrapper.AuthWrapper; import com.engine.salary.wrapper.TaxAgentWrapper; import lombok.extern.slf4j.Slf4j; import org.springframework.util.StopWatch; @@ -22,6 +23,11 @@ public class SyncTaxAgentEmpJob extends BaseCronJob { return ServiceUtil.getService(TaxAgentWrapper.class, user); } + private AuthWrapper getAuthWrapper(User user) { + return ServiceUtil.getService(AuthWrapper.class, user); + } + + @Override public void execute() { StopWatch stopWatch = new StopWatch(); @@ -37,7 +43,12 @@ public class SyncTaxAgentEmpJob extends BaseCronJob { */ private void start() { try { + User user = new User(); + user.setUid(1); getTaxAgentWrapper(null).syncAllRange(); + + //同步业务线 + getAuthWrapper(user).sync(); } catch (Exception e) { log.error("计划任务【SyncTaxAgentEmpJob】执行异常:" + e); } diff --git a/src/com/engine/salary/web/AuthController.java b/src/com/engine/salary/web/AuthController.java index 83db467d2..cd02c00ea 100644 --- a/src/com/engine/salary/web/AuthController.java +++ b/src/com/engine/salary/web/AuthController.java @@ -187,4 +187,16 @@ public class AuthController { return new ResponseResult(user).run(getAuthWrapper(user)::tree,param); } + + /** + * 同步 + */ + @POST + @Path("/sync") + @Produces(MediaType.APPLICATION_JSON) + public String sync(@Context HttpServletRequest request, @Context HttpServletResponse response) { + User user = HrmUserVarify.getUser(request, response); + return new ResponseResult(user).run(getAuthWrapper(user)::sync); + } + } diff --git a/src/com/engine/salary/wrapper/AuthWrapper.java b/src/com/engine/salary/wrapper/AuthWrapper.java index df8606007..1692e51e4 100644 --- a/src/com/engine/salary/wrapper/AuthWrapper.java +++ b/src/com/engine/salary/wrapper/AuthWrapper.java @@ -6,6 +6,7 @@ import com.engine.salary.entity.auth.dto.*; import com.engine.salary.entity.auth.param.*; import com.engine.salary.entity.auth.po.AuthDataPO; import com.engine.salary.entity.auth.po.AuthMemberPO; +import com.engine.salary.entity.auth.po.AuthRolePO; import com.engine.salary.entity.auth.vo.Permission; import com.engine.salary.enums.auth.DataLinkEnum; import com.engine.salary.enums.auth.DataTargetTypeEnum; @@ -158,4 +159,16 @@ public class AuthWrapper extends Service { public AuthTreeDTO tree(AuthTreeQueryParam param) { return getAuthService(user).tree(param); } + + public String sync() { + List authRolePOS = getAuthRoleService(user).listAll(); + authRolePOS.forEach(po -> { + AuthSyncParam param = AuthSyncParam.builder() + .roleId(po.getId()) + .build(); + getAuthMemberService(user).sync(param); + getAuthDataService(user).sync(param); + }); + return ""; + } }