ClientApps/CN_Product
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

用户上送逻辑修改

Browse Source
This commit is contained in:
hzj
2025-11-17 11:14:03 +08:00
parent cf7a2e04d5
commit a7d34296c7
3 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
event_smart/src/main/java/com/njcn/product/event/dataTransmit/DataSynchronization.java
View File

@@ -182,11 +182,28 @@ public class DataSynchronization {
userLegerDTO.setBigObjType(pqsDicTreePOMap.get(temp.getBigObjType()).getName()); userLegerDTO.setBigObjType(pqsDicTreePOMap.get(temp.getBigObjType()).getName());
userLegerDTO.setSmallObjType(pqsDicTreePOMap.get(temp.getSmallObjType()).getName()); userLegerDTO.setSmallObjType(pqsDicTreePOMap.get(temp.getSmallObjType()).getName());
userLegerDTO.setCustomerNo("");
userLegerDTO.setIsShow(temp.getIsShow());
userLegerDTOList.add(userLegerDTO); userLegerDTOList.add(userLegerDTO);
}); });
QueryWrapper<PqUserLineAssPO> userLineAssPOQueryWrapper = new QueryWrapper<>(); QueryWrapper<PqUserLineAssPO> userLineAssPOQueryWrapper = new QueryWrapper<>();
// userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex,showIds);
if (showIds.size() > 1000) {
List<List<String>> splitList = CollUtil.split(showIds, 1000);
userLineAssPOQueryWrapper.lambda().and(ew -> {
for (int i = 0; i < splitList.size(); i++) {
List<String> 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); userLineAssPOQueryWrapper.lambda().in(PqUserLineAssPO::getUserIndex, showIds);
}
List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(userLineAssPOQueryWrapper); List<PqUserLineAssPO> pqUserLineAssPOS = pqUserLineAssMapper.selectList(userLineAssPOQueryWrapper);
List<UserLineAssDTO> userLineAssDTOS = pqUserLineAssPOS.stream().map(temp -> { List<UserLineAssDTO> userLineAssDTOS = pqUserLineAssPOS.stream().map(temp -> {
UserLineAssDTO userLineAssDTO = new UserLineAssDTO(); UserLineAssDTO userLineAssDTO = new UserLineAssDTO();

1
event_smart/src/main/java/com/njcn/product/event/transientes/controller/PqUserLedgerController.java
View File

@@ -2,7 +2,6 @@ package com.njcn.product.event.transientes.controller;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; 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.param.PqUserLedgerParam;
import com.njcn.product.event.transientes.pojo.po.PqUserLedgerPO; import com.njcn.product.event.transientes.pojo.po.PqUserLedgerPO;
import com.njcn.product.event.transientes.service.PqUserLedgerService; import com.njcn.product.event.transientes.service.PqUserLedgerService;

4
event_smart/src/main/java/com/njcn/product/event/transientes/pojo/dto/UserLegerDTO.java
View File

@@ -19,6 +19,8 @@ public class UserLegerDTO {
private String powerSupplyArea; private String powerSupplyArea;
private String customerNo;
private String customerName; private String customerName;
private String electricityAddress; private String electricityAddress;
@@ -27,4 +29,6 @@ public class UserLegerDTO {
private String smallObjType; private String smallObjType;
private Integer isShow;
} }