From fe9a8b1c91074d241d7b0ab35b8a1003fcccd9a5 Mon Sep 17 00:00:00 2001
From: 18650502300 <18650502300@163.com>
Date: Fri, 15 Dec 2023 15:39:32 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E5=A4=87=E8=AE=BE=E7=BD=AE=E9=A1=B5?=
 =?UTF-8?q?=E9=9D=A2=E4=BF=9D=E5=AD=98=E8=87=B3=E5=90=8E=E5=8F=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/device/device/index.vue         |  2 +-
 .../com/ruoyi/device/app/AppController.java   | 36 +++++++++++++++----
 2 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/AutoSprout-ui/src/views/device/device/index.vue b/AutoSprout-ui/src/views/device/device/index.vue
index de287cd..5b0b734 100644
--- a/AutoSprout-ui/src/views/device/device/index.vue
+++ b/AutoSprout-ui/src/views/device/device/index.vue
@@ -438,7 +438,7 @@ export default {
         },
         pulseModeParam:null,
 
-        /**3.水流强度开关*/
+        /**4.水流强度开关*/
         waterIntensitySwitch:false,
         //水流强度
         waterIntensity: 4
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 90115ed..9f83e54 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,18 +1,18 @@
 package com.ruoyi.device.app;
 
+import com.ruoyi.common.annotation.Log;
 import com.ruoyi.common.core.controller.BaseController;
 import com.ruoyi.common.core.domain.AjaxResult;
 import com.ruoyi.common.core.page.TableDataInfo;
+import com.ruoyi.common.enums.BusinessType;
 import com.ruoyi.device.domain.AsDevice;
+import com.ruoyi.device.domain.AsDeviceVersion;
 import com.ruoyi.device.domain.AsWateringRecord;
 import com.ruoyi.device.service.IAsDeviceService;
+import com.ruoyi.device.service.IAsDeviceVersionService;
 import com.ruoyi.device.service.IAsUserService;
 import com.ruoyi.device.service.IAsWateringRecordService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.util.List;
@@ -32,9 +32,13 @@ public class AppController extends BaseController
     @Resource
     private IAsWateringRecordService asWateringRecordService;
 
-    @Autowired
+    @Resource
     private IAsDeviceService asDeviceService;
 
+    @Resource
+    private IAsDeviceVersionService asDeviceVersionService;
+
+
 
     /**
      * 根据登录用户获取绑定设备
@@ -68,4 +72,24 @@ public class AppController extends BaseController
         return getDataTable(asWateringRecords);
     }
 
+    /**
+     * 查询固件版本列表
+     */
+    @GetMapping("/version/list")
+    public TableDataInfo list(AsDeviceVersion asDeviceVersion)
+    {
+        startPage();
+        List<AsDeviceVersion> list = asDeviceVersionService.selectAsDeviceVersionList(asDeviceVersion);
+        return getDataTable(list);
+    }
+
+    /**
+     * 修改设备列表
+     */
+    @Log(title = "设备列表", businessType = BusinessType.UPDATE)
+    @PutMapping("/device")
+    public AjaxResult edit(@RequestBody AsDevice asDevice)
+    {
+        return toAjax(asDeviceService.updateAsDevice(asDevice));
+    }
 }