diff --git a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java index 419e5bc..0ca9e5e 100644 --- a/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java +++ b/cs-device/cs-device-api/src/main/java/com/njcn/csdevice/pojo/po/CsLinePO.java @@ -29,7 +29,7 @@ public class CsLinePO extends BaseEntity { /** * 装置id */ - @TableField(value = "dev_id") + @TableField(exist = false) private String devId; /** diff --git a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java index 609a481..05db631 100644 --- a/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java +++ b/cs-device/cs-device-boot/src/main/java/com/njcn/csdevice/service/impl/CsLinePOServiceImpl.java @@ -1,13 +1,20 @@ package com.njcn.csdevice.service.impl; +import com.alibaba.nacos.client.naming.utils.CollectionUtils; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.njcn.csdevice.mapper.CsLedgerMapper; import com.njcn.csdevice.mapper.CsLinePOMapper; +import com.njcn.csdevice.pojo.po.CsLedger; import com.njcn.csdevice.pojo.po.CsLinePO; import com.njcn.csdevice.service.CsLinePOService; +import lombok.RequiredArgsConstructor; import org.springframework.stereotype.Service; +import java.util.ArrayList; import java.util.List; +import java.util.stream.Collectors; + /** * * Description: @@ -17,18 +24,28 @@ import java.util.List; * @version V1.0.0 */ @Service +@RequiredArgsConstructor public class CsLinePOServiceImpl extends ServiceImpl implements CsLinePOService{ + private final CsLedgerMapper csLedgerMapper; @Override public List getLineByDev(List list) { - return this.lambdaQuery().eq(CsLinePO::getDevId,list).list(); + List result = new ArrayList<>(); + list.forEach(temp->{ + List csLinePOList = queryByDevId(temp); + result.addAll(csLinePOList); + }); + return result; } @Override public List queryByDevId(String devId) { - QueryWrapper queryWrapper = new QueryWrapper(); - queryWrapper.eq("dev_id", devId); - List csLinePOList = this.list(queryWrapper); - return csLinePOList; + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("state",1).eq("pid",devId); + List csLedgerList = csLedgerMapper.selectList(queryWrapper); + List csPairList = csLedgerList.stream().map(CsLedger::getId).collect(Collectors.toList()); + List csLinePOS = this.listByIds(csPairList); + csLinePOS.forEach(temp->temp.setDevId(devId)); + return csLinePOS; } }