From 5fd51c437819f1c9d027a936db4ba2ee7cd2e053 Mon Sep 17 00:00:00 2001 From: ustcyc <yincun@163.com> Date: 星期二, 07 一月 2025 15:02:58 +0800 Subject: [PATCH] 升级架构 --- zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java | 13 ++----------- 1 files changed, 2 insertions(+), 11 deletions(-) diff --git a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java index de563bb..2bb7ff0 100644 --- a/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java +++ b/zhitan-system/src/main/java/com/zhitan/model/service/impl/EnergyIndexServiceImpl.java @@ -311,17 +311,8 @@ @Override public List<EnergyIndex> getIndexByCode(String code, String nodeId) { - final List<MeterImplement> settingDevice = modelNodeMapper.getSettingDevice(nodeId); - if(CollectionUtils.isEmpty(settingDevice)){ - return new ArrayList<>(); - } - final List<String> deviceIds = settingDevice.stream().map(MeterImplement::getId).collect(Collectors.toList()); + List<EnergyIndex> energyIndexList = energyIndexMapper.getIndexByCode(code,nodeId); - LambdaQueryWrapper<EnergyIndex> queryWrapper = new LambdaQueryWrapper<>(); - if(StringUtils.isNotEmpty(code)) { - queryWrapper.like(EnergyIndex::getCode, code).or().like(EnergyIndex::getName, code); - } - queryWrapper.in(EnergyIndex::getMeterId,deviceIds); - return energyIndexMapper.selectList(queryWrapper); + return energyIndexList; } } -- Gitblit v1.9.3