From 886fd5619cb63f2eb415741f6be0d50bc282e3c9 Mon Sep 17 00:00:00 2001 From: hupeng Date: Thu, 20 Jun 2019 21:24:32 +0800 Subject: [PATCH] =?UTF-8?q?[=E7=94=B5=E8=A1=A8][=E4=BF=AE=E5=A4=8D]:?= =?UTF-8?q?=E7=9B=92=E5=AD=90=E6=97=B6=E9=97=B4=E6=9C=AA=E5=90=8C=E6=AD=A5?= =?UTF-8?q?=E6=97=B6=E7=BA=A0=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../iformall/controller/device/KwBoxV1Controller.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java index 19b13d8bb..ded5c34db 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -10,6 +10,7 @@ import com.iformall.domain.po.KwBoxCmdHistory; import com.iformall.enums.EnumBoxRegisterStatus; import com.iformall.service.kw.KwBoxCmdHistoryService; import com.iformall.service.kw.KwBoxService; + import io.netty.util.internal.StringUtil; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -19,6 +20,9 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; +import java.time.Instant; +import java.time.LocalDateTime; +import java.time.ZoneId; import java.util.*; import java.util.stream.Collectors; @@ -135,6 +139,12 @@ public class KwBoxV1Controller extends BaseController { record.setId(kwBox.getId()); record.setLastOnlineTime(new Date()); kwBoxService.saveOrUpdate(record); + + Instant instant = deviceTime.toInstant(); + ZoneId zone = ZoneId.systemDefault(); + LocalDateTime localDateTime = LocalDateTime.ofInstant(instant, zone); + if (localDateTime.getYear() == 1980) + deviceTime = new Date(); List> metersData = (List>)paramMap.get("meters"); kwBoxService.saveMeterData(kwBox, metersData, deviceTime);