huangxingxing 1 год назад
Родитель
Сommit
12f554e98d

+ 2 - 2
src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -37,9 +37,9 @@ public class TemplateGenerator {
         dataModel.put("initFilePath", BPATH+"/"+aid+"/"+jid+"/water"+"/"+"water.init");
 
         //midPath
-        dataModel.put("midPath", "/home/disaster/Water/monitor.in");
+        dataModel.put("midPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
         //monitorPath
-        dataModel.put("monitorPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
+        dataModel.put("monitorPath", "/home/disaster/Water/monitor.in");
         //outPath
         dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/water"+"/out");
         dataModel.put("totaltime",totaltime);

+ 1 - 1
src/main/resources/templates/waterInit.ftl

@@ -8,7 +8,7 @@ ${b.nname},${b.type},${b.pressure},${b.temperature} ,${b.polcon1} ,${b.polcon2}
 #end
 #waters
 <#list vo.dourceVos as d>
-water ${d.dsource.pname} ${d.dsource.pname} ${d.dsource.site} ${d.dsourceVals?size}
+water ${d.dsource.pname} ${d.dsource.site} ${d.dsourceVals?size}
 <#list d.dsourceVals as dv>
 ${dv.timeline}  ${dv.val1}  ${dv.val2}  ${dv.val3}
 </#list>