From 9c0da4a34efb7a28116a194184349ff33c0f30d4 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Sun, 7 Apr 2024 13:54:28 +0800
Subject: [PATCH] =?UTF-8?q?1.=20=E6=A0=B9=E6=8D=AEmac=E5=8F=B7=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E8=AE=BE=E5=A4=87=E6=98=AF=E5=90=A6=E8=A2=AB=E7=BB=91?=
 =?UTF-8?q?=E5=AE=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/device/app/AppController.java     |  9 +++++++++
 .../java/com/ruoyi/device/mapper/AsDeviceMapper.java |  8 ++++++++
 .../com/ruoyi/device/service/IAsDeviceService.java   |  8 ++++++++
 .../device/service/impl/AsDeviceServiceImpl.java     | 12 ++++++++++++
 .../main/resources/mapper/device/AsDeviceMapper.xml  |  5 +++++
 .../mapper/plant/AsPlantAnalysisLogMapper.xml        |  1 +
 .../mapper/plant/AsPlantIdentifyLogMapper.xml        |  3 +--
 .../main/resources/mapper/plant/AsPlantMapper.xml    |  1 +
 8 files changed, 45 insertions(+), 2 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 07ca703..36d6c57 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
@@ -361,5 +361,14 @@ public class AppController extends BaseController
         Boolean collection = asUserCollectionService.isCollection(plantId, userId);
         return AjaxResult.success(collection);
     }
+    /**
+     * 根据mac号查询设备是否被绑定
+     */
+    @GetMapping("/device/isBand/{mac}")
+    public AjaxResult isBand(@PathVariable String mac)
+    {
+        Boolean isBand = asDeviceService.isBand(mac);
+        return AjaxResult.success(isBand);
+    }
 
 }
diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java
index d7295e6..dc12c3e 100644
--- a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java
+++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsDeviceMapper.java
@@ -69,4 +69,12 @@ public interface AsDeviceMapper  extends BaseMapper<AsDevice>
      * @return 结果
      */
     public int deleteAsDeviceByDeviceIds(Long[] deviceIds);
+
+    /**
+     *  根据mac号查询设备是否被绑定
+     *
+     * @param mac 设备mac
+     * @return 结果
+     */
+    int isBandByMac(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 d872b70..9323f55 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
@@ -94,6 +94,14 @@ public interface IAsDeviceService
      */
     Boolean settingNetwork(Long deviceId);
 
+    /**
+     *  根据mac号查询设备是否被绑定
+     *
+     * @param mac 设备mac
+     * @return 结果
+     */
+    Boolean isBand(String mac);
+
 
 //    /**
 //     * 构建命令
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 de8603e..3827a04 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
@@ -358,4 +358,16 @@ public class AsDeviceServiceImpl extends ServiceImpl<AsDeviceMapper, AsDevice> i
         int i = asDeviceMapper.updateAsDevice(device);
         return i>0;
     }
+
+    /**
+     *  根据mac号查询设备是否被绑定
+     *
+     * @param mac 设备mac
+     * @return 结果
+     */
+    @Override
+    public Boolean isBand(String mac) {
+        int i = asDeviceMapper.isBandByMac(mac);
+        return i>0;
+    }
 }
diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
index d3fb340..613fc77 100644
--- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml
@@ -67,6 +67,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         where mac = #{mac}
     </select>
 
+    <select id="isBandByMac" resultType="java.lang.Integer">
+        select count(1) from as_device
+        where mac = #{mac} and user_id IS NOT NULL and is_network = 1
+    </select>
+
     <insert id="insertAsDevice" parameterType="AsDevice" useGeneratedKeys="true" keyProperty="deviceId">
         insert into as_device
         <trim prefix="(" suffix=")" suffixOverrides=",">
diff --git a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantAnalysisLogMapper.xml b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantAnalysisLogMapper.xml
index 72fe206..1a248a2 100644
--- a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantAnalysisLogMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantAnalysisLogMapper.xml
@@ -23,6 +23,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <where>
             <if test="isExist != null  and isExist != ''"> and is_exist= #{isExist}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectAsPlantAnalysisLogById" parameterType="Long" resultMap="AsPlantAnalysisLogResult">
diff --git a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantIdentifyLogMapper.xml b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantIdentifyLogMapper.xml
index cec9216..18bedb5 100644
--- a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantIdentifyLogMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantIdentifyLogMapper.xml
@@ -19,8 +19,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAsPlantIdentifyLogList" parameterType="AsPlantIdentifyLog" resultMap="AsPlantIdentifyLogResult">
         <include refid="selectAsPlantIdentifyLogVo"/>
-        <where>
-        </where>
+        order by create_time desc
     </select>
 
     <select id="selectAsPlantIdentifyLogById" parameterType="Long" resultMap="AsPlantIdentifyLogResult">
diff --git a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantMapper.xml b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantMapper.xml
index f9fe319..a7ea16e 100644
--- a/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantMapper.xml
+++ b/AutoSprout-watering/src/main/resources/mapper/plant/AsPlantMapper.xml
@@ -39,6 +39,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="beam != null  and beam != ''"> and beam like concat('%', #{beam}, '%')</if>
             <if test="sproutCycle != null  and sproutCycle != ''"> and sprout_cycle = #{sproutCycle}</if>
         </where>
+        order by create_time desc
     </select>
 
     <select id="selectAsPlantByPlantId" parameterType="Long" resultMap="AsPlantResult">