修改调试时代码

ipp-client/src/main/java/com/jiayue/ipfcst/client/Schedule/Task.java

@@ -106,7 +106,7 @@ public class Task {
             }
             if ("new".equals(lastPathStr)) {
                 pathBak = path.replace("new", targetPath).replace("ipp/bak", "ipp/new");
-                log.info("获取到反向隔离：{} 路径", targetPath);
+//                log.info("获取到反向隔离：{} 路径", targetPath);
             } else {
                 try {
                     throw new Exception("获取反向隔离备份路径失败，传输路径最后一层不为new");
@@ -122,7 +122,7 @@ public class Task {
      * v3 http下载文件请求
      */
     @Async
-    @Scheduled(initialDelay = 45 * 1000, fixedRateString = "60000")
+    @Scheduled(initialDelay = 45 * 1000, fixedRateString = "300000")
     void v3DataFilesDownload() {
         if ("否".equals(Constant.cacheClientConfig.getDqAndNwpFileTask())) {
             log.info("气象文件下载任务已关闭");
@@ -192,9 +192,10 @@ public class Task {
                     } else {
                         log.error("文件：【{}】下载失败", fileCreateLog.getFileName());
                     }
-                } else {
-                    log.info("文件：【{}】已经下载过了，不需要再下次，如有需要请手动下载或联系运维生成新文件。", fileCreateLog.getFileName());
                 }
+//                else {
+//                    log.info("文件：【{}】已经下载过了，不需要再下次，如有需要请手动下载或联系运维生成新文件。", fileCreateLog.getFileName());
+//                }
             }
         } catch (Exception e) {
             log.error("文件下载失败：{}", e);
@@ -202,7 +203,7 @@ public class Task {
             //移动文件到相应反向隔离目录，向内网传输
             if (Constant.filedownLoadList.size() > 0) {
                 for (String fpath : Constant.filedownLoadList) {
-                    int startIndex = fpath.indexOf("J00");
+                    int startIndex = fpath.indexOf("J01");
                     if (startIndex==-1){
                         startIndex = fpath.indexOf("T00");
                     }
@@ -385,7 +386,7 @@ public class Task {
             log.info("反向隔离扫描任务已关闭");
             return;
         }
-        log.info("开始执行定时任务：扫描反向隔离目录，查看文件是否传入内网");
+//        log.info("开始执行定时任务：扫描反向隔离目录，查看文件是否传入内网");
         String filePath = Constant.cacheClientConfig.getFxglPath();
         if (null == filePath || filePath.length() == 0) {
             log.warn("反向隔离文件路径未配置，不执行扫描任务。");

ipp-client/src/main/java/com/jiayue/ipfcst/client/utils/UtilTools.java

@@ -127,7 +127,7 @@ public class UtilTools {
                     Runtime.getRuntime().exec("chmod 777 -R " + path);//ftp服务器在linux环境中，生成的文件涉及到读写权限问题，直接给777权限
                 }
             }
-            log.info("判断路径path:{} 是否存在", path);
+//            log.info("判断路径path:{} 是否存在", path);
         } catch (IOException e) {
             log.error("系统错误：" + e.getMessage(), e);
         } finally {

ipp-client/src/main/resources/logback-spring.xml

@@ -3,7 +3,7 @@
 
 <configuration debug="false" scan="false">
     <springProperty scop="context" name="spring.application.name" source="spring.application.name" defaultValue=""/>
-    <property name="log.path" value="logs"/>
+    <property name="log.path" value="../../../logs"/>
     <!-- 彩色日志格式 -->
     <property name="CONSOLE_LOG_PATTERN"
               value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss.SSS}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>

ipp-idp/src/main/java/com/jiayue/ipp/idp/service/impl/PowerStationStatusDataServiceImpl.java

@@ -304,6 +304,21 @@ public class PowerStationStatusDataServiceImpl extends ServiceImpl<PowerStationS
                 if (nwpHubHeight==170){
                     nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs170().toString());
                 }
+                else if (nwpHubHeight==150){
+                    nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs150().toString());
+                }
+                else if (nwpHubHeight==140){
+                    nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs140().toString());
+                }
+                else if (nwpHubHeight==130){
+                    nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs130().toString());
+                }
+                else if (nwpHubHeight==120){
+                    nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs120().toString());
+                }
+                else if (nwpHubHeight==110){
+                    nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs110().toString());
+                }
                 else if (nwpHubHeight==100){
                     nwpMap.put(nwp.getPreTime().getTime(), nwp.getWs100().toString());
                 }