[0903] 优化短期功率预测、超短期功率预测 time字段格式

forecast-backend-server/src/main/java/com/ufo/project/forecast/shortterm/power/controller/ShortTermPowerForecastingController.java

@@ -3,8 +3,11 @@ package com.ufo.project.forecast.shortterm.power.controller;
 import java.io.IOException;
 import java.net.URLEncoder;
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.GetMapping;
@@ -20,7 +23,6 @@ import com.ufo.base.framework.web.domain.AjaxResult;
 import com.ufo.project.forecast.shortterm.power.domain.DataShortTermPowerForecastIssued;
 import com.ufo.project.forecast.shortterm.power.domain.ShortTermPowerForecastData;
 import com.ufo.project.forecast.shortterm.power.service.IDataShortTermPowerForecastIssuedService;
-import com.ufo.project.forecast.shortterm.power.util.ExcelForecastFileUtil;
 
 /**
  * 短期功率预测Controller
@@ -90,7 +92,8 @@ public class ShortTermPowerForecastingController extends BaseController
         for (DataShortTermPowerForecastIssued issued : issuedList)
         {
             ShortTermPowerForecastData data = new ShortTermPowerForecastData();
-            data.setTime(ExcelForecastFileUtil.formatTime(String.valueOf(issued.getStartTime())));
+            Date date = new Date(issued.getStartTime() * 1000L);
+            data.setTime(DateFormatUtils.format(date, DateUtils.YYYY_MM_DD_HH_MM_SS));
             try
             {
                 data.setPower(Double.parseDouble(issued.getPower()));

forecast-backend-server/src/main/java/com/ufo/project/forecast/shortterm/power/controller/UltraShortTermPowerForecastingController.java

@@ -7,6 +7,8 @@ import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
 import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.lang3.time.DateFormatUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,6 +18,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import com.alibaba.excel.EasyExcel;
+import com.ufo.base.common.utils.DateUtils;
 import com.ufo.base.framework.aspectj.lang.annotation.Log;
 import com.ufo.base.framework.aspectj.lang.enums.BusinessType;
 import com.ufo.base.framework.web.controller.BaseController;
@@ -137,7 +140,8 @@ public class UltraShortTermPowerForecastingController extends BaseController
     private UltraShortTermPowerForecastData toData(DataUltraShortTermPowerForecasting data)
     {
         UltraShortTermPowerForecastData result = new UltraShortTermPowerForecastData();
-        result.setTime(ExcelForecastFileUtil.formatTime(String.valueOf(data.getStartTime())));
+        Date date = new Date(data.getStartTime() * 1000L);
+        result.setTime(DateFormatUtils.format(date, DateUtils.YYYY_MM_DD_HH_MM_SS));
         result.setMonitoredPower(parseDouble(data.getPower()));
         result.setPower15(parseDouble(data.getPower15()));
         result.setPower30(parseDouble(data.getPower30()));