修复代码2

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/ForecastPowerUltraShortTermService.java

@@ -299,7 +299,7 @@ public class ForecastPowerUltraShortTermService extends BaseService {
     Date startTime = DateUtils.addMinutes(currentTime, -10);
     Date endTime = DateUtils.addMinutes(currentTime, 1);
     List<PowerStationStatusData> powerStationStatusDataList = this.powerStationStatusDataRepository.findByTimeBetweenAndStationCode(startTime, endTime, stationCode);
-    List<PowerStationStatusData> filterList = powerStationStatusDataList.stream().filter(t -> t.getAbleValue().compareTo(new BigDecimal("-1")) == 1).collect(Collectors.toList());
+    List<PowerStationStatusData> filterList = powerStationStatusDataList.stream().filter(t -> t.getAbleValue().compareTo(new BigDecimal("-1")) > 0).collect(Collectors.toList());
     String coe = super.getSysParameter("CDQ_COE", "1.05", stationCode);
 
     long monentTime = 0L;

ipfcst-console/src/main/java/com/jiayue/ipfcst/console/service/InitJobClassService.java

@@ -1,6 +1,7 @@
 package com.jiayue.ipfcst.console.service;
 
 import com.jiayue.ipfcst.common.data.entity.InitJobClass;
+import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.repository.InitJobClassRepository;
 import com.jiayue.ipfcst.common.data.service.BaseService;
 import lombok.extern.slf4j.Slf4j;
@@ -14,10 +15,7 @@ import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.persistence.criteria.Predicate;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * 定时逻辑
@@ -145,7 +143,12 @@ public class InitJobClassService extends BaseService {
    * @return InitJobClass
    */
   public InitJobClass findById(String id) {
-    return initJobClassRepository.findById(Integer.parseInt(id)).get();
+    Optional<InitJobClass> optional = initJobClassRepository.findById(Integer.parseInt(id));
+    InitJobClass initJobClass = null;
+    if (optional.isPresent()) {
+      initJobClass = optional.get();
+    }
+    return initJobClass;
   }
 
   public InitJobClass findByName(String jobClassName) {

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/IEC102/Base102Service.java

@@ -56,7 +56,9 @@ public class Base102Service {
     String fileNameKey = "";
     for (Map.Entry<String, FileMutableInteger> entry : filterMap.entrySet()) {
       fileNameKey = entry.getKey();
-      break;
+      if (!"".equals(fileNameKey)){
+        break;
+      }
     }
     String[] keys = new String[3];
     String tempFileName = fileNameKey;

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/config/AppenderFactory.java

@@ -36,9 +36,6 @@ public class AppenderFactory {
     if (logger != null) {
       return logger;
     } else {
-      if (logger != null) {
-        return logger;
-      }
       logger = getAppender(name, type, no);
       FileConstant.uploadLogMap.put(no, logger);
     }

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/controller/UploadObjectController.java

@@ -1,8 +1,10 @@
 package com.jiayue.ipfcst.fileupload.controller;
 
 import com.jiayue.ipfcst.aop.SaveValidate;
+import com.jiayue.ipfcst.common.core.exception.BusinessException;
 import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
 import com.jiayue.ipfcst.common.data.constant.enums.FileTypeEnum;
+import com.jiayue.ipfcst.common.data.entity.InverterInfo;
 import com.jiayue.ipfcst.common.data.entity.UploadFileChannel;
 import com.jiayue.ipfcst.common.data.entity.UploadObject;
 import com.jiayue.ipfcst.common.data.repository.UploadObjectRepository;
@@ -12,10 +14,7 @@ import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 @RestController
@@ -133,8 +132,10 @@ public class UploadObjectController {
   @GetMapping("getByuploadObjectId/{uploadObjectId}")
   public ResponseVO getFileTypeByupId(@PathVariable("uploadObjectId") Integer uploadObjectId) {
     List<UploadObject> list = new ArrayList<>();
-    UploadObject uploadObject = uploadObjectRepository.findById(uploadObjectId).get();
-    list.add(uploadObject);
+    Optional<UploadObject> optional = uploadObjectRepository.findById(uploadObjectId);
+    if (optional.isPresent()) {
+      list.add(optional.get());
+    }
     return ResponseVO.success(list);
   }