|
|
@@ -6,6 +6,7 @@ import com.zksy.api.utils.SmsUtil;
|
|
|
import com.zksy.environment.domain.ERealTimeData;
|
|
|
import com.zksy.environment.mapper.ERealTimeDataMapper;
|
|
|
import com.zksy.environment.utils.AlarmUtil;
|
|
|
+import com.zksy.environment.utils.DeviceOfflineCheckTask;
|
|
|
import com.zksy.utils.DevicePhoneFetchUtil;
|
|
|
import lombok.extern.slf4j.Slf4j;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
@@ -22,6 +23,7 @@ import javax.annotation.PreDestroy;
|
|
|
import java.math.BigDecimal;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
@@ -58,6 +60,9 @@ public class RSServerService {
|
|
|
@Autowired
|
|
|
private RestTemplate restTemplate;
|
|
|
|
|
|
+ @Autowired
|
|
|
+ private DeviceOfflineCheckTask deviceOfflineCheckTask;
|
|
|
+
|
|
|
@Value("${device.status.api.url:http://zk-api-service/equipmentStatus/updateAlarmStatus}")
|
|
|
private String deviceStatusApiUrl;
|
|
|
|
|
|
@@ -130,6 +135,9 @@ public class RSServerService {
|
|
|
@Override
|
|
|
public void receiveRealtimeData(RealTimeData data) {
|
|
|
String deviceId = String.valueOf(data.getDeviceId());
|
|
|
+ // 更新设备最后接收数据时间,并标记设备在线
|
|
|
+ DeviceOfflineCheckTask.deviceLastReceiveTimeMap.put(deviceId, new Date());
|
|
|
+ deviceOfflineCheckTask.markDeviceOnline(deviceId);
|
|
|
boolean hasAlarm = false;
|
|
|
for (NodeData nd : data.getNodeList()) {
|
|
|
try {
|