From 04d24f1c11f7a3aab94cc5be144d4f469bb704e3 Mon Sep 17 00:00:00 2001 From: zhaoqing <3160641494@qq.com> Date: Thu, 11 Jun 2026 20:40:50 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E4=B8=9A?= =?UTF-8?q?=E5=90=88=E4=BD=9C=E4=BC=99=E4=BC=B4=E6=8E=A8=E9=80=81-?= =?UTF-8?q?=E5=90=84=E7=BB=84=E7=BB=87=E7=8B=AC=E7=AB=8B=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../service/UserShipperApplicationService.java | 11 ++++------- .../repository/mapper/UserShipperMapper.java | 2 ++ .../src/main/resources/mapper/UserShipperMapper.xml | 8 ++++++++ 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java index 83e42f22e..bc84b75d8 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperApplicationService.java @@ -208,15 +208,12 @@ public class UserShipperApplicationService { @NeedSetValueMethod public List userShipperListAllOrgs(UserShipperDO userShipperDO) { LoginUser loginUser = SecurityUtils.getLoginUser(); - if (loginUser == null || loginUser.getUserPo() == null) { - log.warn("托运人列表查询（所有组织）- 未获取到登录用户信息"); - List userShipperList = userShipperDomainService.userShipperList(userShipperDO); - return processShipperList(userShipperList); + if (loginUser != null && loginUser.getUserPo() != null) { + userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId()); } - userShipperDO.setPushQueryOrgId(loginUser.getUserPo().getOrganizationId()); - // 不做任何组织权限过滤，前端传了 org 就按 org 查，没传就看全部 log.info("托运人列表查询（所有组织）- organizationId={}", userShipperDO.getOrganizationId()); - List userShipperList = userShipperDomainService.userShipperList(userShipperDO); + // 直接走新 mapper 查询，不做组织权限过滤 + List userShipperList = userShipperMapper.selectListAllOrgs(userShipperDO); return processShipperList(userShipperList); } diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java index 1dcfce572..2800c72df 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java +++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserShipperMapper.java @@ -15,6 +15,8 @@ public interface UserShipperMapper extends BaseMapper { List selectList(UserShipperDO userShipperDO); + List selectListAllOrgs(UserShipperDO userShipperDO); + UserShipperPo selectByUserId(Long userId); UserShipperPo findByShipperId(Long shipperId); diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml index eb04fdb17..c66b57cf8 100644 --- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml +++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml @@ -190,6 +190,14 @@ ORDER BY a.create_time DESC + + @@ -192,7 +301,7 @@ - - - GROUP BY a.user_id - ORDER BY a.create_time DESC + SELECT * FROM ( + + + GROUP BY a.user_id + ORDER BY a.create_time DESC + ) t Date: Fri, 12 Jun 2026 10:00:22 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E5=AE=A2=E5=95=86=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../UserShipperMasterDataSyncService.java | 153 ++++++++++-------- 1 file changed, 84 insertions(+), 69 deletions(-) diff --git a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java index 0861938cc..9bfc75a90 100644 --- a/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java +++ b/mhd-user-center/src/main/java/com/mhd/user/application/service/UserShipperMasterDataSyncService.java @@ -24,9 +24,7 @@ import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; -import java.util.ArrayList; import java.util.Date; -import java.util.List; import java.util.concurrent.TimeUnit; @Service @@ -34,8 +32,11 @@ import java.util.concurrent.TimeUnit; public class UserShipperMasterDataSyncService { private static final String LOCK_PREFIX = "shipper:mdm:sync:"; - private static final int PAGE_SIZE = 500; + /** MDM 单页条数，不宜过大以免 MDM/Feign 超时 */ + private static final int PAGE_SIZE = 100; private static final long SYNC_LOCK_MINUTES = 30; + /** MDM desc3：是否客户 */ + private static final String MDM_FLAG_YES = "1"; @Resource private ThirdPartyServiceFeign thirdPartyServiceFeign; @@ -128,41 +129,47 @@ public class UserShipperMasterDataSyncService { String lastModifyRecordTime = syncEntity == null ? null : syncEntity.getLastModifyRecordTime(); ShipperMasterDataSyncResultVo resultVo = new ShipperMasterDataSyncResultVo(); - List allRecords = fetchAllRecords(orgNcCode, lastModifyRecordTime, - loginUser.getUserPo().getTopOrganizationId()); + log.info("开始同步MDM客商, organizationId={}, orgNcCode={}, lastModifyRecordTime={}", + organizationId, orgNcCode, lastModifyRecordTime); String maxModifyTime = lastModifyRecordTime; - for (MdmMerchantRecordDTO record : allRecords) { - if (!belongsToOrg(record, orgNcCode)) { - resultVo.setSkipCount(resultVo.getSkipCount() + 1); - continue; + int currentPage = 1; + Integer totalPages = null; + do { + MdmMerchantQueryResultDTO pageData = queryMerchantPage(orgNcCode, lastModifyRecordTime, + loginUser.getUserPo().getTopOrganizationId(), currentPage); + if (pageData == null || pageData.getDataInfo() == null) { + break; } - if (isDisabled(record)) { - resultVo.setSkipCount(resultVo.getSkipCount() + 1); - continue; - } - if (StringUtils.isEmpty(record.getCode())) { - resultVo.setSkipCount(resultVo.getSkipCount() + 1); - continue; - } - try { - UserShipperPo existing = userShipperApplicationService.findByCustomerNcCodeAndOrganizationId( - record.getCode(), organizationId); - if (existing == null) { - userShipperApplicationService.addEnterpriseShipperFromMasterData(record, loginUser); - resultVo.setAddCount(resultVo.getAddCount() + 1); - } else { - userShipperApplicationService.updateEnterpriseShipperFromMasterData(record, existing, loginUser); - resultVo.setUpdateCount(resultVo.getUpdateCount() + 1); + for (MdmMerchantRecordDTO record : pageData.getDataInfo()) { + if (!shouldSyncRecord(record, orgNcCode)) { + resultVo.setSkipCount(resultVo.getSkipCount() + 1); + continue; + } + try { + UserShipperPo existing = userShipperApplicationService.findByCustomerNcCodeAndOrganizationId( + record.getCode(), organizationId); + if (existing == null) { + userShipperApplicationService.addEnterpriseShipperFromMasterData(record, loginUser); + resultVo.setAddCount(resultVo.getAddCount() + 1); + } else { + userShipperApplicationService.updateEnterpriseShipperFromMasterData(record, existing, loginUser); + resultVo.setUpdateCount(resultVo.getUpdateCount() + 1); + } + maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime()); + } catch (Exception e) { + resultVo.setFailCount(resultVo.getFailCount() + 1); + String msg = "CODE=" + record.getCode() + " 同步失败：" + e.getMessage(); + resultVo.getErrorMessages().add(msg); + log.error(msg, e); } - maxModifyTime = maxTime(maxModifyTime, record.getLastModifyRecordTime()); - } catch (Exception e) { - resultVo.setFailCount(resultVo.getFailCount() + 1); - String msg = "CODE=" + record.getCode() + " 同步失败：" + e.getMessage(); - resultVo.getErrorMessages().add(msg); - log.error(msg, e); } - } + totalPages = pageData.getTotalPages(); + if (totalPages == null || totalPages <= 0) { + break; + } + currentPage++; + } while (currentPage <= totalPages); Date now = new Date(); resultVo.setLastSyncTime(now); @@ -170,38 +177,45 @@ public class UserShipperMasterDataSyncService { return resultVo; } - private List fetchAllRecords(String orgNcCode, String lastModifyRecordTime, Long topOrganizationId) { - List allRecords = new ArrayList<>(); - int currentPage = 1; - Integer totalPages = null; - do { - MdmMerchantQueryDTO queryDTO = new MdmMerchantQueryDTO(); - queryDTO.setOrgNcCode(orgNcCode); - if (StringUtils.isNotEmpty(lastModifyRecordTime)) { - queryDTO.setLastModifyRecordTime(lastModifyRecordTime + "~"); - } - queryDTO.setCurrentPage(currentPage); - queryDTO.setCountPerPage(PAGE_SIZE); - queryDTO.setTopOrganizationId(topOrganizationId); + private MdmMerchantQueryResultDTO queryMerchantPage(String orgNcCode, String lastModifyRecordTime, + Long topOrganizationId, int currentPage) { + MdmMerchantQueryDTO queryDTO = new MdmMerchantQueryDTO(); + queryDTO.setOrgNcCode(orgNcCode); + if (StringUtils.isNotEmpty(lastModifyRecordTime)) { + queryDTO.setLastModifyRecordTime(lastModifyRecordTime + "~"); + } + queryDTO.setCurrentPage(currentPage); + queryDTO.setCountPerPage(PAGE_SIZE); + queryDTO.setTopOrganizationId(topOrganizationId); - R response = thirdPartyServiceFeign.queryMdmMerchant(queryDTO); - if (response == null || response.getCode() != Constants.SUCCESS) { - throw new ServiceException("调用MDM客商接口失败：" + (response == null ? "无响应" : response.getMsg())); - } - MdmMerchantQueryResultDTO data = response.getData(); - if (data == null) { - break; - } - if (data.getDataInfo() != null) { - allRecords.addAll(data.getDataInfo()); - } - totalPages = data.getTotalPages(); - if (totalPages == null || totalPages <= 0) { - break; - } - currentPage++; - } while (currentPage <= totalPages); - return allRecords; + R response = thirdPartyServiceFeign.queryMdmMerchant(queryDTO); + if (response == null || response.getCode() != Constants.SUCCESS) { + throw new ServiceException("调用MDM客商接口失败：" + (response == null ? "无响应" : response.getMsg())); + } + return response.getData(); + } + + /** + * 同步过滤：MDM 查询侧 DESC24 无法精确过滤，必须在应用侧严格筛选。 + */ + private boolean shouldSyncRecord(MdmMerchantRecordDTO record, String orgNcCode) { + if (record == null || StringUtils.isEmpty(record.getCode())) { + return false; + } + // 仅同步客户（desc3=是否客户） + if (!MDM_FLAG_YES.equals(trimToEmpty(record.getDesc3()))) { + return false; + } + // 对应组织编码必须等于当前组织 NC，空值不同步 + String recordOrgNc = trimToEmpty(record.getDesc24()); + if (StringUtils.isEmpty(recordOrgNc) || !orgNcCode.equals(recordOrgNc)) { + return false; + } + // 跳过本组织主体（code 与组织 NC 相同，多为内部单位而非外部客商） + if (orgNcCode.equals(trimToEmpty(record.getCode()))) { + return false; + } + return !isDisabled(record); } private void saveSyncWatermark(Long organizationId, String maxModifyTime, Date syncTime, @@ -242,16 +256,17 @@ public class UserShipperMasterDataSyncService { return orgJson.has("ncCode") ? orgJson.getString("ncCode") : null; } - private boolean belongsToOrg(MdmMerchantRecordDTO record, String orgNcCode) { - return StringUtils.isEmpty(record.getDesc24()) || orgNcCode.equals(record.getDesc24()); - } - private boolean isDisabled(MdmMerchantRecordDTO record) { if (StringUtils.isEmpty(record.getDesc30())) { return false; } String status = record.getDesc30().trim(); - return "否".equals(status) || "停用".equals(status) || "0".equals(status); + // 2=启用；0/3/否/停用 视为停用（结合 MDM 样例数据） + return "否".equals(status) || "停用".equals(status) || "0".equals(status) || "3".equals(status); + } + + private String trimToEmpty(String value) { + return value == null ? "" : value.trim(); } private String maxTime(String currentMax, String candidate) {