From 51df72fd78abfe19f2dae739cdb335a5506a4c3a Mon Sep 17 00:00:00 2001
From: huangzj <826100833@qq.com>
Date: Mon, 12 Jun 2023 16:23:08 +0800
Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=9B=91=E6=B5=8B=E7=82=B9?=
 =?UTF-8?q?=E8=A1=A8devid?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/njcn/csdevice/pojo/po/CsLinePO.java   |  2 +-
 .../service/impl/CsLinePOServiceImpl.java     | 27 +++++++++++++++----
 2 files changed, 23 insertions(+), 6 deletions(-)

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<CsLinePOMapper, CsLinePO> implements CsLinePOService{
+    private final CsLedgerMapper csLedgerMapper;
 
     @Override
     public List<CsLinePO> getLineByDev(List<String> list) {
-        return this.lambdaQuery().eq(CsLinePO::getDevId,list).list();
+        List<CsLinePO> result = new ArrayList<>();
+        list.forEach(temp->{
+            List<CsLinePO> csLinePOList = queryByDevId(temp);
+            result.addAll(csLinePOList);
+        });
+    return result;
     }
 
     @Override
     public List<CsLinePO> queryByDevId(String devId) {
-        QueryWrapper<CsLinePO> queryWrapper = new QueryWrapper();
-        queryWrapper.eq("dev_id", devId);
-        List<CsLinePO> csLinePOList = this.list(queryWrapper);
-        return csLinePOList;
+        QueryWrapper<CsLedger> queryWrapper = new QueryWrapper();
+        queryWrapper.eq("state",1).eq("pid",devId);
+        List<CsLedger> csLedgerList = csLedgerMapper.selectList(queryWrapper);
+        List<String> csPairList = csLedgerList.stream().map(CsLedger::getId).collect(Collectors.toList());
+        List<CsLinePO> csLinePOS = this.listByIds(csPairList);
+        csLinePOS.forEach(temp->temp.setDevId(devId));
+        return csLinePOS;
     }
 }