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

设备日志改进

Browse Source
This commit is contained in:
kerwincui
2022-06-11 16:41:19 +08:00
parent 33a7ba9645
commit eeac05745f
9 changed files with 80 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
springboot/wumei-iot/src/main/java/com/ruoyi/iot/domain/DeviceLog.java
View File

@@ -47,9 +47,13 @@ public class DeviceLog extends BaseEntity
private String identity;
/** 是否监测数据（1=是，0=否） */
@Excel(name = "是否监测数据", readConverterExp = "1==是，0=否")
@Excel(name = "是否监测数据", readConverterExp = "1=是，0=否")
private Integer isMonitor;
/** 模式 */
@Excel(name = "模式", readConverterExp = "1=影子模式，2=在线模式,3=其他")
private Integer mode;
/** 用户ID */
@Excel(name = "用户ID")
private Long userId;
@@ -66,6 +70,14 @@ public class DeviceLog extends BaseEntity
@Excel(name = "租户名称")
private String tenantName;
public Integer getMode() {
return mode;
}
public void setMode(Integer mode) {
this.mode = mode;
}
public Long getUserId() {
return userId;
}

4
springboot/wumei-iot/src/main/java/com/ruoyi/iot/mqtt/EmqxService.java
View File

@@ -1,6 +1,7 @@
package com.ruoyi.iot.mqtt;
import com.alibaba.fastjson.JSON;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.iot.domain.Device;
import com.ruoyi.iot.domain.DeviceLog;
import com.ruoyi.iot.model.NtpModel;
@@ -203,6 +204,9 @@ public class EmqxService {
deviceLog.setUserName(device.getUserName());
deviceLog.setTenantId(device.getTenantId());
deviceLog.setTenantName(device.getTenantName());
deviceLog.setCreateTime(DateUtils.getNowDate());
// 1=影子模式，2=在线模式，3=其他
deviceLog.setMode(2);
logService.saveDeviceLog(deviceLog);
}
} catch (Exception e) {

1
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceLogServiceImpl.java
View File

@@ -71,7 +71,6 @@ public class DeviceLogServiceImpl implements IDeviceLogService
@Override
public int insertDeviceLog(DeviceLog deviceLog)
{
deviceLog.setCreateTime(DateUtils.getNowDate());
return logService.saveDeviceLog(deviceLog);
}

10
springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/DeviceServiceImpl.java
View File

@@ -235,14 +235,17 @@ public class DeviceServiceImpl implements IDeviceService {
deviceLog.setLogValue(input.getThingsModelValueRemarkItem().get(i).getValue());
deviceLog.setRemark(input.getThingsModelValueRemarkItem().get(i).getRemark());
deviceLog.setIdentity(input.getThingsModelValueRemarkItem().get(i).getId());
deviceLog.setCreateTime(DateUtils.getNowDate());
deviceLog.setIsMonitor(valueList.get(k).getIsMonitor());
deviceLog.setLogType(type);
deviceLog.setUserId(deviceThings.getUserId());
deviceLog.setUserName(deviceThings.getUserName());
deviceLog.setTenantId(deviceThings.getTenantId());
deviceLog.setTenantName(deviceThings.getTenantName());
deviceLog.setCreateTime(DateUtils.getNowDate());
// 1=影子模式，2=在线模式，3=其他
deviceLog.setMode(isShadow?1:2);
logService.saveDeviceLog(deviceLog);
break;
}
}
@@ -709,7 +712,7 @@ public class DeviceServiceImpl implements IDeviceService {
/**
*
* @param device 设备
* @param device 设备状态和定位更新
* @return 结果
*/
@Override
@@ -738,6 +741,9 @@ public class DeviceServiceImpl implements IDeviceService {
deviceLog.setUserName(device.getUserName());
deviceLog.setTenantId(device.getTenantId());
deviceLog.setTenantName(device.getTenantName());
deviceLog.setCreateTime(DateUtils.getNowDate());
// 1=影子模式，2=在线模式，3=其他
deviceLog.setMode(3);
if(device.getStatus()==3){
deviceLog.setLogValue("1");
deviceLog.setRemark("设备上线");

1
springboot/wumei-iot/src/main/java/com/ruoyi/iot/tdengine/service/impl/MySqlLogServiceImpl.java
View File

@@ -1,5 +1,6 @@
package com.ruoyi.iot.tdengine.service.impl;
import com.ruoyi.common.utils.DateUtils;
import com.ruoyi.iot.domain.Device;
import com.ruoyi.iot.domain.DeviceLog;
import com.ruoyi.iot.model.DeviceStatistic;