修复代码3

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

@@ -96,7 +96,7 @@ public class FileAnalysisService extends BaseService {
   @SneakyThrows
   public void analysisJob() {
     log.info("-----------------开始执行文件解析任务----------------------");
-    long timeD = 15 * 60 * 1000;
+    long timeD = 15 * 60 * 1000L;
     Long currentDate = DateTimeUtil.getMillisecondsSubDay();//今日凌晨
     boolean flag;
     List<ElectricField> electricFieldList = electricFieldService.getAll();

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/BaseUploadFileService.java

@@ -71,7 +71,6 @@ public abstract class BaseUploadFileService extends BaseService {
    * @param fileName
    * @return 存在则返回false，不存在返回true
    */
-  @Transactional(propagation = Propagation.REQUIRED)
   protected boolean getFileName(String fileName, String fileType, String stationCode) {
     int cdqUpMin = getTranSysParameter("CDQ_UP_MIN", "0", stationCode);
     //今日凌晨
@@ -149,7 +148,7 @@ public abstract class BaseUploadFileService extends BaseService {
    * @param uploadFileEndTime 上报文件截止时间
    */
   @Transactional(propagation = Propagation.REQUIRED)
-  protected void copyFileToUploadDir(File file, String fileType, Long uploadFileEndTime, Date createTime, String stationCode) {
+  public void copyFileToUploadDir(File file, String fileType, Long uploadFileEndTime, Date createTime, String stationCode) {
     String destFileDir = null;
 
     try {

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/service/FtpUploadTransactionService.java

@@ -22,6 +22,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 /**
@@ -125,7 +126,12 @@ public class FtpUploadTransactionService extends BaseUploadFileService {
       isSuccess = false;
       logger.error("上报通道：" + uploadFileChannel.getChannelName() + "," + keys[2] + "上报失败", e);
       Integer id = FileConstant.fileShouldMomentMap.get(entry.getKey());
-      UploadFileLog uploadFileLog = uploadFileLogRepository.findById(id).get();
+
+      Optional<UploadFileLog> optional = uploadFileLogRepository.findById(id);
+      UploadFileLog uploadFileLog = new UploadFileLog();
+      if (optional.isPresent()) {
+        uploadFileLog = optional.get();
+      }
       UploadFileLogDetail uploadFileLogDetail = new UploadFileLogDetail();
       uploadFileLogDetail.setUploadObjectName(uploadObject.getUploadObjectName());
       uploadFileLogDetail.setUploadChanneId(uploadFileChannel.getId());