b2894lxlx/tms-erp-api
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🐛 修复MK公开页审批回写，并支持OA部门按公司oaId轮询同步

Browse Source 
Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
b2894lxlx
2026-10-17 15:35:20 +08:00
parent be0491d86a
commit 0bcb355079
6 changed files with 205 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files
blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java
+4 -3
View File
@@ -204,7 +204,7 @@ public class DeptController extends BladeController {
}
/**
* 从OA按页同步部门（需先完成公司同步）
* 从OA按页同步部门（需先完成公司同步；按公司 oaId 轮询查询）
*/
@IsAdmin
@PostMapping("/sync-oa-department")
@@ -214,8 +214,9 @@ public class DeptController extends BladeController {
@RequestParam(defaultValue = "1") Integer current,
@RequestParam(defaultValue = "20") Integer size,
@RequestParam(defaultValue = "false") Boolean incremental,
@RequestParam(required = false) String modifiedSince) {
return R.data(oaSyncService.syncDepartmentPage(current, size, Boolean.TRUE.equals(incremental), modifiedSince));
@RequestParam(required = false) String modifiedSince,
@RequestParam(required = false) String companyOaId) {
return R.data(oaSyncService.syncDepartmentPage(current, size, Boolean.TRUE.equals(incremental), modifiedSince, companyOaId));
}
/**
blade-service/blade-system/src/main/java/org/springblade/system/service/IOASyncService.java
+4 -3
View File
@@ -52,13 +52,14 @@ public interface IOASyncService {
OaOrgSyncPageVO syncCompanyPage(int current, int size, boolean incremental, String modifiedSince);
/**
* 按页从 OA 部门接口同步部门；最后一页完成后更新祖级列表
* 按页从 OA 部门接口同步部门；须先完成公司同步，再按公司 oaId 轮询查询部门
*
* @param current 当前页，从 1 开始
* @param current 当前页，从 1 开始（相对当前公司）
* @param size 每页条数
* @param incremental 是否增量同步（按本地最大 oaModified 过滤 OA）
* @param modifiedSince 增量起始时间；首屏可空，后续分页回传首屏返回值
* @param companyOaId 当前公司 OA 主键；首屏可空（自动取第一家），后续回传
* @return 本页同步结果
*/
OaOrgSyncPageVO syncDepartmentPage(int current, int size, boolean incremental, String modifiedSince);
OaOrgSyncPageVO syncDepartmentPage(int current, int size, boolean incremental, String modifiedSince, String companyOaId);
}
blade-service/blade-system/src/main/java/org/springblade/system/service/impl/OASyncServiceImpl.java
+87 -51
View File
@@ -153,10 +153,10 @@ public class OASyncServiceImpl implements IOASyncService {
@Transactional(rollbackFor = Exception.class)
@Override
public OaOrgSyncPageVO syncDepartmentPage(int current, int size, boolean incremental, String modifiedSince) {
public OaOrgSyncPageVO syncDepartmentPage(int current, int size, boolean incremental, String modifiedSince, String companyOaId) {
try {
ComposeLogUtil.addLog(log);
return this.syncDepartmentFromOaPage(current, size, incremental, modifiedSince);
return this.syncDepartmentFromOaPage(current, size, incremental, modifiedSince, companyOaId);
} finally {
ComposeLogUtil.removeLastLog();
}
@@ -224,29 +224,28 @@ public class OASyncServiceImpl implements IOASyncService {
}
/**
* 同步部门
* 同步部门：先整理已同步公司，再按公司 oaId 逐个轮询查询部门
* @param startTime 查询开始时间
*/
private void syncDept(Date startTime) {
String subCompanyIds = getOaSubCompanyIds(false);
if (StringUtils.isEmpty(subCompanyIds)) {
List<String> companyOaIds = listAllowedCompanyOaIds(false);
if (CollectionUtil.isEmpty(companyOaIds)) {
ComposeLogUtil.getLastLog().warn("未查询到子公司查询参数");
return;
}
// 未处理的数据
List<Dept> notHandleList = new ArrayList<>();
// 1. 设置查询参数
OADepartmentSearch departmentSearch = buildDepartmentSearch(startTime, subCompanyIds);
// 2. 分页查询并处理数据
OAUtils.pageSyncHandler(departmentSearch, param -> oaClient.queryDepartmentPage(new OASearch<>(param)), response -> {
ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 {}", JSON.toJSONString(response));
return new ServiceException("调用OA接口查询部门信息失败");
}, 10000, ComposeLogUtil.getLastLog()::info).accept(list -> {
// 处理数据
OrgSyncCount syncCount = handleDept(list, false);
notHandleList.addAll(syncCount.getNotHandledList());
});
// 3. 未处理的数据
for (String companyOaId : companyOaIds) {
ComposeLogUtil.getLastLog().info("按公司轮询同步部门 companyOaId={}", companyOaId);
OADepartmentSearch departmentSearch = buildDepartmentSearch(startTime, companyOaId);
OAUtils.pageSyncHandler(departmentSearch, param -> oaClient.queryDepartmentPage(new OASearch<>(param)), response -> {
ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 companyOaId={} {}", companyOaId, JSON.toJSONString(response));
return new ServiceException("调用OA接口查询部门信息失败");
}, 10000, ComposeLogUtil.getLastLog()::info).accept(list -> {
OrgSyncCount syncCount = handleDept(list, false);
notHandleList.addAll(syncCount.getNotHandledList());
});
}
if (CollectionUtil.isNotEmpty(notHandleList)) {
ComposeLogUtil.getLastLog().warn("同步部门，还有未处理的数据：{}", JSON.toJSONString(notHandleList));
}
@@ -398,34 +397,55 @@ public class OASyncServiceImpl implements IOASyncService {
}
/**
* 按页从 OA 部门接口同步部门
* 按页从 OA 部门接口同步部门：公司数据整理完成后，按公司 oaId 逐个轮询查询
*
* @param current 当前页
* @param current 当前页（相对当前公司）
* @param size 每页条数
* @param incremental 是否增量同步
* @param modifiedSince 增量起始时间（后续分页回传）
* @param companyOaId 当前公司 OA 主键；空则从第一家开始
* @return 本页同步结果
*/
private OaOrgSyncPageVO syncDepartmentFromOaPage(int current, int size, boolean incremental, String modifiedSince) {
private OaOrgSyncPageVO syncDepartmentFromOaPage(int current, int size, boolean incremental, String modifiedSince,
String companyOaId) {
int pageNo = current < 1 ? 1 : current;
int pageSize = size < 1 ? 20 : Math.min(size, 200);
String subCompanyIds = getOaSubCompanyIds(true);
if (StringUtils.isEmpty(subCompanyIds)) {
// 先整理已同步企业列表，再按企业轮询
List<String> companyOaIds = listAllowedCompanyOaIds(true);
if (CollectionUtil.isEmpty(companyOaIds)) {
ComposeLogUtil.getLastLog().warn("未查询到已同步的OA公司，跳过部门同步");
OaOrgSyncPageVO emptyPageVO = buildOrgSyncPageVO("department", pageNo, pageSize, 0L, 0, OrgSyncCount.empty());
emptyPageVO.setFinished(true);
emptyPageVO.setCompanyFinished(true);
emptyPageVO.setCompanyIndex(0);
emptyPageVO.setCompanyTotal(0);
if (!incremental) {
emptyPageVO.setDumpFilePath(oaSyncRawDumpHelper.finishOrgFullDump());
}
return emptyPageVO;
}
int companyIndex = 0;
String currentCompanyOaId = companyOaIds.get(0);
if (StringUtils.isNotBlank(companyOaId)) {
int foundIndex = companyOaIds.indexOf(companyOaId.trim());
if (foundIndex >= 0) {
companyIndex = foundIndex;
currentCompanyOaId = companyOaIds.get(foundIndex);
} else {
ComposeLogUtil.getLastLog().warn("回传公司oaId不在待同步列表中，回退第一家 companyOaId={}", companyOaId);
}
}
IncrementalStart incrementalStart = resolveIncrementalStart(incremental, modifiedSince, DeptCategory.DEPT);
OADepartmentSearch departmentSearch = buildDepartmentSearch(incrementalStart.getStartTime(), subCompanyIds);
// 查询部门时只传当前公司的 oa_id
OADepartmentSearch departmentSearch = buildDepartmentSearch(incrementalStart.getStartTime(), currentCompanyOaId);
departmentSearch.setCurPage(pageNo);
departmentSearch.setPageSize(pageSize);
ComposeLogUtil.getLastLog().info("按公司查询OA部门 companyOaId={} companyIndex={}/{} page={}/{}",
currentCompanyOaId, companyIndex + 1, companyOaIds.size(), pageNo, pageSize);
OAResponse<OADepartmentResponse> oaResponse = oaClient.queryDepartmentPage(new OASearch<>(departmentSearch));
if (oaResponse == null || !OAConstant.OA_SUCCESS_CODE.equals(oaResponse.getCode()) || oaResponse.getData() == null) {
ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 {}", JSON.toJSONString(oaResponse));
ComposeLogUtil.getLastLog().error("调用OA接口查询部门信息失败 companyOaId={} {}",
currentCompanyOaId, JSON.toJSONString(oaResponse));
throw new ServiceException("调用OA接口查询部门信息失败");
}
OAResponseData<OADepartmentResponse> responseData = oaResponse.getData();
@@ -437,25 +457,44 @@ public class OASyncServiceImpl implements IOASyncService {
}
OrgSyncCount syncCount = handleDept(oaDepartments, true);
if (CollectionUtil.isNotEmpty(syncCount.getNotHandledList())) {
ComposeLogUtil.getLastLog().warn("同步部门，本页未处理数据：{}", JSON.toJSONString(syncCount.getNotHandledList()));
ComposeLogUtil.getLastLog().warn("同步部门，本页未处理数据 companyOaId={}：{}",
currentCompanyOaId, JSON.toJSONString(syncCount.getNotHandledList()));
}
OaOrgSyncPageVO pageVO = buildOrgSyncPageVO("department", pageNo, pageSize, totalSize, oaDepartments.size(), syncCount);
pageVO.setModifiedSince(incrementalStart.getModifiedSince());
if (Boolean.TRUE.equals(pageVO.getFinished())) {
// 部门分批同步完成后，清理白名单外组织、重建层级、清理无法挂载数据并刷新祖级列表
this.removeOutsideWhitelistOrgs();
deptService.rebuildOaHierarchy();
deptService.removeOaOrphansWithoutParent();
deptService.updateAncestors(null);
if (!incremental) {
pageVO.setDumpFilePath(oaSyncRawDumpHelper.finishOrgFullDump());
pageVO.setCompanyOaId(currentCompanyOaId);
pageVO.setCompanyIndex(companyIndex + 1);
pageVO.setCompanyTotal(companyOaIds.size());
boolean companyPageFinished = Boolean.TRUE.equals(pageVO.getFinished());
if (companyPageFinished) {
if (companyIndex + 1 < companyOaIds.size()) {
// 当前公司部门已拉完，进入下一公司（整体未结束，不重建层级）
pageVO.setCompanyFinished(true);
pageVO.setNextCompanyOaId(companyOaIds.get(companyIndex + 1));
pageVO.setFinished(false);
} else {
// 全部公司轮询完成：清理白名单外组织、重建层级、清理无法挂载数据并刷新祖级列表
pageVO.setCompanyFinished(true);
pageVO.setNextCompanyOaId(null);
pageVO.setFinished(true);
this.removeOutsideWhitelistOrgs();
deptService.rebuildOaHierarchy();
deptService.removeOaOrphansWithoutParent();
deptService.updateAncestors(null);
if (!incremental) {
pageVO.setDumpFilePath(oaSyncRawDumpHelper.finishOrgFullDump());
}
}
} else {
pageVO.setCompanyFinished(false);
pageVO.setNextCompanyOaId(currentCompanyOaId);
pageVO.setFinished(false);
}
CacheUtil.clear(SYS_CACHE);
CacheUtil.clear(SYS_CACHE, Boolean.FALSE);
ComposeLogUtil.getLastLog().info("OA部门分页同步完成 mode={} {}/{}，成功{}，跳过{}",
incremental ? "incremental" : "full", pageNo, totalSize,
syncCount.getSyncedCount(), syncCount.getSkippedCount());
ComposeLogUtil.getLastLog().info("OA部门分页同步完成 mode={} companyOaId={} company={}/{} page={}/{}，成功{}，跳过{}",
incremental ? "incremental" : "full", currentCompanyOaId, companyIndex + 1, companyOaIds.size(),
pageNo, totalSize, syncCount.getSyncedCount(), syncCount.getSkippedCount());
return pageVO;
}
@@ -604,15 +643,15 @@ public class OASyncServiceImpl implements IOASyncService {
/**
* 组装 OA 部门分页查询参数
*
* @param startTime 增量查询开始时间
* @param subCompanyIds 子公司 id 列表
* @param startTime 增量查询开始时间
* @param companyOaId 当前公司 OA 主键（单次只传一家公司）
* @return 查询参数
*/
private OADepartmentSearch buildDepartmentSearch(Date startTime, String subCompanyIds) {
private OADepartmentSearch buildDepartmentSearch(Date startTime, String companyOaId) {
OADepartmentSearch departmentSearch = new OADepartmentSearch();
departmentSearch.setCurPage(1);
departmentSearch.setPageSize(20);
departmentSearch.setSubcompanyid1(subCompanyIds);
departmentSearch.setSubcompanyid1(companyOaId);
if (startTime != null) {
departmentSearch.setModified(DateUtil.format(startTime, DateUtil.PATTERN_DATETIME));
}
@@ -1145,12 +1184,12 @@ public class OASyncServiceImpl implements IOASyncService {
}
/**
* 获取 OA 部门查询使用的子公司 id
* 整理部门同步用的公司 OA 主键列表（公司阶段完成后调用）
*
* @param syncAll true=取已同步的全部 OA 公司；false=仅取字典配置的公司
* @return 逗号分隔的 OA 公司 id
* @return 白名单内公司 oaId 列表（去重、保序）
*/
private String getOaSubCompanyIds(boolean syncAll) {
private List<String> listAllowedCompanyOaIds(boolean syncAll) {
List<Dept> companyList;
if (syncAll) {
companyList = deptService.list(Wrappers.<Dept>lambdaQuery()
@@ -1161,7 +1200,7 @@ public class OASyncServiceImpl implements IOASyncService {
} else {
Set<String> companyNames = this.getCompanyNames();
if (companyNames.isEmpty()) {
return null;
return Collections.emptyList();
}
companyList = deptService.list(Wrappers.<Dept>lambdaQuery()
.in(Dept::getDeptName, companyNames)
@@ -1170,20 +1209,17 @@ public class OASyncServiceImpl implements IOASyncService {
.ne(Dept::getOaId, "")
);
}
Map<String, Dept> companyByOaId = new HashMap<>();
Map<String, Dept> companyByOaId = new LinkedHashMap<>();
for (Dept company : companyList) {
String oaId = this.resolveOaCompanyId(company);
if (StringUtils.isNotBlank(oaId)) {
companyByOaId.put(oaId, company);
companyByOaId.putIfAbsent(oaId, company);
}
}
Set<String> allowedCompanyOaIds = resolveAllowedCompanyOaIds(companyByOaId);
return companyList.stream()
.map(this::resolveOaCompanyId)
.filter(StringUtils::isNotBlank)
return companyByOaId.keySet().stream()
.filter(allowedCompanyOaIds::contains)
.distinct()
.collect(Collectors.joining(","));
.collect(Collectors.toList());
}
/**