修改文件上报日志

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

@@ -0,0 +1,50 @@
+package com.jiayue.ipfcst.fileupload.controller;
+
+import com.jiayue.ipfcst.common.core.web.vo.ResponseVO;
+import com.jiayue.ipfcst.common.data.entity.UploadFileLog;
+import com.jiayue.ipfcst.fileupload.service.UploadFileLogService;
+import com.jiayue.ipfcst.fileupload.util.FileConstant;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * 接口服务类
+ *
+ * @author xsl
+ * @version 3.0
+ */
+@RestController
+@RequestMapping("uploadFileOpenInterface")
+@Slf4j
+public class UploadFileOpenInterfaceController {
+  /**
+   * 查看上报缓存中的文件
+   * @return
+   */
+  @RequestMapping(value = "/getFileCache")
+  public ResponseVO getFileCache() {
+    List list = new ArrayList<>();
+    for(Map.Entry<String, UploadFileLog> vo : FileConstant.readyUploadFileMap.entrySet()){
+      list.add(vo.getValue());
+    }
+    return ResponseVO.success(list);
+  }
+
+  /**
+   * 获取上报对象状态
+   * @return
+   */
+  @RequestMapping(value = "/getUploadObjectStatus")
+  public ResponseVO getUploadObjectStatus() {
+    log.info("获取上报对象状态。。。。。。。");
+    List list = new ArrayList<>();
+    list.add(FileConstant.channelStatusMap);
+    return ResponseVO.success(list);
+  }
+}

ipfcst-console/src/main/java/com/jiayue/ipfcst/fileupload/job/FtpClientUploadJob.java

@@ -0,0 +1,30 @@
+package com.jiayue.ipfcst.fileupload.job;
+
+import com.jiayue.ipfcst.fileupload.service.FtpUploadService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.scheduling.annotation.Scheduled;
+import org.springframework.stereotype.Service;
+
+/**
+ * ftp客户端上报定时
+ *
+ * @author xsl
+ * @version 3.0
+ * @since 2020/4/24 14:54
+ */
+@Slf4j
+@Service
+@EnableScheduling
+public class FtpClientUploadJob {
+  @Autowired
+  FtpUploadService ftpUploadService;
+
+  @Scheduled(fixedDelay = 60000)
+  public void execute() {
+    log.info("FTP/SFTP上报定时任务执行开始");
+    ftpUploadService.startFtpUpload();
+    log.info("FTP/SFTP上报定时任务执行结束");
+  }
+}

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

@@ -115,6 +115,7 @@ public class UploadFileLogService {
               noCreateFileLog.setFileTypeEnum(FileTypeEnum.valueOf(fileType));
               noCreateFileLog.setFileName(noCreateFileName);
               noCreateFileLog.setUploadProtocolEnum(uploadObject.getUploadProtocolEnum());
+              noCreateFileLog.setStationCode(stationCode);
               resultList.add(noCreateFileLog);
             }
           } else {
@@ -145,6 +146,7 @@ public class UploadFileLogService {
                 noCreateFileLog.setFileTypeEnum(FileTypeEnum.valueOf(uploadFileType));
                 noCreateFileLog.setFileName(noCreateFileName);
                 noCreateFileLog.setUploadProtocolEnum(uploadObject.getUploadProtocolEnum());
+                noCreateFileLog.setStationCode(stationCode);
                 resultList.add(noCreateFileLog);
               }
             }
@@ -413,10 +415,10 @@ public class UploadFileLogService {
                 // 超短期
                 e63UploadFileService.generateCdqFile(date);
                 break;
-//              case "E3":
-//                // 理论功率
-//                e63UploadFileService.generateE3File(date);
-//                break;
+              case "E3":
+                // 理论功率
+                e63UploadFileService.generateTheroyFile(date);
+                break;
               case "E6":
                 // 气象站
                 e63UploadFileService.generateQxzOrCftFile(date);
@@ -425,14 +427,14 @@ public class UploadFileLogService {
                 // 测风塔
                 e63UploadFileService.generateQxzOrCftFile(date);
                 break;
-//              case "E8":
-//                // 逆变器
-//                e63UploadFileService.generateE8File(date);
-//                break;
-//              case "E9":
-//                // 风机
-//                e63UploadFileService.generateE9File(date);
-//                break;
+              case "E8":
+                // 逆变器
+                e63UploadFileService.generateNbqOrFjFile(date);
+                break;
+              case "E9":
+                // 风机
+                e63UploadFileService.generateNbqOrFjFile(date);
+                break;
               case "E26":
                 // 短期可用
                 e63UploadFileService.generateDqUseFile(date);
@@ -441,10 +443,10 @@ public class UploadFileLogService {
                 // 超短期可用
                 e63UploadFileService.generateCdqUseFile(date);
                 break;
-//              case "E85":
-//                // 理论功率风
-//                e63UploadFileService.generateE85File(date);
-//                break;
+              case "E85":
+                // 理论功率风
+                e63UploadFileService.generateTheroyFile(date);
+                break;
               default:
                 break;
             }