From 28d17976a3a508c62eeb94939b2af1d69c789319 Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Wed, 24 Apr 2024 15:53:18 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/ruoyi/device/app/AppController.java | 18 ++++++++++++++++++ .../java/com/ruoyi/device/domain/AsDevice.java | 8 ++++++++ .../domain/vo/WeChatMiniAuthorizeVo.java | 1 - .../com/ruoyi/device/mapper/AsModelMapper.java | 8 ++++++++ .../ruoyi/device/service/IAsModelService.java | 8 ++++++++ .../service/impl/AsDeviceServiceImpl.java | 6 ++++-- .../service/impl/AsModelServiceImpl.java | 12 ++++++++++++ .../resources/mapper/device/AsDeviceMapper.xml | 8 ++++++-- .../resources/mapper/device/AsModelMapper.xml | 5 +++++ 9 files changed, 69 insertions(+), 5 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 bddfa2a..2a826df 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 @@ -24,6 +24,7 @@ import org.springframework.web.bind.annotation.*; import javax.annotation.Resource; import java.math.BigDecimal; import java.net.URLEncoder; +import java.util.ArrayList; import java.util.List; /** @@ -65,6 +66,9 @@ public class AppController extends BaseController @Autowired private IAsUserCollectionService asUserCollectionService; + @Autowired + private IAsModelService asModelService; + @Value(value = "${baidu.identifyUrl}") private String identifyUrl; @@ -393,4 +397,18 @@ public class AppController extends BaseController return AjaxResult.success(asDeviceService.getWeather(ipAddr)); } + /** + * 根据型号返回型号名称 + */ + @GetMapping("/getModelName") + public AjaxResult getModelName(String[] asModels) + { + List asModelList = new ArrayList<>(); + for (String model:asModels) { + AsModel asModel = asModelService.selectAsModelByModel(model); + asModelList.add(asModel); + } + return AjaxResult.success(asModelList); + } + } 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 2770aa6..2788750 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 @@ -156,4 +156,12 @@ public class AsDevice extends BaseEntity /** 是否默认展示：0-否，1-是 */ @Excel(name = "是否默认展示") private String isDefault; + + /** 蓝牙id，用于前端链接蓝牙 */ + @Excel(name = "蓝牙id") + private String bluetoothId; + + /** 蓝牙名称 */ + @Excel(name = "蓝牙名称") + private String bluetoothName; } diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/vo/WeChatMiniAuthorizeVo.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/vo/WeChatMiniAuthorizeVo.java index c2d41f6..288c87f 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/vo/WeChatMiniAuthorizeVo.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/domain/vo/WeChatMiniAuthorizeVo.java @@ -1,6 +1,5 @@ package com.ruoyi.device.domain.vo; -import com.baomidou.mybatisplus.annotation.TableField; import lombok.Data; import lombok.experimental.Accessors; diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsModelMapper.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsModelMapper.java index 9f671e4..7cf15b2 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsModelMapper.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/mapper/AsModelMapper.java @@ -22,6 +22,14 @@ public interface AsModelMapper extends BaseMapper */ public AsModel selectAsModelByModelId(Long modelId); + /** + * 根据型号查询型号对象 + * + * @param model 型号列表主键 + * @return 型号列表 + */ + public AsModel selectAsModelByModel(String model); + /** * 查询型号列表列表 * diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsModelService.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsModelService.java index 72213c3..b570bf7 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsModelService.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsModelService.java @@ -19,6 +19,14 @@ public interface IAsModelService */ public AsModel selectAsModelByModelId(Long modelId); + /** + * 根据型号查询型号对象 + * + * @param model 型号列表主键 + * @return 型号列表 + */ + public AsModel selectAsModelByModel(String model); + /** * 查询型号列表列表 * 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 8070bce..a28755b 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 @@ -441,10 +441,12 @@ public class AsDeviceServiceImpl extends ServiceImpl i if(ObjectUtils.isEmpty(device)){ throw new ServiceException("该设备已经被删除"); } - if(ObjectUtils.isNotEmpty(device.getUserId()) && "1".equals(device.getIsNetwork())){ - throw new ServiceException("该设备已经绑定用户，请先！"); + if(ObjectUtils.isNotEmpty(device.getUserId()) && device.getUserId()>0){ + throw new ServiceException("该设备已经绑定用户，请先解绑！"); } device.setUserId(asDevice.getUserId()); + device.setBluetoothId(asDevice.getBluetoothId()); + device.setBluetoothName(asDevice.getBluetoothName()); int i = asDeviceMapper.updateAsDevice(device); if(i>0){ toggleDevice(asDevice.getUserId(), device.getDeviceId()); diff --git a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java index e792c71..194b874 100644 --- a/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java +++ b/AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsModelServiceImpl.java @@ -58,6 +58,18 @@ public class AsModelServiceImpl extends ServiceImpl impl return asModelMapper.selectAsModelByModelId(modelId); } + /** + * 根据型号查询型号对象 + * + * @param model 型号列表主键 + * @return 型号列表 + */ + @Override + public AsModel selectAsModelByModel(String model) + { + return asModelMapper.selectAsModelByModel(model); + } + /** * 查询型号列表列表 * diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml index a60191e..3a39e23 100644 --- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml +++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml @@ -38,10 +38,12 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" + + - select device_id, picture, device_name, classify_id, classify_name, model_id, model, mac, activation_time, online_status, user_id, user_name, nick_name, regular_watering, soil_moisture_open, soil_moisture_close, water_intensity, pulse_mode, pulse_mode_param, screen_rest_time, version, version_id, create_by, create_time, update_by, update_time, remark, regular_watering_json, soil_moisture, water_intensity_switch,is_network,is_default,mode_str from as_device + select device_id, picture, device_name, classify_id, classify_name, model_id, model, mac, activation_time, online_status, user_id, user_name, nick_name, regular_watering, soil_moisture_open, soil_moisture_close, water_intensity, pulse_mode, pulse_mode_param, screen_rest_time, version, version_id, create_by, create_time, update_by, update_time, remark, regular_watering_json, soil_moisture, water_intensity_switch,is_network,is_default,mode_str,bluetooth_id,bluetooth_name from as_device + + insert into as_model