From 81ad0e724f5cff9b04ad85e2205115502f11e0d7 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Thu, 25 Apr 2024 16:46:22 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=A0=B9=E6=8D=AE=E5=9E=8B=E5=8F=B7?=
 =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=9E=8B=E5=8F=B7=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/ruoyi/device/app/AppController.java   | 21 +++++++++--------
 .../com/ruoyi/device/domain/AsDevice.java     |  4 ++++
 .../device/service/IAsDeviceService.java      |  8 +++++++
 .../service/impl/AsDeviceServiceImpl.java     | 23 +++++++++++++++++++
 4 files changed, 46 insertions(+), 10 deletions(-)

diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
index 2a826df..10885ae 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
@@ -1,17 +1,16 @@
 package com.ruoyi.device.app;
 
 import com.alibaba.fastjson2.JSON;
+import com.alibaba.fastjson2.JSONArray;
 import com.alibaba.fastjson2.JSONObject;
 import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
-import com.ruoyi.common.utils.ip.IpUtils;
-import com.ruoyi.device.domain.AsUserCollection;
 import com.ruoyi.common.core.page.TableDataInfo;
 import com.ruoyi.common.enums.BusinessType;
-import com.ruoyi.common.utils.StringUtils;
 import com.ruoyi.common.utils.baidu.GetToken;
 import com.ruoyi.common.utils.http.HttpUtils;
+import com.ruoyi.common.utils.ip.IpUtils;
 import com.ruoyi.device.domain.*;
 import com.ruoyi.device.domain.vo.IdentifyRes;
 import com.ruoyi.device.service.*;
@@ -400,15 +399,17 @@ public class AppController extends BaseController
     /**
      * 根据型号返回型号名称
      */
-    @GetMapping("/getModelName")
-    public AjaxResult getModelName(String[] asModels)
+    @PostMapping("/getModelName")
+    public AjaxResult getModelName(@RequestBody String asDevicesRes)
     {
-        List<AsModel> asModelList = new ArrayList<>();
-        for (String model:asModels) {
-            AsModel asModel = asModelService.selectAsModelByModel(model);
-            asModelList.add(asModel);
+        logger.info("根据型号返回型号名称参数-----"+asDevicesRes);
+        List<AsDevice> devices = JSONArray.parseArray(asDevicesRes, AsDevice.class);
+        List<AsDevice> asDevices = new ArrayList<>();
+        for (AsDevice device:devices) {
+            AsDevice asDevice = asDeviceService.selectAsDeviceByMac(device);
+            asDevices.add(asDevice);
         }
-        return AjaxResult.success(asModelList);
+        return AjaxResult.success(asDevices);
     }
 
 }
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java
index 2788750..762970b 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java
@@ -52,6 +52,10 @@ public class AsDevice extends BaseEntity
     @Excel(name = "型号")
     private String model;
 
+    /** 型号名称 */
+    @Excel(name = "型号名称")
+    private String modelName;
+
     /** 设备Mac号 */
     @Excel(name = "设备Mac号")
     private String mac;
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java
index 6b53f15..4f63374 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java
@@ -22,6 +22,14 @@ public interface IAsDeviceService
      */
     public AsDevice selectAsDeviceByDeviceId(Long deviceId);
 
+    /**
+     * 根据mac号查询设备信息
+     *
+     * @param device 设备对象
+     * @return 设备列表
+     */
+    public AsDevice selectAsDeviceByMac(AsDevice device);
+
     /**
      * 查询设备列表列表
      *
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
index a28755b..0ac37c9 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
@@ -123,6 +123,29 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         return device;
     }
 
+    /**
+     * 根据mac号查询设备信息
+     *
+     * @param mac 设备列表主键
+     * @return 设备信息
+     */
+    @Override
+    public AsDevice selectAsDeviceByMac(AsDevice asDevice)
+    {
+        AsDevice device = asDeviceMapper.selectAsDeviceByMac(asDevice.getMac());
+        if(ObjectUtils.isEmpty(device)){
+            return null;
+        }
+        device.setBluetoothId(asDevice.getBluetoothId());
+        device.setBluetoothName(asDevice.getBluetoothName());
+        asDeviceMapper.updateAsDevice(device);
+        /** 请求onenet更新设备参数*/
+        AsModel model = modelMapper.selectAsModelByModelId(device.getModelId());
+        device.setPicture(model.getPicture());
+        device.setModelName(model.getModelName());
+        return device;
+    }
+
     /**
      * 从onenet更新设备参数
      *