diff --git a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java index 9be68979b..72b1b81db 100644 --- a/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java +++ b/emis-biz/src/main/java/com/xdadan/erp/emis/service/impl/EmisTmsSiteBatchMissServiceImpl.java @@ -5,10 +5,6 @@ import java.util.stream.Collectors; import java.util.concurrent.ExecutorService; import java.util.concurrent.Future; import java.util.concurrent.Executors; -import java.util.concurrent.Callable; -import java.util.concurrent.ExecutionException; -import com.github.pagehelper.PageHelper; -import com.github.pagehelper.PageInfo; import cn.hutool.core.collection.CollectionUtil; import com.xdadan.erp.emis.domain.*; @@ -77,36 +73,6 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements @Override public List selectEmisTmsSiteBatchMissList(EmisTmsSiteBatchMiss emisTmsSiteBatchMiss) { log.info("Selecting TMS site batch miss list with params: {}", emisTmsSiteBatchMiss); - - // 检查是否需要多线程优化 - // 通过PageHelper获取当前分页信息 - boolean useMultiThread = false; - Integer pageSize = null; - Integer pageNum = null; - - try { - // 从PageHelper的ThreadLocal中获取分页信息 - com.github.pagehelper.Page localPage = PageHelper.getLocalPage(); - if (localPage != null) { - pageSize = localPage.getPageSize(); - pageNum = localPage.getPageNum(); - - if (pageSize != null && pageSize > 1000) { - useMultiThread = true; - log.info("Detected large pageSize: {}, pageNum: {}, will use multi-thread optimization", pageSize, - pageNum); - } - } - } catch (Exception e) { - log.warn("Failed to get page info from PageHelper: {}", e.getMessage()); - } - - // 如果pageSize > 1000，使用多线程查询优化 - if (useMultiThread && pageSize != null && pageNum != null) { - log.info("Using multi-thread optimization for large pageSize: {}", pageSize); - return selectEmisTmsSiteBatchMissListWithMultiThread(emisTmsSiteBatchMiss, pageSize, pageNum); - } - List list = null; // 如果单号不为空，则去除其他参数 if (!StringUtils.isEmpty(emisTmsSiteBatchMiss.getBillCode())) { @@ -164,178 +130,6 @@ public class EmisTmsSiteBatchMissServiceImpl extends EmisBaseService implements return list; } - /** - * 使用多线程查询TMS漏组批次信息列表 - * 当pageSize > 1000时，将查询任务拆分为多个线程，每个线程查询1000条记录 - * - * @param emisTmsSiteBatchMiss TMS漏组批次信息 - * @param pageSize 分页大小 - * @param pageNum 页码 - * @return TMS漏组批次信息列表 - */ - private List selectEmisTmsSiteBatchMissListWithMultiThread( - EmisTmsSiteBatchMiss emisTmsSiteBatchMiss, Integer pageSize, Integer pageNum) { - - log.info("Using multi-thread query optimization for pageSize: {}, pageNum: {}", pageSize, pageNum); - - try { - // 计算需要的线程数，每个线程处理1000条记录 - final int RECORDS_PER_THREAD = 1000; - int threadCount = (int) Math.ceil((double) pageSize / RECORDS_PER_THREAD); - - // 创建线程池，线程数不超过CPU核心数的2倍 - int maxThreads = Math.min(threadCount, Runtime.getRuntime().availableProcessors() * 2); - ExecutorService executorService = Executors.newFixedThreadPool(maxThreads); - - List>> futures = new ArrayList<>(); - - try { - // 为每个线程分配查询任务 - for (int i = 0; i < threadCount; i++) { - final int threadIndex = i; - - // 创建查询任务 - Callable> task = () -> { - try { - // 创建查询参数的副本，避免线程间冲突 - EmisTmsSiteBatchMiss queryParam = createQueryParamCopy(emisTmsSiteBatchMiss); - - // 设置分页参数 - 每个线程查询1000条记录 - PageHelper.startPage(1, RECORDS_PER_THREAD); - - // 执行查询 - List result = emisTmsSiteBatchMissMapper - .selectEmisTmsSiteBatchMissList(queryParam); - - // 返回查询结果，不需要手动截取，因为PageHelper已经处理了分页 - return result != null ? result : new ArrayList<>(); - } catch (Exception e) { - log.error("Error in thread query task", e); - return new ArrayList<>(); - } - }; - - futures.add(executorService.submit(task)); - } - - // 收集所有线程的查询结果 - List allResults = new ArrayList<>(); - for (Future> future : futures) { - try { - List threadResult = future.get(); - allResults.addAll(threadResult); - } catch (Exception e) { - log.error("Error getting thread result", e); - } - } - - // 根据pageNum和pageSize进行最终分页 - int startIndex = (pageNum - 1) * pageSize; - int endIndex = Math.min(startIndex + pageSize, allResults.size()); - - if (startIndex >= allResults.size()) { - return new ArrayList<>(); - } - - return allResults.subList(startIndex, endIndex); - - } finally { - executorService.shutdown(); - } - } catch (Exception e) { - log.error("Error in multi-thread query, fallback to normal query", e); - // 如果多线程查询失败，回退到普通查询 - return performNormalQuery(emisTmsSiteBatchMiss); - } - } - - /** - * 执行普通查询（多线程查询失败时的回退方案） - */ - private List performNormalQuery(EmisTmsSiteBatchMiss emisTmsSiteBatchMiss) { - log.info("Performing normal query as fallback"); - - List list = null; - // 如果单号不为空，则去除其他参数 - if (!StringUtils.isEmpty(emisTmsSiteBatchMiss.getBillCode())) { - emisTmsSiteBatchMiss.setBillCode(WaybillHelper.formatQueryValue(emisTmsSiteBatchMiss.getBillCode())); - String[] billCodeSortList = emisTmsSiteBatchMiss.getBillCode().split(","); - if (billCodeSortList.length > 1) { - emisTmsSiteBatchMiss.getParams().put("billCodeSortList", Arrays.asList(billCodeSortList)); - } - list = emisTmsSiteBatchMissMapper.selectEmisTmsSiteBatchMissList(emisTmsSiteBatchMiss); - } else { - list = emisTmsSiteBatchMissMapper.selectEmisTmsSiteBatchMissList(emisTmsSiteBatchMiss); - } - - return list; - } - - /** - * 创建查询参数的深拷贝，避免线程间冲突 - */ - private EmisTmsSiteBatchMiss createQueryParamCopy(EmisTmsSiteBatchMiss original) { - EmisTmsSiteBatchMiss copy = new EmisTmsSiteBatchMiss(); - - // 复制基本属性 - copy.setId(original.getId()); - copy.setBillCode(original.getBillCode()); - copy.setManager(original.getManager()); - copy.setTransManager(original.getTransManager()); - copy.setSendSiteCode(original.getSendSiteCode()); - copy.setSendSiteName(original.getSendSiteName()); - copy.setSendCountry(original.getSendCountry()); - copy.setSendCountryName(original.getSendCountryName()); - copy.setDestinationCode(original.getDestinationCode()); - copy.setDestinationName(original.getDestinationName()); - copy.setReceiveCountry(original.getReceiveCountry()); - copy.setReceiveCountryName(original.getReceiveCountryName()); - copy.setSendDate(original.getSendDate()); - copy.setBlSign(original.getBlSign()); - copy.setSignDate(original.getSignDate()); - copy.setPaymentType(original.getPaymentType()); - copy.setParcelQty(original.getParcelQty()); - copy.setBillWeight(original.getBillWeight()); - copy.setTotalVolume(original.getTotalVolume()); - copy.setVolumeWeight(original.getVolumeWeight()); - copy.setSettlementWeight(original.getSettlementWeight()); - copy.setFreight(original.getFreight()); - copy.setWaybillRemark(original.getWaybillRemark()); - copy.setFeeRemark(original.getFeeRemark()); - copy.setMissReason(original.getMissReason()); - copy.setLineCode(original.getLineCode()); - copy.setLineName(original.getLineName()); - copy.setProductType(original.getProductType()); - copy.setProductTypeName(original.getProductTypeName()); - copy.setStartSiteCode(original.getStartSiteCode()); - copy.setNextSiteCode(original.getNextSiteCode()); - copy.setStartSiteName(original.getStartSiteName()); - copy.setNextSiteName(original.getNextSiteName()); - copy.setSupplierCode(original.getSupplierCode()); - copy.setSupplierName(original.getSupplierName()); - copy.setStartDate(original.getStartDate()); - copy.setEndDate(original.getEndDate()); - copy.setMissCount(original.getMissCount()); - copy.setMissType(original.getMissType()); - copy.setBlIsQuestion(original.getBlIsQuestion()); - copy.setVirtualRemark(original.getVirtualRemark()); - copy.setProblemType(original.getProblemType()); - copy.setDispatchUnderlingSiteCode(original.getDispatchUnderlingSiteCode()); - copy.setDispatchUnderlingSiteName(original.getDispatchUnderlingSiteName()); - copy.setManualRemark(original.getManualRemark()); - copy.setBlManual(original.getBlManual()); - copy.setPayee(original.getPayee()); - copy.setSalesmen(original.getSalesmen()); - copy.setRegisterManName(original.getRegisterManName()); - - // 复制params参数 - if (original.getParams() != null) { - copy.setParams(new HashMap<>(original.getParams())); - } - - return copy; - } - /** * 新增TMS漏组批次信息 *