Ver Fonte

fix compile error

taosj há 1 mês atrás
pai
commit
8e4ec94a31

+ 1 - 0
forecast-backend-server/src/main/java/com/ufo/base/framework/config/SecurityConfig.java

@@ -25,6 +25,7 @@ import com.ufo.base.framework.security.handle.LogoutSuccessHandlerImpl;
  * 
  * @author ufo
  */
+@SuppressWarnings("deprecation")
 @EnableGlobalMethodSecurity(prePostEnabled = true, securedEnabled = true)
 public class SecurityConfig extends WebSecurityConfigurerAdapter
 {

+ 0 - 2
forecast-backend-server/src/main/java/com/ufo/base/framework/config/properties/PermitAllUrlProperties.java

@@ -3,8 +3,6 @@ package com.ufo.base.framework.config.properties;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import java.util.Objects;
-import java.util.Optional;
 import java.util.regex.Pattern;
 import org.apache.commons.lang3.RegExUtils;
 import org.springframework.beans.BeansException;

+ 0 - 5
forecast-backend-server/src/main/java/com/ufo/module/system/controller/SysUserController.java

@@ -1,14 +1,9 @@
 package com.ufo.module.system.controller;
 
-import java.util.Arrays;
 import java.util.List;
-import java.util.Map;
 import java.util.stream.Collectors;
-import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
-import com.ufo.base.framework.web.page.PageDomain;
-import com.ufo.base.framework.web.page.TableSupport;
 import org.apache.commons.lang3.ArrayUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.access.prepost.PreAuthorize;

+ 0 - 1
forecast-backend-server/src/main/java/com/ufo/project/config/domain/ConfigDevice.java

@@ -3,7 +3,6 @@ package com.ufo.project.config.domain;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
-import com.ufo.base.framework.web.domain.BaseEntity;
 import com.ufo.base.framework.aspectj.lang.annotation.Excel;
 
 /**

+ 0 - 4
forecast-backend-server/src/main/java/com/ufo/project/data/service/impl/PvPlantCumulativeReportServiceImpl.java

@@ -307,8 +307,6 @@ public class PvPlantCumulativeReportServiceImpl implements IPvPlantCumulativeRep
         double sumTheoreticalPower = 0.0;
         double maxActualPower = 0.0;
         Long maxPowerTimestamp = null;
-        int electricityCount = 0;
-
         for (PointData pd : validPoints)
         {
             if (pd.electricity != null && pd.electricity.getGridStatus() != null && pd.electricity.getGridStatus() == 1)
@@ -328,7 +326,6 @@ public class PvPlantCumulativeReportServiceImpl implements IPvPlantCumulativeRep
                 {
                     sumTheoreticalPower += theoreticalPower;
                 }
-                electricityCount++;
             }
             else if (pd.electricity != null)
             {
@@ -342,7 +339,6 @@ public class PvPlantCumulativeReportServiceImpl implements IPvPlantCumulativeRep
                 {
                     sumTheoreticalPower += theoreticalPower;
                 }
-                electricityCount++;
             }
         }
 

+ 9 - 12
forecast-backend-server/src/main/java/com/ufo/project/data/service/impl/ShortTermPowerForecastReportServiceImpl.java

@@ -3,6 +3,7 @@ package com.ufo.project.data.service.impl;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.format.DateTimeFormatter;
@@ -16,7 +17,6 @@ import java.util.stream.Collectors;
 import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import com.ufo.base.common.constant.CacheConstants;
 import com.ufo.base.common.utils.StringUtils;
 import com.ufo.module.system.domain.SysDictData;
 import com.ufo.module.system.service.ISysDictTypeService;
@@ -37,19 +37,13 @@ import com.ufo.project.model.service.IDataElectricityLocalService;
 @Service
 public class ShortTermPowerForecastReportServiceImpl implements IShortTermPowerForecastReportService
 {
-    private static final int SCALE = 4;
-
     /** Dict类型:短期预测误差阈值 */
     private static final String DICT_TYPE_SHORT_TERM_ERROR_THRESHOLD = "short_term_error_threshold";
 
     private static final DateTimeFormatter DATE_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     private static final DateTimeFormatter MONTH_FMT = DateTimeFormatter.ofPattern("yyyy-MM");
-    private static final DateTimeFormatter YEAR_FMT = DateTimeFormatter.ofPattern("yyyy");
-
     private static final ZoneId ZONE_SHANGHAI = ZoneId.of("Asia/Shanghai");
 
-    private String errorThreshold;
-
     @Autowired
     private IDataElectricityLocalService electricityLocalService;
 
@@ -528,7 +522,8 @@ public class ShortTermPowerForecastReportServiceImpl implements IShortTermPowerF
         return records.stream()
                 .filter(r -> r.getTm() != null)
                 .collect(Collectors.groupingBy(
-                        r -> LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                        r -> LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                .toLocalDate()
                                 .format(DATE_FMT),
                         LinkedHashMap::new,
                         Collectors.toList()));
@@ -544,7 +539,8 @@ public class ShortTermPowerForecastReportServiceImpl implements IShortTermPowerF
                 .collect(Collectors.groupingBy(
                         r ->
                         {
-                            LocalDate ld = LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI);
+                            LocalDate ld = LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                    .toLocalDate();
                             return YearMonth.of(ld.getYear(), ld.getMonth()).format(MONTH_FMT);
                         },
                         LinkedHashMap::new,
@@ -559,7 +555,9 @@ public class ShortTermPowerForecastReportServiceImpl implements IShortTermPowerF
         return records.stream()
                 .filter(r -> r.getTm() != null)
                 .collect(Collectors.groupingBy(
-                        r -> String.valueOf(LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI).getYear()),
+                        r -> String.valueOf(LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                .toLocalDate()
+                                .getYear()),
                         LinkedHashMap::new,
                         Collectors.toList()));
     }
