소스 검색

版本更新

malk 1 주 전
부모
커밋
620205736a

+ 1 - 0
mjava-xiding/src/main/java/com/malk/xiding/Boot.java

@@ -7,6 +7,7 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
 
 import javax.persistence.EntityManager;
+import java.util.TimeZone;
 
 /**
  * corp项目: 扫描公共模块

+ 8 - 1
mjava-xiding/src/main/java/com/malk/xiding/controller/XDController.java

@@ -16,6 +16,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Arrays;
 import java.util.Date;
 import java.util.List;
@@ -79,7 +80,13 @@ public class XDController {
     @GetMapping("time")
     McR time() {
 
-        Map map = UtilMap.map("t1, t2", new Date(), LocalDateTime.now());
+        Map map = UtilMap.map("t1, t2, ts1, ts2", new Date(), LocalDateTime.now(),new Date().getTime(), LocalDateTime.now().toInstant(ZoneOffset.of("+8")).toEpochMilli());
+
+        long endTime = new Date().getTime() - 0 * 24 * 60 * 60 * 1000L;
+        long startTime = endTime - (0 + 45) * 24 * 60 * 60 * 1000L;
+
+        map.put("startTime", new Date(startTime));
+        map.put("endTime", new Date(endTime));
 
         return McR.success(map);
     }

BIN
mjava-xiding/target/mjava-xiding.jar.original