chuangte/autosprout
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1. 根据型号返回型号名称

Browse Source
This commit is contained in:
邱贞招 2024-04-25 16:46:22 +08:00
parent 28d17976a3
commit 81ad0e724f
4 changed files with 46 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
AutoSprout-watering/src/main/java/com/ruoyi/device/app/AppController.java
View File

@ -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);
}
}

4
AutoSprout-watering/src/main/java/com/ruoyi/device/domain/AsDevice.java
View File

@ -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;

8
AutoSprout-watering/src/main/java/com/ruoyi/device/service/IAsDeviceService.java
View File

@ -22,6 +22,14 @@ public interface IAsDeviceService
*/
public AsDevice selectAsDeviceByDeviceId(Long deviceId);
/**
* 根据mac号查询设备信息
*
* @param device 设备对象
* @return 设备列表
*/
public AsDevice selectAsDeviceByMac(AsDevice device);
/**
* 查询设备列表列表
*

23
AutoSprout-watering/src/main/java/com/ruoyi/device/service/impl/AsDeviceServiceImpl.java
View File

@ -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更新设备参数
*