|
@@ -24,6 +24,7 @@ import jakarta.annotation.Resource;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.stereotype.Service;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import org.springframework.transaction.annotation.Transactional;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
import vip.xiaonuo.auth.core.util.StpLoginUserUtil;
|
|
|
|
+import vip.xiaonuo.coldchain.modular.monitordevice.entity.MonitorDevice;
|
|
import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
|
|
import vip.xiaonuo.coldchain.modular.monitordevice.service.MonitorDeviceService;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.entity.MonitorTarget;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.enums.MonitorStatusEnum;
|
|
import vip.xiaonuo.coldchain.modular.monitortarget.enums.MonitorStatusEnum;
|
|
@@ -171,7 +172,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public boolean updateLastHeartbeatTimeByDeviceId(Integer deviceId, Date timestamp) {
|
|
public boolean updateLastHeartbeatTimeByDeviceId(Integer deviceId, Date timestamp) {
|
|
- List<String> targetIdList = monitorTargetRegionService.getTargetIdListByDeviceId(deviceId.toString());
|
|
|
|
|
|
+ MonitorDevice monitorDevice = monitorDeviceService.queryEntity(deviceId.toString());
|
|
|
|
+ List<String> targetIdList = monitorTargetRegionService.getTargetIdListByDeviceId(monitorDevice.getDeviceCode());
|
|
if (ObjectUtil.isEmpty(targetIdList)) {
|
|
if (ObjectUtil.isEmpty(targetIdList)) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|
|
@@ -186,7 +188,8 @@ public class MonitorTargetServiceImpl extends ServiceImpl<MonitorTargetMapper, M
|
|
|
|
|
|
@Override
|
|
@Override
|
|
public boolean updateLastLoginTimeByDeviceId(Integer deviceId, Date timestamp) {
|
|
public boolean updateLastLoginTimeByDeviceId(Integer deviceId, Date timestamp) {
|
|
- List<String> targetIdList = monitorTargetRegionService.getTargetIdListByDeviceId(deviceId.toString());
|
|
|
|
|
|
+ MonitorDevice monitorDevice = monitorDeviceService.queryEntity(deviceId.toString());
|
|
|
|
+ List<String> targetIdList = monitorTargetRegionService.getTargetIdListByDeviceId(monitorDevice.getDeviceCode());
|
|
if (ObjectUtil.isEmpty(targetIdList)) {
|
|
if (ObjectUtil.isEmpty(targetIdList)) {
|
|
return false;
|
|
return false;
|
|
}
|
|
}
|