Ver código fonte

对比图表接口 时间顺序导致拼接的bug调整

王苗苗 7 meses atrás
pai
commit
1dfee3829a

+ 6 - 5
slibra-system/src/main/java/com/slibra/business/service/impl/TXinyiForecastComparisonServiceImpl.java

@@ -126,9 +126,9 @@ public class TXinyiForecastComparisonServiceImpl implements ITXinyiForecastCompa
         JSONObject jsonObject = new JSONObject();
         //获取日期集合
         //把最新的一条数据的最后两个点的预测值补上
-        TXinyiForecastComparison tXinyiForecastComparison = list.get(0);
-        timeList.add(tXinyiForecastComparison.getForecastTimeTwo());
-        timeList.add(tXinyiForecastComparison.getForecastTimeThree());
+        TXinyiForecastComparison tXinyiForecastComparison = list.get(list.size() - 1);
+        /*timeList.add(tXinyiForecastComparison.getForecastTimeTwo());
+        timeList.add(tXinyiForecastComparison.getForecastTimeThree());*/
         jsonObject.put("time", timeList);
         //获取数据集合
         //把最新的一条数据的最后两个点的预测值补上
@@ -144,7 +144,7 @@ public class TXinyiForecastComparisonServiceImpl implements ITXinyiForecastCompa
         JSONObject jsonObject = new JSONObject();
         //获取日期集合
         //把最新的一条数据的最后两个点的预测值补上
-        TXinyiForecastComparison tXinyiForecastComparison = list.get(0);
+        TXinyiForecastComparison tXinyiForecastComparison = list.get(list.size() - 1);
         timeList.add(tXinyiForecastComparison.getForecastTimeTwo());
         timeList.add(tXinyiForecastComparison.getForecastTimeThree());
         jsonObject.put("time", timeList);
@@ -160,7 +160,8 @@ public class TXinyiForecastComparisonServiceImpl implements ITXinyiForecastCompa
     private JSONObject getRealByTXinyiForecastComparison(List<TXinyiForecastComparison> list, List<String> timeList) {
         JSONObject jsonObject = new JSONObject();
         //获取日期集合
-        jsonObject.put("time", timeList);
+        List<String> tempList = timeList;//因为后续会赋值,这里要用个变量接收下
+        jsonObject.put("time", tempList);
         //获取数据集合
         jsonObject.put("data", list.stream().map(TXinyiForecastComparison::getRealOne).collect(Collectors.toList()));
         return jsonObject;