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

后端bug修复

Browse Source
This commit is contained in:
kerwincui
2021-07-10 22:17:34 +08:00
parent 2f67d65302
commit e24f0c58cf
3 changed files with 48 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -12,11 +12,15 @@ package com.ruoyi.system.controller;
import java.util.List;
import com.ruoyi.common.core.domain.model.LoginUser;
import com.ruoyi.common.utils.ServletUtils;
import com.ruoyi.system.domain.vo.IotDeviceListDto;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.core.token.TokenService;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.PutMapping;
@@ -57,6 +61,8 @@ public class IotDeviceController extends BaseController
public TableDataInfo list(IotDevice iotDevice)
{
startPage();
LoginUser user=(LoginUser)SecurityContextHolder.getContext().getAuthentication().getPrincipal();
iotDevice.setOwnerId(user.getUser().getUserId().toString());
List<IotDeviceListDto> list = iotDeviceService.selectIotDeviceList(iotDevice);
return getDataTable(list);
}

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

@@ -13,8 +13,10 @@ package com.ruoyi.system.controller;
import java.util.List;
import com.alibaba.fastjson.JSON;
import com.ruoyi.system.domain.IotDevice;
import com.ruoyi.system.domain.IotDeviceStatus;
import com.ruoyi.system.mqtt.config.MqttPushClient;
import com.ruoyi.system.service.IIotDeviceService;
import com.ruoyi.system.service.IIotDeviceStatusService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -52,6 +54,8 @@ public class IotDeviceSetController extends BaseController
private IIotDeviceSetService iotDeviceSetService;
@Autowired
private IIotDeviceStatusService iotDeviceStatusService;
@Autowired
private IIotDeviceService iotDeviceService;
@Autowired
private MqttPushClient mqttPushClient;
@@ -102,7 +106,23 @@ public class IotDeviceSetController extends BaseController
@GetMapping(value = "/new/{deviceId}")
public AjaxResult getNewInfo(@PathVariable("deviceId") Long deviceId)
{
return AjaxResult.success(iotDeviceSetService.selectIotDeviceSetByDeviceId(deviceId));
IotDeviceSet set=iotDeviceSetService.selectIotDeviceSetByDeviceId(deviceId);
if(set==null){
// 构建默认数据
IotDevice device=iotDeviceService.selectIotDeviceById(deviceId);
if(device!=null) {
set=new IotDeviceSet();
set.setDeviceId(device.getDeviceId());
set.setDeviceNum(device.getDeviceNum());
set.setOwnerId(device.getOwnerId());
set.setRadarInterval(5);
set.setRfOneFunc(1);
set.setRfTwoFunc(2);
set.setRfThreeFunc(3);
set.setRfFourFunc(4);
}
}
return AjaxResult.success(set);
}
/**

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

@@ -13,7 +13,9 @@ package com.ruoyi.system.controller;
import java.util.List;
import com.alibaba.fastjson.JSON;
import com.ruoyi.system.domain.IotDevice;
import com.ruoyi.system.mqtt.config.MqttPushClient;
import com.ruoyi.system.service.IIotDeviceService;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.springframework.security.access.prepost.PreAuthorize;
@@ -48,6 +50,8 @@ public class IotDeviceStatusController extends BaseController
{
@Autowired
private IIotDeviceStatusService iotDeviceStatusService;
@Autowired
private IIotDeviceService iotDeviceService;
@Autowired
private MqttPushClient mqttPushClient;
@@ -109,7 +113,23 @@ public class IotDeviceStatusController extends BaseController
@GetMapping(value = "/new/{deviceId}")
public AjaxResult getNewInfo(@PathVariable("deviceId") Long deviceId)
{
return AjaxResult.success(iotDeviceStatusService.selectIotDeviceStatusByDeviceId(deviceId));
IotDeviceStatus status=iotDeviceStatusService.selectIotDeviceStatusByDeviceId(deviceId);
if(status==null){
// 构建默认数据
IotDevice device=iotDeviceService.selectIotDeviceById(deviceId);
if(device!=null) {
status=new IotDeviceStatus();
status.setDeviceId(device.getDeviceId());
status.setDeviceNum(device.getDeviceNum());
status.setBrightness(100);
status.setLightInterval(500);
status.setFadeTime(300);
status.setRed(255L);
status.setBlue(255L);
status.setGreen(255L);
}
}
return AjaxResult.success(status);
}
/**