添加求解控制

generated/com/miniframe/generate/comm/system/A_D00008.java

@@ -22,4 +22,82 @@ public class A_D00008 extends BaseMapModel implements Serializable {
 	public int getAid() {
 		return this.aid;
 	}
+	String acctime;//事故时间
+	/**
+	 *事故时间
+	 */
+	public void setAcctime(String acctime) {
+		this.acctime=acctime;
+	}
+	/**
+	 *事故时间
+	 */
+	public String getAcctime() {
+		return this.acctime;
+	}
+	String dt;//时间步长
+	/**
+	 *时间步长
+	 */
+	public void setDt(String dt) {
+		this.dt=dt;
+	}
+	/**
+	 *时间步长
+	 */
+	public String getDt() {
+		return this.dt;
+	}
+	String dx;//空间步长
+	/**
+	 *空间步长
+	 */
+	public void setDx(String dx) {
+		this.dx=dx;
+	}
+	/**
+	 *空间步长
+	 */
+	public String getDx() {
+		return this.dx;
+	}
+	String reportstep;//输出步长
+	/**
+	 *输出步长
+	 */
+	public void setReportstep(String reportstep) {
+		this.reportstep=reportstep;
+	}
+	/**
+	 *输出步长
+	 */
+	public String getReportstep() {
+		return this.reportstep;
+	}
+	String interactionstep;//交互步长
+	/**
+	 *交互步长
+	 */
+	public void setInteractionstep(String interactionstep) {
+		this.interactionstep=interactionstep;
+	}
+	/**
+	 *交互步长
+	 */
+	public String getInteractionstep() {
+		return this.interactionstep;
+	}
+	String totaltime;//模拟时长
+	/**
+	 *模拟时长
+	 */
+	public void setTotaltime(String totaltime) {
+		this.totaltime=totaltime;
+	}
+	/**
+	 *模拟时长
+	 */
+	public String getTotaltime() {
+		return this.totaltime;
+	}
 }

generated/validateform/a_d00008Form.xml

@@ -7,6 +7,24 @@
 <field property="aid" depends="required">
     <arg0 key="a_d00008.aid"/>
 </field>
+<field property="acctime" depends="required">
+    <arg0 key="a_d00008.acctime"/>
+</field>
+<field property="dt" depends="required">
+    <arg0 key="a_d00008.dt"/>
+</field>
+<field property="dx" depends="required">
+    <arg0 key="a_d00008.dx"/>
+</field>
+<field property="reportstep" depends="required">
+    <arg0 key="a_d00008.reportstep"/>
+</field>
+<field property="interactionstep" depends="required">
+    <arg0 key="a_d00008.interactionstep"/>
+</field>
+<field property="totaltime" depends="required">
+    <arg0 key="a_d00008.totaltime"/>
+</field>
 </form>
 </formset>
 </form-validation>

generated/validator/resources_a_d00008Form_validator.properties

@@ -1,2 +1,8 @@
 a_d00008.aid = \u4E8B\u6545Id
+a_d00008.acctime = \u4E8B\u6545\u65F6\u95F4
+a_d00008.dt = \u65F6\u95F4\u6B65\u957F
+a_d00008.dx = \u7A7A\u95F4\u6B65\u957F
+a_d00008.reportstep = \u8F93\u51FA\u6B65\u957F
+a_d00008.interactionstep = \u4EA4\u4E92\u6B65\u957F
+a_d00008.totaltime = \u6A21\u62DF\u65F6\u957F
 a_d00008Form = true

generated/validator/resources_a_d00008Form_validator_zh_CN.properties

@@ -1,2 +1,8 @@
 a_d00008.aid = \u4E8B\u6545Id
+a_d00008.acctime = \u4E8B\u6545\u65F6\u95F4
+a_d00008.dt = \u65F6\u95F4\u6B65\u957F
+a_d00008.dx = \u7A7A\u95F4\u6B65\u957F
+a_d00008.reportstep = \u8F93\u51FA\u6B65\u957F
+a_d00008.interactionstep = \u4EA4\u4E92\u6B65\u957F
+a_d00008.totaltime = \u6A21\u62DF\u65F6\u957F
 a_d00008Form = true

