code-image-backup-public/fastbee
1
0
Fork 0
mirror of https://gitee.com/beecue/fastbee.git synced 2025-12-17 16:36:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

前端添加设备功能

Browse Source
This commit is contained in:
kerwincui
2021-07-21 16:48:17 +08:00
parent 8a0a32f90c
commit 9e8ae982da
7 changed files with 44 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/controller/IotDeviceController.java
View File

@@ -10,6 +10,7 @@
******************************************************************************/
package com.ruoyi.system.controller;
import java.math.BigDecimal;
import java.util.List;
import com.ruoyi.common.core.domain.model.LoginUser;
@@ -112,6 +113,9 @@ public class IotDeviceController extends BaseController
@PostMapping
public AjaxResult add(@RequestBody IotDevice iotDevice)
{
LoginUser user=(LoginUser)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
iotDevice.setOwnerId(user.getUser().getUserId().toString());
iotDevice.setDeviceTemp(BigDecimal.valueOf(0));
return toAjax(iotDeviceService.insertIotDevice(iotDevice));
}

11
spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/controller/IotDeviceSetController.java
View File

@@ -115,11 +115,18 @@ public class IotDeviceSetController extends BaseController
set.setDeviceId(device.getDeviceId());
set.setDeviceNum(device.getDeviceNum());
set.setOwnerId(device.getOwnerId());
set.setIsRadar(0);
set.setIsAlarm(0);
set.setRadarInterval(5);
set.setIsRfControl(0);
set.setIsRfLearn(0);
set.setRfOneFunc(1);
set.setRfTwoFunc(2);
set.setRfThreeFunc(3);
set.setRfFourFunc(4);
set.setIsRfClear(0);
set.setIsAp(0);
set.setIsReset(0);
}
}
return AjaxResult.success(set);
@@ -147,11 +154,11 @@ public class IotDeviceSetController extends BaseController
public AjaxResult edit(@RequestBody IotDeviceSet iotDeviceSet)
{
IotDeviceStatus status=iotDeviceStatusService.selectIotDeviceStatusByDeviceId(iotDeviceSet.getDeviceId());
if(status.getIsOnline()!=1){return AjaxResult.error("设备已离线，不能更新配置。");}
if(status==null || status.getIsOnline()==0){return AjaxResult.error("设备已离线，不能更新状态。");}
// 存储
iotDeviceSetService.updateIotDeviceSet(iotDeviceSet);
//
//mqtt发布
IotDeviceSet set=iotDeviceSetService.selectIotDeviceSetByDeviceId(iotDeviceSet.getDeviceId());
if(iotDeviceSet.getIsRadar()!=null){
set.setIsRadar(iotDeviceSet.getIsRadar());

9
spring-boot/ruoyi-system/src/main/java/com/ruoyi/system/controller/IotDeviceStatusController.java
View File

@@ -10,6 +10,7 @@
******************************************************************************/
package com.ruoyi.system.controller;
import java.math.BigDecimal;
import java.util.List;
import com.alibaba.fastjson.JSON;
@@ -121,12 +122,18 @@ public class IotDeviceStatusController extends BaseController
status=new IotDeviceStatus();
status.setDeviceId(device.getDeviceId());
status.setDeviceNum(device.getDeviceNum());
status.setRelayStatus(0);
status.setLightStatus(0);
status.setLightMode(0);
status.setBrightness(100);
status.setLightInterval(500);
status.setFadeTime(300);
status.setRed(255L);
status.setBlue(255L);
status.setGreen(255L);
status.setAirTemperature(BigDecimal.valueOf(0));
status.setAirHumidity(BigDecimal.valueOf(0));
status.setDeviceTemperature(BigDecimal.valueOf(0));
}
}
return AjaxResult.success(status);
@@ -154,7 +161,7 @@ public class IotDeviceStatusController extends BaseController
public AjaxResult edit(@RequestBody IotDeviceStatus iotDeviceStatus)
{
IotDeviceStatus status=iotDeviceStatusService.selectIotDeviceStatusByDeviceId(iotDeviceStatus.getDeviceId());
if(status.getIsOnline()!=1){return AjaxResult.error("设备已离线，不能更新状态。");}
if(status==null || status.getIsOnline()==0){return AjaxResult.error("设备已离线，不能更新状态。");}
// 存储
iotDeviceStatusService.updateIotDeviceStatus(iotDeviceStatus);