一体化云端:

内蒙东润 上传sftp 模板修改

in-cloud/src/main/java/com/jiayue/insu/incloud/pushdata/PushCommon.java

@@ -213,7 +213,7 @@ public class PushCommon {
             }
         }
 
-        String fileDateStr = DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyyMMdd_HH:mm:ss");
+        String fileDateStr = DateUtil.format(DateUtil.beginOfDay(DateUtil.date()), "yyyy-MM-dd");
         String fileType = todayStr + File.separatorChar + "nwp";
         this.pushFileToSftp(record, vList, newFilePath, newFileName, templateName, station, fileType, companyCode, fileDateStr);
         return true;
@@ -238,6 +238,7 @@ public class PushCommon {
         velocityContext.put("date", fileDateStr);
         velocityContext.put("stationCode", station.getStationCode());
         velocityContext.put("stationName", station.getName());
+        velocityContext.put("signCode", station.getSignCode());
 
         File newFile;
         // 生成新文件

in-cloud/src/main/java/com/jiayue/insu/incloud/pushdata/PushDataToSftp.java

@@ -67,9 +67,10 @@ public class PushDataToSftp implements IPushInitForecastData {
     public Boolean pushDQData(Station station) {
         Boolean result = false;
         String stationCode = station.getStationCode();
+        String signCode = station.getSignCode();
         String newFilePath = drFilePath + stationCode + File.separatorChar;
         String todayStr = DateUtil.format(DateUtil.date(), "yyyyMMdd");
-        String newFileName = "modeloutput-" + stationCode + "J001-" + todayStr + "AM.txt";
+        String newFileName = "modeloutput-" + signCode + "J001-" + todayStr + "AM.txt";
         String templateName = File.separatorChar + "vms" + File.separatorChar + "DR_DQ.vm";
         result = pushCommon.pushDQData(station, station.getInCode(), newFilePath, newFileName, templateName);
         return result;
@@ -79,9 +80,10 @@ public class PushDataToSftp implements IPushInitForecastData {
     public Boolean pushNWPData(Station station) {
         Boolean result = false;
         String stationCode = station.getStationCode();
+        String signCode = station.getSignCode();
         String newFilePath = drFilePath + stationCode + File.separatorChar;
         String todayStr = DateUtil.format(DateUtil.date(), "yyyyMMdd");
-        String newFileName = "modeloutput-" + stationCode + "J001-" + todayStr + "NWP.txt";
+        String newFileName = "modeloutput-" + signCode + "J001-" + todayStr + "NWP.txt";
         String templateName = File.separatorChar + "vms" + File.separatorChar + "DR_NWP.vm";
         result = pushCommon.pushNWPData(station, station.getInCode(), newFilePath, newFileName, templateName);
         return result;