opensource/RuoYi-Vue-Plus
2
0
Fork 1
mirror of https://gitee.com/dromara/RuoYi-Vue-Plus.git synced 2026-09-18 17:38:48 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

iot日志和状态发送修改

Browse Source
This commit is contained in:
zzc 2025-01-06 22:34:02 +08:00
parent 8fc258e8c7
commit 3f820f20b0
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqDeviceController.java
View File

@ -284,7 +284,7 @@ public class EqDeviceController extends BaseController {
String equipmentName = eqEquipmentLogBo.getEquipmentName(); String equipmentName = eqEquipmentLogBo.getEquipmentName();
Integer status = eqEquipmentLogBo.getStatus(); Integer status = eqEquipmentLogBo.getStatus();
List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113"); List<String> statusList = Arrays.asList("101", "102", "103", "104", "105", "106", "107", "108", "1", "2", "112", "113");
if (!statusList.contains(status.toString())) return;
//设备id查询 //设备id查询
DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断 DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断
if (deviceByNameDto==null) throw new RuntimeException("设备不存在"); if (deviceByNameDto==null) throw new RuntimeException("设备不存在");
@ -321,7 +321,8 @@ public class EqDeviceController extends BaseController {
eqEquipmentLogBo.setDayOfWeek(dayOfWeek - 1);// Calendar类中星期日为1，星期一为2，依此类推 eqEquipmentLogBo.setDayOfWeek(dayOfWeek - 1);// Calendar类中星期日为1，星期一为2，依此类推
//更新状态 //更新状态
if(!(status==0 ||status==108 ||status==109 ||status==110 ||status==111 ||status==112 ||status==113||status==114||status==500||status==501) ) if (statusList.contains(status.toString()) )
// if(!(status==0 ||status==108 ||status==109 ||status==110 ||status==111 ||status==112 ||status==113||status==114||status==500||status==501) )
{ {
logService.insertByBo(eqEquipmentLogBo); logService.insertByBo(eqEquipmentLogBo);
} }

7
ruoyi-admin/src/main/java/org/dromara/web/controller/app/EqIotDeviceController.java
View File

@ -141,8 +141,9 @@ public class EqIotDeviceController extends BaseController {
*/ */
@SaIgnore @SaIgnore
@PostMapping("/sendDeviceMsg2") @PostMapping("/sendDeviceMsg2")
public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo){ public void sendDeviceMsg2(@RequestBody EqEquipmentLogBo eqEquipmentLogBo) throws InterruptedException {
String status = eqEquipmentLogBo.getStatus() + ""; Thread.sleep(1000);
/*String status = eqEquipmentLogBo.getStatus() + "";
String statusCache = tokenCache.getIfPresent("status"); String statusCache = tokenCache.getIfPresent("status");
if (StringUtils.isEmpty(statusCache)){ if (StringUtils.isEmpty(statusCache)){
tokenCache.put("status",status); tokenCache.put("status",status);
@ -152,7 +153,7 @@ public class EqIotDeviceController extends BaseController {
}else{ }else{
return; return;
} }
} }*/
String equipmentName = eqEquipmentLogBo.getEquipmentName(); String equipmentName = eqEquipmentLogBo.getEquipmentName();
//设备id查询 //设备id查询
DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断 DeviceByDeviceName deviceByNameDto = iotService.apiTenantDevicesByName(equipmentName);//无信息会抛异常 无需判断