diff --git a/src/main/java/cn/stock/market/web/MoneyApiController.java b/src/main/java/cn/stock/market/web/MoneyApiController.java index b8f2936..6c0f604 100644 --- a/src/main/java/cn/stock/market/web/MoneyApiController.java +++ b/src/main/java/cn/stock/market/web/MoneyApiController.java @@ -678,13 +678,13 @@ public class MoneyApiController { if(StringUtils.equals("H",resolution)){ to = (long) (System.currentTimeMillis() / 1000); from = to - ( 60 * 60 ); - countback = 16; + countback = 60; request.setResolution("1"); }else if(StringUtils.equals("D",resolution)){ to = (long) (System.currentTimeMillis() / 1000); from = to - (24 * 60 * 60 ); - countback = 30; - request.setResolution("1"); + countback = 75; + request.setResolution("5"); }else if(StringUtils.equals("W",resolution)){ to = (long) (System.currentTimeMillis() / 1000); from = to - (10 * 24 * 60 * 60 ); @@ -754,6 +754,11 @@ public class MoneyApiController { //根据时间过滤,只留当天的数据 Date currentTime = new Date(); + //判断最后一条是不是当天的数据,如果不是,把最后一条的时间作为当天的时间 + long getTime = response.getT().get(response.getT().size() - 1) * 1000L; + if(!DateUtil.isSameDay(currentTime, new Date(getTime))){ + currentTime = new Date(getTime); + } int i = 0; for (Long time : response.getT()) { time = time * 1000;