modelsrc/com/miniframe/model/system/DJob.java

@@ -28,6 +28,36 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
      */
     private String faildes;
 
+    /**
+     * 时间步长
+     */
+    private String dt;
+
+    /**
+     * 空间步长
+     */
+    private String dx;
+
+    /**
+     * 输出步长
+     */
+    private String reportstep;
+
+    /**
+     * 交互步长
+     */
+    private String interactionstep;
+
+    /**
+     * 事故开始时间
+     */
+    private String acctime;
+
+    /**
+     * 模拟时长
+     */
+    private String totaltime;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -125,4 +155,112 @@ public class DJob extends MiniserviceBaseModel implements Serializable {
     public void setFaildes(String faildes) {
         this.faildes = faildes == null ? null : faildes.trim();
     }
+
+    /**
+     * 获取时间步长
+     *
+     * @return dt - 时间步长
+     */
+    public String getDt() {
+        return dt;
+    }
+
+    /**
+     * 设置时间步长
+     *
+     * @param dt 时间步长
+     */
+    public void setDt(String dt) {
+        this.dt = dt == null ? null : dt.trim();
+    }
+
+    /**
+     * 获取空间步长
+     *
+     * @return dx - 空间步长
+     */
+    public String getDx() {
+        return dx;
+    }
+
+    /**
+     * 设置空间步长
+     *
+     * @param dx 空间步长
+     */
+    public void setDx(String dx) {
+        this.dx = dx == null ? null : dx.trim();
+    }
+
+    /**
+     * 获取输出步长
+     *
+     * @return reportstep - 输出步长
+     */
+    public String getReportstep() {
+        return reportstep;
+    }
+
+    /**
+     * 设置输出步长
+     *
+     * @param reportstep 输出步长
+     */
+    public void setReportstep(String reportstep) {
+        this.reportstep = reportstep == null ? null : reportstep.trim();
+    }
+
+    /**
+     * 获取交互步长
+     *
+     * @return interactionstep - 交互步长
+     */
+    public String getInteractionstep() {
+        return interactionstep;
+    }
+
+    /**
+     * 设置交互步长
+     *
+     * @param interactionstep 交互步长
+     */
+    public void setInteractionstep(String interactionstep) {
+        this.interactionstep = interactionstep == null ? null : interactionstep.trim();
+    }
+
+    /**
+     * 获取事故开始时间
+     *
+     * @return acctime - 事故开始时间
+     */
+    public String getAcctime() {
+        return acctime;
+    }
+
+    /**
+     * 设置事故开始时间
+     *
+     * @param acctime 事故开始时间
+     */
+    public void setAcctime(String acctime) {
+        this.acctime = acctime == null ? null : acctime.trim();
+    }
+
+    /**
+     * 获取模拟时长
+     *
+     * @return totaltime - 模拟时长
+     */
+    public String getTotaltime() {
+        return totaltime;
+    }
+
+    /**
+     * 设置模拟时长
+     *
+     * @param totaltime 模拟时长
+     */
+    public void setTotaltime(String totaltime) {
+        this.totaltime = totaltime == null ? null : totaltime.trim();
+    }
 }

modelsrc/com/miniframe/model/system/DJobSQLBuilder.java

@@ -503,6 +503,426 @@ public class DJobSQLBuilder {
             addCriterion("faildes not between", value1, value2, "faildes");
             return (Criteria) this;
         }
