From a7d34296c7281703df7a2279cab929421d162c29 Mon Sep 17 00:00:00 2001 From: hzj <826100833@qq.com> Date: Mon, 17 Nov 2025 11:14:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=94=A8=E6=88=B7=E4=B8=8A=E9=80=81=E9=80=BB?= =?UTF-8?q?=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataTransmit/DataSynchronization.java | 19 ++++++++++++++++++- .../controller/PqUserLedgerController.java | 1 - .../transientes/pojo/dto/UserLegerDTO.java | 4 ++++ 3 files changed, 22 insertions(+), 2 deletions(-) diff --git a/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java b/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java index ec10c28..8a1af38 100644 --- a/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java +++ b/event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java @@ -182,11 +182,28 @@ public class DataSynchronization { userLegerDTO.setBigObjType(pqsDicTreePOMap.get(temp.getBigObjType()).getName()); userLegerDTO.setSmallObjType(pqsDicTreePOMap.get(temp.getSmallObjType()).getName()); + userLegerDTO.setCustomerNo(""); + userLegerDTO.setIsShow(temp.getIsShow()); userLegerDTOList.add(userLegerDTO); }); QueryWrapper userLineAssPOQueryWrapper = new QueryWrapper<>(); - userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex,showIds); +// userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex,showIds); + if (showIds.size() > 1000) { + List> splitList = CollUtil.split(showIds, 1000); + userLineAssPOQueryWrapper.lambda().and(ew -> { + for (int i = 0; i < splitList.size(); i++) { + List batch = splitList.get(i); + if (i == 0) { + ew.in(PqUserLineAssPO::getUserIndex, batch); // 第一个条件不加 or + } else { + ew.or().in(PqUserLineAssPO::getUserIndex, batch); // 后续条件加 or + } + } + }); + } else { + userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex, showIds); + } List pqUserLineAssPOS = pqUserLineAssMapper.selectList(userLineAssPOQueryWrapper); List userLineAssDTOS = pqUserLineAssPOS.stream().map(temp -> { UserLineAssDTO userLineAssDTO = new UserLineAssDTO(); diff --git a/event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java b/event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java index f7a67fc..67688cf 100644 --- a/event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java +++ b/event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java @@ -2,7 +2,6 @@ package com.njcn.product.event.transientes.controller; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; -import com.njcn.product.event.dataTransmit.DataSynchronization; import com.njcn.product.event.transientes.pojo.param.PqUserLedgerParam; import com.njcn.product.event.transientes.pojo.po.PqUserLedgerPO; import com.njcn.product.event.transientes.service.PqUserLedgerService; diff --git a/event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java b/event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java index f68a3e0..8177fc8 100644 --- a/event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java +++ b/event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java @@ -19,6 +19,8 @@ public class UserLegerDTO { private String powerSupplyArea; + private String customerNo; + private String customerName; private String electricityAddress; @@ -27,4 +29,6 @@ public class UserLegerDTO { private String smallObjType; + private Integer isShow; + }