|
|
@@ -21,6 +21,7 @@ import com.template.services.SmartWarningService;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Controller;
|
|
|
|
|
|
+import java.sql.Time;
|
|
|
import java.text.SimpleDateFormat;
|
|
|
import java.time.LocalDateTime;
|
|
|
import java.time.format.DateTimeFormatter;
|
|
|
@@ -159,6 +160,25 @@ public class DriverStockController implements DriverStockControllerAPI {
|
|
|
@Override
|
|
|
@PassToken
|
|
|
@DESRespondSecret(validated = false)
|
|
|
+ public CommonResult getEnergyDay(Integer type) {
|
|
|
+ SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd");
|
|
|
+ List<JSONObject> jList = new ArrayList<>();
|
|
|
+ for (int i = -11; i <= 0; i++) {
|
|
|
+ Calendar calendar = Calendar.getInstance();
|
|
|
+ calendar.add(Calendar.DATE, i);
|
|
|
+ String date = simpleDateFormat.format(calendar.getTime());
|
|
|
+ List<TjFloat> list = driverStockService.getEnergyDay(date, type);
|
|
|
+ JSONObject jsonObject = new JSONObject();
|
|
|
+ jsonObject.put("date", date);
|
|
|
+ jsonObject.put("data", list);
|
|
|
+ jList.add(jsonObject);
|
|
|
+ }
|
|
|
+ return CommonResult.ok(jList);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ @PassToken
|
|
|
+ @DESRespondSecret(validated = false)
|
|
|
public CommonResult getDeviceT() {
|
|
|
List<JSONObject> list = new ArrayList<>();
|
|
|
JSONObject jsonObject1 = new JSONObject();
|