Merge remote-tracking branch 'origin/jys7-15' into jys7-15

zj

2024-12-04 a8e2e9ff1040e8668e992b97416eaad21132dae1

 src/main/java/project/web/api/RealtimeController.java

@@ -2,11 +2,9 @@

import java.math.RoundingMode;
import java.text.DecimalFormat;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.text.SimpleDateFormat;
import java.util.*;
import java.util.stream.Collectors;

import javax.servlet.http.HttpServletRequest;

@@ -69,8 +67,7 @@
               realtime.setOrder(order);
               list_clone.add(realtime);
            }
            Collections.sort(list_clone);
            data = list_clone;
            data = list_clone.stream().sorted(Comparator.comparing(Realtime::getClose).reversed()).collect(Collectors.toList());
         }
         resultObject.setData(this.revise(data));
         return JSONObject.toJSONString(resultObject);
@@ -93,7 +90,12 @@
         Map<String, Object> map = new HashMap<String, Object>();
         map.put("symbol", realtime.getSymbol());
         map.put("ts", realtime.getTs());
         map.put("current_time", realtime.getCurrent_time());
         String currentTime = realtime.getCurrent_time();
         // 设置时区为纽约的冬令时（Eastern Standard Time, EST）
         TimeZone timeZone = TimeZone.getTimeZone("America/New_York");
         SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
         sdf.setTimeZone(timeZone);
         map.put("current_time",sdf.format(currentTime));
         map.put("name", realtime.getName());
         map.put("change_ratio", realtime.getChange_ratio());
         Item item = this.itemService.cacheBySymbol(realtime.getSymbol(), true);