From 6b0d0871358bc9ded522e79b6187da96fda1da8e Mon Sep 17 00:00:00 2001
From: seesaw <seesawgzz@gmail.com>
Date: Mon, 19 Aug 2024 14:54:34 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=8F=9C=E5=93=81=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/devuce/DevuceServiceImpl.java     | 27 +++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
index 95b47abc..c3051dda 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/devuce/DevuceServiceImpl.java
@@ -1,6 +1,7 @@
 package cn.iocoder.yudao.module.system.service.devuce;
 
 import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollectionUtil;
 import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.iocoder.yudao.framework.common.pojo.PageResult;
@@ -21,11 +22,13 @@ import cn.iocoder.yudao.module.system.dal.mysql.dishesnutrition.DishesNutritionM
 import cn.iocoder.yudao.module.system.dal.mysql.dishestype.DishesTypeMapper;
 import cn.iocoder.yudao.module.system.enums.ErrorCodeConstants;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
+import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import org.springframework.stereotype.Service;
 import org.springframework.validation.annotation.Validated;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
@@ -245,8 +248,28 @@ public class DevuceServiceImpl implements DevuceService {
 
     @Override
     public List<DevuceListVO> getList(Long storeId) {
-        List<DevuceListVO> list = devuceMapper.getList(storeId);
-        return list;
+        ArrayList<DevuceListVO> devuceListVOS = new ArrayList<>();
+        List<DeviceInfoDO> deviceInfoDOS = deviceInfoMapper.selectList(Wrappers.<DeviceInfoDO>lambdaQuery()
+                .eq(DeviceInfoDO::getCarteenId, storeId));
+        if(CollectionUtil.isEmpty(deviceInfoDOS)){
+            return devuceListVOS;
+        }
+        List<String> collect = deviceInfoDOS.stream().map(DeviceInfoDO::getDeviceIp).collect(Collectors.toList());
+
+        List<DevuceDO> devuceDOS = devuceMapper.selectList(Wrappers.<DevuceDO>lambdaQuery()
+                .in(DevuceDO::getDeviceSn, collect)
+                .eq(DevuceDO::getBind, true));
+        if(CollectionUtil.isEmpty(devuceDOS)){
+            return devuceListVOS;
+        }
+        for (DevuceDO devuceDO:devuceDOS){
+            DevuceListVO devuceListVO = new DevuceListVO();
+            BeanUtil.copyProperties(devuceDO,devuceListVO);
+            String dishesName = dishesMapper.selectById(devuceDO.getDishesId()).getDishesName();
+            devuceListVO.setDishesName(dishesName);
+            devuceListVOS.add(devuceListVO);
+        }
+        return devuceListVOS;
     }
 
 }
\ No newline at end of file