|
|
@ -5,6 +5,7 @@
|
|
|
|
|
|
|
|
|
|
|
|
package ru.ulstu.extractor.ts.service;
|
|
|
|
package ru.ulstu.extractor.ts.service;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
import org.json.JSONArray;
|
|
|
|
import org.json.JSONObject;
|
|
|
|
import org.json.JSONObject;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.Logger;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
|
import org.slf4j.LoggerFactory;
|
|
|
@ -12,6 +13,7 @@ import org.springframework.stereotype.Service;
|
|
|
|
import ru.ulstu.extractor.branch.model.Branch;
|
|
|
|
import ru.ulstu.extractor.branch.model.Branch;
|
|
|
|
import ru.ulstu.extractor.http.HttpService;
|
|
|
|
import ru.ulstu.extractor.http.HttpService;
|
|
|
|
import ru.ulstu.extractor.http.JsonTimeSeries;
|
|
|
|
import ru.ulstu.extractor.http.JsonTimeSeries;
|
|
|
|
|
|
|
|
import ru.ulstu.extractor.http.SmoothingTimeSeries;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeries;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeries;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeriesType;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeriesType;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeriesValue;
|
|
|
|
import ru.ulstu.extractor.ts.model.TimeSeriesValue;
|
|
|
@ -114,9 +116,13 @@ public class TimeSeriesService {
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
public Double getLastTimeSeriesTendency(TimeSeries ts) {
|
|
|
|
public Double getLastTimeSeriesTendency(TimeSeries ts) {
|
|
|
|
//JSONObject response = httpService.post(TIME_SERIES_TENDENCY_URL, new JSONObject(new SmoothingTimeSeries(ts)));
|
|
|
|
if (ts != null && ts.getValues().size() > 5) {
|
|
|
|
LOG.debug("Успешно отправлен на сервис сглаживания");
|
|
|
|
JSONObject response = httpService.post(TIME_SERIES_TENDENCY_URL, new JSONObject(new SmoothingTimeSeries(ts)));
|
|
|
|
//response.get("timeSeries");
|
|
|
|
LOG.debug("Успешно отправлен на сервис сглаживания");
|
|
|
|
|
|
|
|
response.get("timeSeries");
|
|
|
|
|
|
|
|
JSONArray jsonArray = response.getJSONObject("timeSeries").getJSONArray("values");
|
|
|
|
|
|
|
|
return jsonArray.getJSONObject(jsonArray.length() - 1).getDouble("value");
|
|
|
|
|
|
|
|
}
|
|
|
|
return 0.0;
|
|
|
|
return 0.0;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|