@@ -650,12 +648,11 @@ public class ShortTermPowerForecastReportServiceImpl implements IShortTermPowerF
             List<SysDictData> dictList = dictTypeService.selectDictDataByType(DICT_TYPE_SHORT_TERM_ERROR_THRESHOLD);
             if (dictList != null && !dictList.isEmpty())
             {
-                errorThreshold = dictList.get(0).getDictValue();
+                dictList.get(0).getDictValue();
             }
         }
         catch (Exception e)
         {
-            errorThreshold = "0.2"; // 默认阈值 20%
         }
     }
 }

+ 9 - 8
forecast-backend-server/src/main/java/com/ufo/project/data/service/impl/UltraShortTermPowerForecastReportServiceImpl.java

@@ -3,6 +3,7 @@ package com.ufo.project.data.service.impl;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
 import java.time.LocalDate;
+import java.time.LocalDateTime;
 import java.time.YearMonth;
 import java.time.ZoneId;
 import java.time.ZoneOffset;
@@ -14,12 +15,9 @@ import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.stream.Collectors;
-import javax.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ufo.base.common.utils.StringUtils;
-import com.ufo.module.system.domain.SysDictData;
-import com.ufo.module.system.service.ISysDictTypeService;
 import com.ufo.project.data.domain.vo.UltraShortTermPowerForecastReportQuery;
 import com.ufo.project.data.domain.vo.UltraShortTermPowerForecastReportVO;
 import com.ufo.project.data.service.IUltraShortTermPowerForecastReportService;
@@ -46,8 +44,6 @@ public class UltraShortTermPowerForecastReportServiceImpl implements IUltraShort
 
     private static final DateTimeFormatter DATE_FMT = DateTimeFormatter.ofPattern("yyyy-MM-dd");
     private static final DateTimeFormatter MONTH_FMT = DateTimeFormatter.ofPattern("yyyy-MM");
-    private static final DateTimeFormatter YEAR_FMT = DateTimeFormatter.ofPattern("yyyy");
-
     private static final ZoneId ZONE_SHANGHAI = ZoneId.of("Asia/Shanghai");
     private static final ZoneOffset ZONE_8 = ZoneOffset.ofHours(8);
 
@@ -599,7 +595,9 @@ public class UltraShortTermPowerForecastReportServiceImpl implements IUltraShort
         return records.stream()
                 .filter(r -> r.getTm() != null)
                 .collect(Collectors.groupingBy(
-                        r -> LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI).format(DATE_FMT),
+                        r -> LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                .toLocalDate()
+                                .format(DATE_FMT),
                         LinkedHashMap::new,
                         Collectors.toList()));
     }
@@ -614,7 +612,8 @@ public class UltraShortTermPowerForecastReportServiceImpl implements IUltraShort
                 .collect(Collectors.groupingBy(
                         r ->
                         {
-                            LocalDate ld = LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI);
+                            LocalDate ld = LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                    .toLocalDate();
                             return YearMonth.of(ld.getYear(), ld.getMonth()).format(MONTH_FMT);
                         },
                         LinkedHashMap::new,
@@ -629,7 +628,9 @@ public class UltraShortTermPowerForecastReportServiceImpl implements IUltraShort
         return records.stream()
                 .filter(r -> r.getTm() != null)
                 .collect(Collectors.groupingBy(
-                        r -> String.valueOf(LocalDate.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI).getYear()),
+                        r -> String.valueOf(LocalDateTime.ofInstant(r.getTm().toInstant(), ZONE_SHANGHAI)
+                                .toLocalDate()
+                                .getYear()),
                         LinkedHashMap::new,
                         Collectors.toList()));
     }