feat: 收款认领公告查询认领人改取Nacos配置thirdParty.bfi.claimAnnounce.claimusers,不再按当前登录用户姓名查询
This commit is contained in:
+5
@@ -129,6 +129,11 @@ public class BfiProperties {
|
|||||||
* 查询时间窗口(月数),默认 6(近半年)
|
* 查询时间窗口(月数),默认 6(近半年)
|
||||||
*/
|
*/
|
||||||
private int months = 6;
|
private int months = 6;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* 认领人(claimusers):配置后公告查询固定使用该值,不再按当前登录用户姓名查询
|
||||||
|
*/
|
||||||
|
private String claimusers;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
+5
-3
@@ -998,13 +998,15 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
|
|||||||
*/
|
*/
|
||||||
private List<BfiClaimAnnounceVO> queryClaimAnnounces(String claimusers) {
|
private List<BfiClaimAnnounceVO> queryClaimAnnounces(String claimusers) {
|
||||||
int months = bfiProperties.getClaimAnnounce().getMonths();
|
int months = bfiProperties.getClaimAnnounce().getMonths();
|
||||||
|
// 认领人直接取 Nacos 配置值
|
||||||
|
String effectiveClaimusers = bfiProperties.getClaimAnnounce().getClaimusers();
|
||||||
LocalDateTime endDate = LocalDateTime.now();
|
LocalDateTime endDate = LocalDateTime.now();
|
||||||
LocalDateTime startDate = endDate.minusMonths(months);
|
LocalDateTime startDate = endDate.minusMonths(months);
|
||||||
long start = System.currentTimeMillis();
|
long start = System.currentTimeMillis();
|
||||||
log.info("调用BFI接口 收款认领公告查询开始 claimusers:{},时间窗口:{} ~ {}(近{}个月)",
|
log.info("调用BFI接口 收款认领公告查询开始 claimusers:{},时间窗口:{} ~ {}(近{}个月)",
|
||||||
claimusers, startDate.format(BFI_DATE_TIME_FORMATTER), endDate.format(BFI_DATE_TIME_FORMATTER), months);
|
effectiveClaimusers, startDate.format(BFI_DATE_TIME_FORMATTER), endDate.format(BFI_DATE_TIME_FORMATTER), months);
|
||||||
BfiClaimAnnounceQueryDTO queryDTO = new BfiClaimAnnounceQueryDTO();
|
BfiClaimAnnounceQueryDTO queryDTO = new BfiClaimAnnounceQueryDTO();
|
||||||
queryDTO.setClaimusers(claimusers);
|
queryDTO.setClaimusers(effectiveClaimusers);
|
||||||
queryDTO.setModifytimeS(startDate.format(BFI_DATE_TIME_FORMATTER));
|
queryDTO.setModifytimeS(startDate.format(BFI_DATE_TIME_FORMATTER));
|
||||||
queryDTO.setModifytimeE(endDate.format(BFI_DATE_TIME_FORMATTER));
|
queryDTO.setModifytimeE(endDate.format(BFI_DATE_TIME_FORMATTER));
|
||||||
queryDTO.setPageSize(SYNC_PAGE_SIZE);
|
queryDTO.setPageSize(SYNC_PAGE_SIZE);
|
||||||
@@ -1013,7 +1015,7 @@ public class ReceiptFlowServiceImpl extends BaseServiceImpl<KingdeeReceiptFlowMa
|
|||||||
return bfiService.queryClaimAnnounce(queryDTO);
|
return bfiService.queryClaimAnnounce(queryDTO);
|
||||||
});
|
});
|
||||||
log.info("调用BFI接口 收款认领公告查询结束 claimusers:{},耗时:{}ms,拉取 {} 条",
|
log.info("调用BFI接口 收款认领公告查询结束 claimusers:{},耗时:{}ms,拉取 {} 条",
|
||||||
claimusers, System.currentTimeMillis() - start, announces.size());
|
effectiveClaimusers, System.currentTimeMillis() - start, announces.size());
|
||||||
return announces;
|
return announces;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -73,6 +73,12 @@ thirdParty:
|
|||||||
# single-flight 分布式锁租约秒数,须大于最坏一轮耗时(逐认领人远程查公告+逐条推送),
|
# single-flight 分布式锁租约秒数,须大于最坏一轮耗时(逐认领人远程查公告+逐条推送),
|
||||||
# 进程异常退出时锁在租约到期后自动释放
|
# 进程异常退出时锁在租约到期后自动释放
|
||||||
lockLeaseSeconds: ${BFI_RECEIPT_CLAIM_PUSH_LOCK_LEASE_SECONDS:1800}
|
lockLeaseSeconds: ${BFI_RECEIPT_CLAIM_PUSH_LOCK_LEASE_SECONDS:1800}
|
||||||
|
# 收款认领公告查询配置(A301-2)
|
||||||
|
claimAnnounce:
|
||||||
|
# 查询时间窗口(月数)
|
||||||
|
months: ${BFI_CLAIM_ANNOUNCE_MONTHS:6}
|
||||||
|
# 认领人:配置后公告查询固定使用该值,不再按当前登录用户姓名查询
|
||||||
|
claimusers: ${BFI_CLAIM_ANNOUNCE_CLAIMUSERS:}
|
||||||
# 金蝶全票池发票定时同步(A801-1 窗口拉取+镜像 upsert,选票统一查本地)
|
# 金蝶全票池发票定时同步(A801-1 窗口拉取+镜像 upsert,选票统一查本地)
|
||||||
invoiceReceipt:
|
invoiceReceipt:
|
||||||
# 同步任务开关,默认关闭(上线先手动 POST /invoice-receipt/sync-invoice-pool 跑一次全窗口铺底)
|
# 同步任务开关,默认关闭(上线先手动 POST /invoice-receipt/sync-invoice-pool 跑一次全窗口铺底)
|
||||||
|
|||||||
Reference in New Issue
Block a user