+
+        public Criteria andDtIsNull() {
+            addCriterion("dt is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtIsNotNull() {
+            addCriterion("dt is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtEqualTo(String value) {
+            addCriterion("dt =", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotEqualTo(String value) {
+            addCriterion("dt <>", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtGreaterThan(String value) {
+            addCriterion("dt >", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtGreaterThanOrEqualTo(String value) {
+            addCriterion("dt >=", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLessThan(String value) {
+            addCriterion("dt <", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLessThanOrEqualTo(String value) {
+            addCriterion("dt <=", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtLike(String value) {
+            addCriterion("dt like", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotLike(String value) {
+            addCriterion("dt not like", value, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtIn(List<String> values) {
+            addCriterion("dt in", values, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotIn(List<String> values) {
+            addCriterion("dt not in", values, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtBetween(String value1, String value2) {
+            addCriterion("dt between", value1, value2, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDtNotBetween(String value1, String value2) {
+            addCriterion("dt not between", value1, value2, "dt");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxIsNull() {
+            addCriterion("dx is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxIsNotNull() {
+            addCriterion("dx is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxEqualTo(String value) {
+            addCriterion("dx =", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxNotEqualTo(String value) {
+            addCriterion("dx <>", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxGreaterThan(String value) {
+            addCriterion("dx >", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxGreaterThanOrEqualTo(String value) {
+            addCriterion("dx >=", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxLessThan(String value) {
+            addCriterion("dx <", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxLessThanOrEqualTo(String value) {
+            addCriterion("dx <=", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxLike(String value) {
+            addCriterion("dx like", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxNotLike(String value) {
+            addCriterion("dx not like", value, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxIn(List<String> values) {
+            addCriterion("dx in", values, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxNotIn(List<String> values) {
+            addCriterion("dx not in", values, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxBetween(String value1, String value2) {
+            addCriterion("dx between", value1, value2, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andDxNotBetween(String value1, String value2) {
+            addCriterion("dx not between", value1, value2, "dx");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepIsNull() {
+            addCriterion("reportstep is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepIsNotNull() {
+            addCriterion("reportstep is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepEqualTo(String value) {
+            addCriterion("reportstep =", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepNotEqualTo(String value) {
+            addCriterion("reportstep <>", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepGreaterThan(String value) {
+            addCriterion("reportstep >", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepGreaterThanOrEqualTo(String value) {
+            addCriterion("reportstep >=", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepLessThan(String value) {
+            addCriterion("reportstep <", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepLessThanOrEqualTo(String value) {
+            addCriterion("reportstep <=", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepLike(String value) {
+            addCriterion("reportstep like", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepNotLike(String value) {
+            addCriterion("reportstep not like", value, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepIn(List<String> values) {
+            addCriterion("reportstep in", values, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepNotIn(List<String> values) {
+            addCriterion("reportstep not in", values, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepBetween(String value1, String value2) {
+            addCriterion("reportstep between", value1, value2, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andReportstepNotBetween(String value1, String value2) {
+            addCriterion("reportstep not between", value1, value2, "reportstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepIsNull() {
+            addCriterion("interactionstep is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepIsNotNull() {
+            addCriterion("interactionstep is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepEqualTo(String value) {
+            addCriterion("interactionstep =", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepNotEqualTo(String value) {
+            addCriterion("interactionstep <>", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepGreaterThan(String value) {
+            addCriterion("interactionstep >", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepGreaterThanOrEqualTo(String value) {
+            addCriterion("interactionstep >=", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepLessThan(String value) {
+            addCriterion("interactionstep <", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepLessThanOrEqualTo(String value) {
+            addCriterion("interactionstep <=", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepLike(String value) {
+            addCriterion("interactionstep like", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepNotLike(String value) {
+            addCriterion("interactionstep not like", value, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepIn(List<String> values) {
+            addCriterion("interactionstep in", values, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepNotIn(List<String> values) {
+            addCriterion("interactionstep not in", values, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepBetween(String value1, String value2) {
+            addCriterion("interactionstep between", value1, value2, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andInteractionstepNotBetween(String value1, String value2) {
+            addCriterion("interactionstep not between", value1, value2, "interactionstep");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeIsNull() {
+            addCriterion("acctime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeIsNotNull() {
+            addCriterion("acctime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeEqualTo(String value) {
+            addCriterion("acctime =", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeNotEqualTo(String value) {
+            addCriterion("acctime <>", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeGreaterThan(String value) {
+            addCriterion("acctime >", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeGreaterThanOrEqualTo(String value) {
+            addCriterion("acctime >=", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeLessThan(String value) {
+            addCriterion("acctime <", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeLessThanOrEqualTo(String value) {
+            addCriterion("acctime <=", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeLike(String value) {
+            addCriterion("acctime like", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeNotLike(String value) {
+            addCriterion("acctime not like", value, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeIn(List<String> values) {
+            addCriterion("acctime in", values, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeNotIn(List<String> values) {
+            addCriterion("acctime not in", values, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeBetween(String value1, String value2) {
+            addCriterion("acctime between", value1, value2, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andAcctimeNotBetween(String value1, String value2) {
+            addCriterion("acctime not between", value1, value2, "acctime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeIsNull() {
+            addCriterion("totaltime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeIsNotNull() {
+            addCriterion("totaltime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeEqualTo(String value) {
+            addCriterion("totaltime =", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeNotEqualTo(String value) {
+            addCriterion("totaltime <>", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeGreaterThan(String value) {
+            addCriterion("totaltime >", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeGreaterThanOrEqualTo(String value) {
+            addCriterion("totaltime >=", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeLessThan(String value) {
+            addCriterion("totaltime <", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeLessThanOrEqualTo(String value) {
+            addCriterion("totaltime <=", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeLike(String value) {
+            addCriterion("totaltime like", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeNotLike(String value) {
+            addCriterion("totaltime not like", value, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeIn(List<String> values) {
+            addCriterion("totaltime in", values, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeNotIn(List<String> values) {
+            addCriterion("totaltime not in", values, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeBetween(String value1, String value2) {
+            addCriterion("totaltime between", value1, value2, "totaltime");
+            return (Criteria) this;
+        }
+
+        public Criteria andTotaltimeNotBetween(String value1, String value2) {
+            addCriterion("totaltime not between", value1, value2, "totaltime");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

modelsrc/com/miniframe/model/system/dbconfig/MapperConfig-system.xml

@@ -5,7 +5,7 @@
     This file is generated by MyBatis Generator.
     This file is the shell of a Mapper Config file - in many cases you will need to add
       to this file before it is usable by MyBatis.
-    This file was generated on Mon Feb 26 09:39:26 CST 2024.
+    This file was generated on Mon Feb 26 10:50:20 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -33,12 +33,30 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
  	 */
 	public void transExecute() throws Exception {
 		Integer aid =this.getA_d00008().getAid();
+		/**
+		 * totaltime: 10800  - 模拟时长
+		 * dt: 0.1   - 时间步长
+		 * dx: 10.0 -空间步长
+		 * report step: 60 -输出步长
+		 * interactionstep : 1200 -交互步长
+		 */
+
+		String totaltime =this.getA_d00008().getTotaltime();
+		String dt =this.getA_d00008().getDt();
+		String dx =this.getA_d00008().getDx();
+		String reportstep =this.getA_d00008().getReportstep();
+		String interactionstep =this.getA_d00008().getInteractionstep();
+
 		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
 		DAccident accident= accidentDao.selectByPrimaryKey(aid);
-
 		DJobMapper dJobMapperDao = UtilTools.getBean(DJobMapper.class);
 		DJob job =new DJob();
 		job.setAid(aid);
+		job.setTotaltime(totaltime);
+		job.setDt(dt);
+		job.setDx(dx);
+		job.setReportstep(reportstep);
+		job.setInteractionstep(interactionstep);
 		job.setStarttime(XIDateTimeUtils.getNowStr());
 		job.setState("0");//未执行
 		int jid=dJobMapperDao.insertSelective(job);
@@ -46,13 +64,13 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		accidentDao.updateByPrimaryKey(accident);
 
 		if(accident.getStype().equals("Fire")){
-			TemplateGenerator.createFireControl(aid,jid);
+			TemplateGenerator.createFireControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep);
 			TemplateGenerator.createFireRunsh(aid,jid);
 			TemplateGenerator.createFireInit(aid,jid);
 			exeFire(aid,jid);
 		}
 		if(accident.getStype().equals("Water")){
-			TemplateGenerator.createWaterControl(aid,jid);
+			TemplateGenerator.createWaterControl(aid,jid,totaltime,dt,dx,reportstep,interactionstep);
 			TemplateGenerator.createWaterRunsh(aid,jid);
 			TemplateGenerator.createWaterInit(aid,jid);
 			exeWater(aid,jid);

src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -22,7 +22,7 @@ import java.util.Map;
 public class TemplateGenerator {
     public static final String BPATH="/cephfs/disaster";
 
-    public static void createWaterControl(Integer aid,Integer jid) throws IOException, TemplateException {
+    public static void createWaterControl(Integer aid,Integer jid,String totaltime,String dt,String dx,String reportstep,String interactionstep) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -39,7 +39,11 @@ public class TemplateGenerator {
         dataModel.put("midPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
         //outPath
         dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/water"+"/out");
-
+        dataModel.put("totaltime",totaltime);
+        dataModel.put("dt",dt);
+        dataModel.put("dx",dx);
+        dataModel.put("reportstep",reportstep);
+        dataModel.put("interactionstep",interactionstep);
 
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
@@ -130,7 +134,7 @@ public class TemplateGenerator {
     }
 
 
-    public static void createFireControl(Integer aid,Integer jid) throws IOException, TemplateException {
+    public static void createFireControl(Integer aid,Integer jid,String totaltime,String dt,String dx,String reportstep,String interactionstep ) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -149,6 +153,12 @@ public class TemplateGenerator {
         //outPath
         dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/fire"+"/out");
 
+        dataModel.put("totaltime",totaltime);
+        dataModel.put("dt",dt);
+        dataModel.put("dx",dx);
+        dataModel.put("reportstep",reportstep);
+        dataModel.put("interactionstep",interactionstep);
+
         DSourceMapper dsm =UtilTools.getBean(DSourceMapper.class);
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
         DSourceSQLBuilder.Criteria dssc = dss.createCriteria();

src/main/resources/templates/fireControl.ftl

@@ -3,11 +3,11 @@ initFile :  ${initFilePath}
 interaction file name : ${fireInteractionPath}
 midPath : ${midPath}
 outPath : ${outPath}
-totaltime: 10800
-dt: 0.1
-dx: 10.0
-report step: 60
-interactionstep : 1200
+totaltime: ${totaltime}
+dt: ${dt}
+dx: ${dx}
+report step: ${reportstep}
+interactionstep : ${interactionstep}
 Boundary number :3
 FireSource number:${fireSourceNum}
 Number Con:2

src/main/resources/templates/waterControl.ftl

@@ -2,9 +2,9 @@ geoFile : ${geoFilePath}
 initFile : ${initFilePath}
 midPath : ${midPath}
 outPath : ${outPath}
-totaltime: 7200
-report step: 60
-interactionstep : 300
-dt : 5
-dx : 5
+totaltime: ${totaltime}
+report step: ${reportstep}
+interactionstep : ${interactionstep}
+dt : ${dt}
+dx : ${dx}
 

系统设计/通信设计/通讯报文/system(系统服务)/报文体/D00008_A(灾情演练).csv

@@ -1,2 +1,8 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
-1,aid,事故Id,int,,,是,,,,,,,,
+1,aid,事故Id,int,,,是,,,,,,,,
+2,acctime,事故时间,String,,,是,,,,,,,,
+3,dt,时间步长,String,,,是,,,,,,,,
+4,dx,空间步长,String,,,是,,,,,,,,
+5,reportstep,输出步长,String,,,是,,,,,,,,
+6,interactionstep,交互步长,String,,,是,,,,,,,,
+7,totaltime,模拟时长,String,,,是,,,,,,,,