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 871b4cd91..17308b8f6 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/device/KwBoxV1Controller.java @@ -21,10 +21,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.text.SimpleDateFormat; -import java.util.Date; -import java.util.HashMap; -import java.util.List; -import java.util.Map; +import java.util.*; import java.util.stream.Collectors; @RestController @@ -199,7 +196,8 @@ public class KwBoxV1Controller extends BaseController { if (StringUtil.isNullOrEmpty(time)) return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); - SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yy/MM/dd,hh:mm:ss±zz"); + SimpleDateFormat simpleDateFormat=new SimpleDateFormat("yy/MM/dd,HH:mm:ss+32"); + simpleDateFormat.setTimeZone(TimeZone.getTimeZone("GMT+:00:00")); Date deviceTime = null; try { deviceTime=simpleDateFormat.parse(time);