From 7ae96df488fdd758ddbb6d9c1996763519ff662b Mon Sep 17 00:00:00 2001 From: 18650502300 <18650502300@163.com> Date: Sat, 2 Nov 2024 17:00:08 +0800 Subject: [PATCH] =?UTF-8?q?1.=20=E4=BF=AE=E6=94=B9=E8=AE=BE=E5=A4=87?= =?UTF-8?q?=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 | 13 +++++ .../service/impl/AsDeviceServiceImpl.java | 48 +++++++++---------- .../mapper/device/AsDeviceMapper.xml | 1 + 3 files changed, 38 insertions(+), 24 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 69deacc..7b3bad5 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 @@ -28,6 +28,8 @@ import java.net.URLEncoder; import java.util.ArrayList; import java.util.List; +import static sun.audio.AudioDevice.device; + /** * 用户信息 * @@ -123,6 +125,17 @@ public class AppController extends BaseController return AjaxResult.success(device); } + /** + * 修改设备名称 + */ + @PutMapping("/editDeviceName") + public AjaxResult editDeviceName(Long deviceId, String deviceName) + { + logger.info("接收到修改设备名称请求：deviceId=【{}】,deviceName=【{}】",deviceId,deviceName); + int i = asDeviceService.updateAsDevice(AsDevice.builder().deviceId(deviceId).deviceName(deviceName).build()); + return AjaxResult.success(i); + } + /** * 切换默认展示设备 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 5c7c14b..36a0a9e 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 @@ -7,7 +7,6 @@ import com.ruoyi.common.constant.HttpStatus; import com.ruoyi.common.constant.IotConstants; import com.ruoyi.common.core.domain.AjaxResult; import com.ruoyi.common.core.domain.entity.AsUser; -import com.ruoyi.common.core.domain.entity.SysUser; import com.ruoyi.common.core.domain.onenet.*; import com.ruoyi.common.exception.ServiceException; import com.ruoyi.common.utils.DateUtils; @@ -275,6 +274,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i asDevice.setModel(model.getModel()); AsDeviceVersion asDeviceVersion = versionMapper.selectAsDeviceVersionByVersionId(asDevice.getVersionId()); asDevice.setVersion(asDeviceVersion.getVersion()); + asDevice.setIsDefault("1"); return asDeviceMapper.insertAsDevice(asDevice); } @@ -289,28 +289,28 @@ public class AsDeviceServiceImpl extends ServiceImpl i public int updateAsDevice(AsDevice asDevice) { asDevice.setUpdateTime(DateUtils.getNowDate()); - /** 请求iot设备参数*/ - /** 1.获取参数*/ - String command = getCommand(asDevice); - logger.info("IOT获取到下发命令:【{}】",command); - - /** 2.发送请求*/ - String deviceName = asDevice.getMac();//mac地址就是产品名称 - String param = "device_name=" + deviceName + "&product_id=" + productId +"&timeout=" + timeout; - String sendUrl = iotUrl+ IotConstants.ADDS_COMMAND + "?"+param; - - String token = Token.getToken(); - logger.info("IOT获取到Authorization:【{}】",token); - - String result = HttpUtils.sendPostWithToken(sendUrl, command, token); - - JSONObject paramsObj = JSON.parseObject(result); - String code = paramsObj.getString("code"); - if (!HttpStatus.IOT_SUCCESS.equals(code)) - { - throw new ServiceException(code+"-----"+ IotUtil.formatMsg(code)); - } - logger.info("IOT请求调用结果:【{}】",result); +// /** 请求iot设备参数*/ +// /** 1.获取参数*/ +// String command = getCommand(asDevice); +// logger.info("IOT获取到下发命令:【{}】",command); +// +// /** 2.发送请求*/ +// String deviceName = asDevice.getMac();//mac地址就是产品名称 +// String param = "device_name=" + deviceName + "&product_id=" + productId +"&timeout=" + timeout; +// String sendUrl = iotUrl+ IotConstants.ADDS_COMMAND + "?"+param; +// +// String token = Token.getToken(); +// logger.info("IOT获取到Authorization:【{}】",token); +// +// String result = HttpUtils.sendPostWithToken(sendUrl, command, token); +// +// JSONObject paramsObj = JSON.parseObject(result); +// String code = paramsObj.getString("code"); +// if (!HttpStatus.IOT_SUCCESS.equals(code)) +// { +// throw new ServiceException(code+"-----"+ IotUtil.formatMsg(code)); +// } +// logger.info("IOT请求调用结果:【{}】",result); /**4.更新数据库*/ return asDeviceMapper.updateAsDevice(asDevice); @@ -462,7 +462,7 @@ public class AsDeviceServiceImpl extends ServiceImpl i String mac = asDevice.getMac(); AsDevice device = asDeviceMapper.selectAsDeviceByMac(mac); if(ObjectUtils.isEmpty(device)){ - throw new ServiceException("该设备已经被删除"); + throw new ServiceException("该设备不存在"); } if(ObjectUtils.isNotEmpty(device.getUserId()) && device.getUserId()>0){ throw new ServiceException("该设备已经绑定用户，请先解绑！"); diff --git a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml index 3a39e23..42147fc 100644 --- a/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml +++ b/AutoSprout-watering/src/main/resources/mapper/device/AsDeviceMapper.xml @@ -61,6 +61,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" and model_id = #{modelId} and is_default = #{isDefault} + order by is_default desc