TRX 1 год назад
Родитель
Сommit
ab5ab179dc

+ 3 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/domain/iot/mqtt/DeviceInfo.java

@@ -56,6 +56,9 @@ public class DeviceInfo extends SuperEntity {
     @Schema(description = "最后上线时间")
     private Long lastOnlineTime;
 
+    @Schema(description = "最后上线时间")
+    private String lastOnlineTimeStr;
+
     @Schema(description = "所属项目")
     @DBRef(lazy = true)
     private ProjectInfo projectInfo;

+ 2 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DeviceInfoService.java

@@ -20,6 +20,7 @@ import com.zhongshu.iot.server.core.domain.iot.mqtt.ProjectInfo;
 import com.zhongshu.iot.server.core.service.iot.IotServiceImpl;
 import com.zhongshu.iot.server.core.service.sync.DeviceSyncFullCardService;
 import com.zhongshu.iot.server.core.service.user.OperationLogsService;
+import com.zhongshu.iot.server.core.util.DateUtils;
 import com.zhongshu.iot.server.core.util.bean.BeanUtils;
 import com.zhongshu.iot.server.core.util.page.PageEntityUtil;
 import org.apache.commons.lang3.ObjectUtils;
@@ -96,6 +97,7 @@ public class DeviceInfoService {
         }
         BeanUtils.copyProperties(param, deviceInfo, "id");
         deviceInfo.setLastOnlineTime(System.currentTimeMillis());
+        deviceInfo.setLastOnlineTimeStr(DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
         deviceInfo.setOnLineState(OnLineState.OnLine);
 
         // 项目

+ 1 - 0
OneCardIotServer/src/main/java/com/zhongshu/iot/server/core/service/device/DevicePingInfoService.java

@@ -69,6 +69,7 @@ public class DevicePingInfoService extends SuperService {
             Map<String, Object> standardData = new HashMap<String, Object>();
             standardData.put("id", deviceInfo.getId());
             standardData.put("lastOnlineTime", time);
+            standardData.put("lastOnlineTimeStr", DateUtils.paresTime(System.currentTimeMillis(), DateUtils.FORMAT_LONG));
             standardData.put("onLineState", OnLineState.OnLine);
             commonService.updateData(standardData, DeviceInfo.class.getSimpleName());