diff --git a/src/main/java/cn/stock/market/web/MoneyApiController.java b/src/main/java/cn/stock/market/web/MoneyApiController.java index 8b028f6..e905a43 100644 --- a/src/main/java/cn/stock/market/web/MoneyApiController.java +++ b/src/main/java/cn/stock/market/web/MoneyApiController.java @@ -816,7 +816,7 @@ public class MoneyApiController { for (String dateStr : dates) { try { Date date = sdf.parse(dateStr); - list.add(date.getTime()); + list.add(date.getTime() / 1000); } catch (ParseException e) { e.printStackTrace(); } @@ -827,7 +827,7 @@ public class MoneyApiController { try { SimpleDateFormat sdf = new SimpleDateFormat("MM/dd/yyyy hh:mm:ss a", Locale.US); Date date = sdf.parse(dateStr); - return date.getTime(); + return date.getTime() / 1000; } catch (ParseException e) { e.printStackTrace(); return 0L; @@ -980,6 +980,33 @@ public class MoneyApiController { response.setC(closeList); response.setV(volumeList); +// if (resolution.equals("H")) { +// Set desiredTimes = new HashSet<>(Arrays.asList("09:30", "10:30", "11:30", "12:30", "13:30", "14:30")); +// +// // Filter data based on timestamps +// SimpleDateFormat sdf = new SimpleDateFormat("HH:mm"); +// List indicesToKeep = new ArrayList<>(); +// for (int i = 0; i < dateList.size(); i++) { +// String time = sdf.format(new Date(dateList.get(i) * 1000)); +// if (desiredTimes.contains(time)) { +// indicesToKeep.add(i); +// } +// } +// +// // Filter corresponding data +// List filteredT = indicesToKeep.stream().map(dateList::get).collect(Collectors.toList()); +// List filteredO = indicesToKeep.stream().map(openList::get).collect(Collectors.toList()); +// List filteredH = indicesToKeep.stream().map(highList::get).collect(Collectors.toList()); +// List filteredL = indicesToKeep.stream().map(lowList::get).collect(Collectors.toList()); +// List filteredC = indicesToKeep.stream().map(closeList::get).collect(Collectors.toList()); +// List filteredV = indicesToKeep.stream().map(volumeList::get).collect(Collectors.toList()); +// response.setT(filteredT); +// response.setO(filteredO); +// response.setH(filteredH); +// response.setL(filteredL); +// response.setC(filteredC); +// response.setV(filteredV); +// } return ResponseEntity.ok(response); } }