q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修改

Browse Source
This commit is contained in:
Jerry Yan
2025-01-23 09:31:56 +08:00
parent 38c4b553bc
commit 1aa1ae5e2b
18 changed files with 171 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/java/com/ycwl/basic/controller/viid/ViidController.java
View File

@ -78,21 +78,22 @@ public class ViidController {
DeviceIdObject deviceIdObject = req.getRegisterObject();
log.info("注册的设备信息：{}", deviceIdObject);
// 保存设备注册时间
DeviceEntity device = deviceRepository.getDeviceByDeviceNo(deviceIdObject.getDeviceId());
String deviceId = deviceIdObject.getDeviceId();
DeviceEntity device = deviceRepository.getDeviceByDeviceNo(deviceId);
if (device == null) {
device = new DeviceEntity();
device.setName("未配置设备");
device.setNo(deviceIdObject.getDeviceId());
device.setNo(deviceId);
device.setOnline(1);
}
device.setKeepaliveAt(new Date());
device.setIpAddr(IpUtils.getIpAddr(request));
if (device.getId() != null) {
deviceMapper.updateEntity(device);
deviceRepository.clearDeviceCache(device.getId());
} else {
device.setId(SnowFlakeUtil.getLongId());
deviceMapper.addEntity(device);
deviceRepository.clearDeviceCache(deviceId);
}
return new VIIDBaseResp(
new ResponseStatusObject(serverId, "/VIID/System/Register", "0", "注册成功", sdfTime.format(new Date()))
@ -126,6 +127,7 @@ public class ViidController {
device.setIpAddr(IpUtils.getIpAddr(request));
device.setId(SnowFlakeUtil.getLongId());
deviceMapper.addEntity(device);
deviceRepository.clearDeviceCache(deviceId);
} else {
deviceRepository.updateOnlineStatus(device.getId(), IpUtils.getIpAddr(request), 1, new Date());
}