存储多个结果

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

@@ -34,6 +34,11 @@ public class DAccident extends MiniserviceBaseModel implements Serializable {
      */
     private String stype;
 
+    /**
+     * 求解ID
+     */
+    private Integer jid;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -139,4 +144,22 @@ public class DAccident extends MiniserviceBaseModel implements Serializable {
     public void setStype(String stype) {
         this.stype = stype == null ? null : stype.trim();
     }
+
+    /**
+     * 获取求解ID
+     *
+     * @return jid - 求解ID
+     */
+    public Integer getJid() {
+        return jid;
+    }
+
+    /**
+     * 设置求解ID
+     *
+     * @param jid 求解ID
+     */
+    public void setJid(Integer jid) {
+        this.jid = jid;
+    }
 }

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

@@ -513,6 +513,66 @@ public class DAccidentSQLBuilder {
             addCriterion("stype not between", value1, value2, "stype");
             return (Criteria) this;
         }
+
+        public Criteria andJidIsNull() {
+            addCriterion("jid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidIsNotNull() {
+            addCriterion("jid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidEqualTo(Integer value) {
+            addCriterion("jid =", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidNotEqualTo(Integer value) {
+            addCriterion("jid <>", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidGreaterThan(Integer value) {
+            addCriterion("jid >", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("jid >=", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidLessThan(Integer value) {
+            addCriterion("jid <", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidLessThanOrEqualTo(Integer value) {
+            addCriterion("jid <=", value, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidIn(List<Integer> values) {
+            addCriterion("jid in", values, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidNotIn(List<Integer> values) {
+            addCriterion("jid not in", values, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidBetween(Integer value1, Integer value2) {
+            addCriterion("jid between", value1, value2, "jid");
+            return (Criteria) this;
+        }
+
+        public Criteria andJidNotBetween(Integer value1, Integer value2) {
+            addCriterion("jid not between", value1, value2, "jid");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

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

@@ -0,0 +1,128 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_job")
+public class DJob extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    /**
+     * 事故id
+     */
+    private Integer aid;
+
+    private String starttime;
+
+    private String endtme;
+
+    /**
+     * 0 执行中 1执行成功 2 执行失败
+     */
+    private String state;
+
+    /**
+     * 失败信息
+     */
+    private String faildes;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * 获取事故id
+     *
+     * @return aid - 事故id
+     */
+    public Integer getAid() {
+        return aid;
+    }
+
+    /**
+     * 设置事故id
+     *
+     * @param aid 事故id
+     */
+    public void setAid(Integer aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * @return starttime
+     */
+    public String getStarttime() {
+        return starttime;
+    }
+
+    /**
+     * @param starttime
+     */
+    public void setStarttime(String starttime) {
+        this.starttime = starttime == null ? null : starttime.trim();
+    }
+
+    /**
+     * @return endtme
+     */
+    public String getEndtme() {
+        return endtme;
+    }
+
+    /**
+     * @param endtme
+     */
+    public void setEndtme(String endtme) {
+        this.endtme = endtme == null ? null : endtme.trim();
+    }
+
+    /**
+     * 获取0 执行中 1执行成功 2 执行失败
+     *
+     * @return state - 0 执行中 1执行成功 2 执行失败
+     */
+    public String getState() {
+        return state;
+    }
+
+    /**
+     * 设置0 执行中 1执行成功 2 执行失败
+     *
+     * @param state 0 执行中 1执行成功 2 执行失败
+     */
+    public void setState(String state) {
+        this.state = state == null ? null : state.trim();
+    }
+
+    /**
+     * 获取失败信息
+     *
+     * @return faildes - 失败信息
+     */
+    public String getFaildes() {
+        return faildes;
+    }
+
+    /**
+     * 设置失败信息
+     *
+     * @param faildes 失败信息
+     */
+    public void setFaildes(String faildes) {
+        this.faildes = faildes == null ? null : faildes.trim();
+    }
+}

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

@@ -0,0 +1,600 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DJobSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DJobSQLBuilder() {
+        oredCriteria = new ArrayList<Criteria>();
+    }
+
+    public void setOrderByClause(String orderByClause) {
+        this.orderByClause = orderByClause;
+    }
+
+    public String getOrderByClause() {
+        return orderByClause;
+    }
+
+    public void setDistinct(boolean distinct) {
+        this.distinct = distinct;
+    }
+
+    public boolean isDistinct() {
+        return distinct;
+    }
+
+    public List<Criteria> getOredCriteria() {
+        return oredCriteria;
+    }
+
+    public void or(Criteria criteria) {
+        oredCriteria.add(criteria);
+    }
+
+    public Criteria or() {
+        Criteria criteria = createCriteriaInternal();
+        oredCriteria.add(criteria);
+        return criteria;
+    }
+
+    public Criteria createCriteria() {
+        Criteria criteria = createCriteriaInternal();
+        if (oredCriteria.size() == 0) {
+            oredCriteria.add(criteria);
+        }
+        return criteria;
+    }
+
+    protected Criteria createCriteriaInternal() {
+        Criteria criteria = new Criteria();
+        return criteria;
+    }
+
+    public void clear() {
+        oredCriteria.clear();
+        orderByClause = null;
+        distinct = false;
+    }
+
+    protected abstract static class GeneratedCriteria {
+        protected List<Criterion> criteria;
+
+        protected GeneratedCriteria() {
+            super();
+            criteria = new ArrayList<Criterion>();
+        }
+
+        public boolean isValid() {
+            return criteria.size() > 0;
+        }
+
+        public List<Criterion> getAllCriteria() {
+            return criteria;
+        }
+
+        public List<Criterion> getCriteria() {
+            return criteria;
+        }
+
+        protected void addCriterion(String condition) {
+            if (condition == null) {
+                throw new RuntimeException("Value for condition cannot be null");
+            }
+            criteria.add(new Criterion(condition));
+        }
+
+        protected void addCriterion(String condition, Object value, String property) {
+            if (value == null) {
+                throw new RuntimeException("Value for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value));
+        }
+
+        protected void addCriterion(String condition, Object value1, Object value2, String property) {
+            if (value1 == null || value2 == null) {
+                throw new RuntimeException("Between values for " + property + " cannot be null");
+            }
+            criteria.add(new Criterion(condition, value1, value2));
+        }
+
+        public Criteria andIdIsNull() {
+            addCriterion("id is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIsNotNull() {
+            addCriterion("id is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdEqualTo(Integer value) {
+            addCriterion("id =", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotEqualTo(Integer value) {
+            addCriterion("id <>", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThan(Integer value) {
+            addCriterion("id >", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdGreaterThanOrEqualTo(Integer value) {
+            addCriterion("id >=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThan(Integer value) {
+            addCriterion("id <", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdLessThanOrEqualTo(Integer value) {
+            addCriterion("id <=", value, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdIn(List<Integer> values) {
+            addCriterion("id in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotIn(List<Integer> values) {
+            addCriterion("id not in", values, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdBetween(Integer value1, Integer value2) {
+            addCriterion("id between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andIdNotBetween(Integer value1, Integer value2) {
+            addCriterion("id not between", value1, value2, "id");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNull() {
+            addCriterion("aid is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIsNotNull() {
+            addCriterion("aid is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidEqualTo(Integer value) {
+            addCriterion("aid =", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotEqualTo(Integer value) {
+            addCriterion("aid <>", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThan(Integer value) {
+            addCriterion("aid >", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidGreaterThanOrEqualTo(Integer value) {
+            addCriterion("aid >=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThan(Integer value) {
+            addCriterion("aid <", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidLessThanOrEqualTo(Integer value) {
+            addCriterion("aid <=", value, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidIn(List<Integer> values) {
+            addCriterion("aid in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotIn(List<Integer> values) {
+            addCriterion("aid not in", values, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidBetween(Integer value1, Integer value2) {
+            addCriterion("aid between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andAidNotBetween(Integer value1, Integer value2) {
+            addCriterion("aid not between", value1, value2, "aid");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeIsNull() {
+            addCriterion("starttime is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeIsNotNull() {
+            addCriterion("starttime is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeEqualTo(String value) {
+            addCriterion("starttime =", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeNotEqualTo(String value) {
+            addCriterion("starttime <>", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeGreaterThan(String value) {
+            addCriterion("starttime >", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeGreaterThanOrEqualTo(String value) {
+            addCriterion("starttime >=", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeLessThan(String value) {
+            addCriterion("starttime <", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeLessThanOrEqualTo(String value) {
+            addCriterion("starttime <=", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeLike(String value) {
+            addCriterion("starttime like", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeNotLike(String value) {
+            addCriterion("starttime not like", value, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeIn(List<String> values) {
+            addCriterion("starttime in", values, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeNotIn(List<String> values) {
+            addCriterion("starttime not in", values, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeBetween(String value1, String value2) {
+            addCriterion("starttime between", value1, value2, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andStarttimeNotBetween(String value1, String value2) {
+            addCriterion("starttime not between", value1, value2, "starttime");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeIsNull() {
+            addCriterion("endtme is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeIsNotNull() {
+            addCriterion("endtme is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeEqualTo(String value) {
+            addCriterion("endtme =", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeNotEqualTo(String value) {
+            addCriterion("endtme <>", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeGreaterThan(String value) {
+            addCriterion("endtme >", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeGreaterThanOrEqualTo(String value) {
+            addCriterion("endtme >=", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeLessThan(String value) {
+            addCriterion("endtme <", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeLessThanOrEqualTo(String value) {
+            addCriterion("endtme <=", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeLike(String value) {
+            addCriterion("endtme like", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeNotLike(String value) {
+            addCriterion("endtme not like", value, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeIn(List<String> values) {
+            addCriterion("endtme in", values, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeNotIn(List<String> values) {
+            addCriterion("endtme not in", values, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeBetween(String value1, String value2) {
+            addCriterion("endtme between", value1, value2, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andEndtmeNotBetween(String value1, String value2) {
+            addCriterion("endtme not between", value1, value2, "endtme");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNull() {
+            addCriterion("state is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIsNotNull() {
+            addCriterion("state is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateEqualTo(String value) {
+            addCriterion("state =", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotEqualTo(String value) {
+            addCriterion("state <>", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThan(String value) {
+            addCriterion("state >", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateGreaterThanOrEqualTo(String value) {
+            addCriterion("state >=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThan(String value) {
+            addCriterion("state <", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLessThanOrEqualTo(String value) {
+            addCriterion("state <=", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateLike(String value) {
+            addCriterion("state like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotLike(String value) {
+            addCriterion("state not like", value, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateIn(List<String> values) {
+            addCriterion("state in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotIn(List<String> values) {
+            addCriterion("state not in", values, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateBetween(String value1, String value2) {
+            addCriterion("state between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andStateNotBetween(String value1, String value2) {
+            addCriterion("state not between", value1, value2, "state");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesIsNull() {
+            addCriterion("faildes is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesIsNotNull() {
+            addCriterion("faildes is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesEqualTo(String value) {
+            addCriterion("faildes =", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesNotEqualTo(String value) {
+            addCriterion("faildes <>", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesGreaterThan(String value) {
+            addCriterion("faildes >", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesGreaterThanOrEqualTo(String value) {
+            addCriterion("faildes >=", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesLessThan(String value) {
+            addCriterion("faildes <", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesLessThanOrEqualTo(String value) {
+            addCriterion("faildes <=", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesLike(String value) {
+            addCriterion("faildes like", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesNotLike(String value) {
+            addCriterion("faildes not like", value, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesIn(List<String> values) {
+            addCriterion("faildes in", values, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesNotIn(List<String> values) {
+            addCriterion("faildes not in", values, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesBetween(String value1, String value2) {
+            addCriterion("faildes between", value1, value2, "faildes");
+            return (Criteria) this;
+        }
+
+        public Criteria andFaildesNotBetween(String value1, String value2) {
+            addCriterion("faildes not between", value1, value2, "faildes");
+            return (Criteria) this;
+        }
+    }
+
+    public static class Criteria extends GeneratedCriteria {
+
+        protected Criteria() {
+            super();
+        }
+    }
+
+    public static class Criterion {
+        private String condition;
+
+        private Object value;
+
+        private Object secondValue;
+
+        private boolean noValue;
+
+        private boolean singleValue;
+
+        private boolean betweenValue;
+
+        private boolean listValue;
+
+        private String typeHandler;
+
+        public String getCondition() {
+            return condition;
+        }
+
+        public Object getValue() {
+            return value;
+        }
+
+        public Object getSecondValue() {
+            return secondValue;
+        }
+
+        public boolean isNoValue() {
+            return noValue;
+        }
+
+        public boolean isSingleValue() {
+            return singleValue;
+        }
+
+        public boolean isBetweenValue() {
+            return betweenValue;
+        }
+
+        public boolean isListValue() {
+            return listValue;
+        }
+
+        public String getTypeHandler() {
+            return typeHandler;
+        }
+
+        protected Criterion(String condition) {
+            super();
+            this.condition = condition;
+            this.typeHandler = null;
+            this.noValue = true;
+        }
+
+        protected Criterion(String condition, Object value, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.typeHandler = typeHandler;
+            if (value instanceof List<?>) {
+                this.listValue = true;
+            } else {
+                this.singleValue = true;
+            }
+        }
+
+        protected Criterion(String condition, Object value) {
+            this(condition, value, null);
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue, String typeHandler) {
+            super();
+            this.condition = condition;
+            this.value = value;
+            this.secondValue = secondValue;
+            this.typeHandler = typeHandler;
+            this.betweenValue = true;
+        }
+
+        protected Criterion(String condition, Object value, Object secondValue) {
+            this(condition, value, secondValue, null);
+        }
+    }
+}

modelsrc/com/miniframe/model/system/dao/DJobMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.system.dao;
+
+import com.miniframe.model.system.DJob;
+import com.miniframe.model.system.DJobSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface DJobMapper extends MiniserviceBaseDao, MFBaseMapper<DJob> {
+    long countByExample(DJobSQLBuilder example);
+}

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:18:10 CST 2024.
+    This file was generated on Mon Feb 26 09:39:26 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -27,5 +27,6 @@
     <mapper resource="com/miniframe/model/system/xml/DAccidentMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DBoundaryMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DNodeValMapper.xml" />
+    <mapper resource="com/miniframe/model/system/xml/DJobMapper.xml" />
   </mappers>
 </configuration>

modelsrc/com/miniframe/model/system/xml/DJobMapper.xml

@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.miniframe.model.system.dao.DJobMapper">
+  <sql id="Example_Where_Clause">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    <where>
+      <foreach collection="oredCriteria" item="criteria" separator="or">
+        <if test="criteria.valid">
+          <trim prefix="(" prefixOverrides="and" suffix=")">
+            <foreach collection="criteria.criteria" item="criterion">
+              <choose>
+                <when test="criterion.noValue">
+                  and ${criterion.condition}
+                </when>
+                <when test="criterion.singleValue">
+                  and ${criterion.condition} #{criterion.value}
+                </when>
+                <when test="criterion.betweenValue">
+                  and ${criterion.condition} #{criterion.value} and #{criterion.secondValue}
+                </when>
+                <when test="criterion.listValue">
+                  and ${criterion.condition}
+                  <foreach close=")" collection="criterion.value" item="listItem" open="(" separator=",">
+                    #{listItem}
+                  </foreach>
+                </when>
+              </choose>
+            </foreach>
+          </trim>
+        </if>
+      </foreach>
+    </where>
+  </sql>
+  <select id="countByExample" parameterType="com.miniframe.model.system.DJobSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from d_job
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

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

@@ -3,8 +3,14 @@ package com.miniframe.bisiness.system;
 import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D00008BaseModel;
+import com.miniframe.model.system.DAccident;
+import com.miniframe.model.system.DAccidentSQLBuilder;
+import com.miniframe.model.system.DJob;
+import com.miniframe.model.system.dao.DAccidentMapper;
+import com.miniframe.model.system.dao.DJobMapper;
 import com.miniframe.service.impl.FileServiceImpl;
 import com.miniframe.template.TemplateGenerator;
+import com.miniframe.tools.XIDateTimeUtils;
 import com.miniframe.websocket.WebsocketEndPoint;
 import lombok.SneakyThrows;
 
@@ -26,31 +32,42 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 	 * 基础系统,“灾情演练”业务核心处理
  	 */
 	public void transExecute() throws Exception {
-		String stype =this.getA_d00008().getStype();
 		Integer aid =this.getA_d00008().getAid();
-		if(stype.equals("Fire")){
-			TemplateGenerator.createFireControl(aid);
-			TemplateGenerator.createFireRunsh(aid);
-			TemplateGenerator.createFireInit(aid);
-			exeFire(aid);
+		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.setStarttime(XIDateTimeUtils.getNowStr());
+		job.setState("0");
+		int jid=dJobMapperDao.insertSelective(job);
+		accident.setJid(jid);
+		accidentDao.updateByPrimaryKey(accident);
+
+		if(accident.getStype().equals("Fire")){
+			TemplateGenerator.createFireControl(aid,jid);
+			TemplateGenerator.createFireRunsh(aid,jid);
+			TemplateGenerator.createFireInit(aid,jid);
+			exeFire(aid,jid);
 		}
-		if(stype.equals("Water")){
-			TemplateGenerator.createWaterControl(aid);
-			TemplateGenerator.createWaterRunsh(aid);
-			TemplateGenerator.createWaterInit(aid);
-			exeWater(aid);
+		if(accident.getStype().equals("Water")){
+			TemplateGenerator.createWaterControl(aid,jid);
+			TemplateGenerator.createWaterRunsh(aid,jid);
+			TemplateGenerator.createWaterInit(aid,jid);
+			exeWater(aid,jid);
 		}
 
 	}
 	//异步执行
 	@SneakyThrows
-	public void exeWater(Integer aid) throws Exception{
+	public void exeWater(Integer aid,Integer jid) throws Exception{
 		WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 			try {
 				Runtime runtime = Runtime.getRuntime();
 				Process p =null;
-				p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+aid+"/water"+"/"+"runWater.sh");
+				p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+aid+"/"+jid+"/water"+"/"+"runWater.sh");
 				InputStream fis = p.getInputStream();
 				InputStreamReader isr = new InputStreamReader(fis);
 				BufferedReader br = new BufferedReader(isr);
@@ -69,14 +86,14 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 	//异步执行
 	@SneakyThrows
-	public void exeFire(Integer aid) throws Exception{
+	public void exeFire(Integer aid,Integer jid) throws Exception{
 		WebsocketEndPoint webs =  (WebsocketEndPoint) UtilTools.getBean("websocketEndPoint");
 		CompletableFuture<Void> cf = CompletableFuture.supplyAsync(()->{
 			try {
 			Runtime runtime = Runtime.getRuntime();
 			Process p =null;
 			p= runtime.exec("sh "+TemplateGenerator.BPATH+"/"+
-					aid+"/fire"+"/"+"runFile.sh");
+					aid+"/"+jid+"/fire"+"/"+"runFile.sh");
 			InputStream fis = p.getInputStream();
 			InputStreamReader isr = new InputStreamReader(fis);
 			BufferedReader br = new BufferedReader(isr);

src/main/java/com/miniframe/dbtransfer/DJobDbTransfer.java

@@ -0,0 +1,23 @@
+package com.miniframe.dbtransfer;
+
+import com.miniframe.core.DbTransfer;
+import java.io.Serializable;
+import java.util.List;
+import java.util.Map;
+
+import com.miniframe.model.system.DJob;
+
+/**
+ * 实体列表,“D_JOB”数据库数据转化逻辑处理（重新生成不覆盖）。
+ */
+public class DJobDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DJob> list=l;
+		return list;
+	};
+
+}

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) throws IOException, TemplateException {
+    public static void createWaterControl(Integer aid,Integer jid) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -33,12 +33,12 @@ public class TemplateGenerator {
         //几何文件路径
         dataModel.put("geoFilePath", "/home/disaster/Water/Geometry");
         //initFile 文件路径
-        dataModel.put("initFilePath", BPATH+"/"+aid+"/water"+"/"+"water.init");
+        dataModel.put("initFilePath", BPATH+"/"+aid+"/"+jid+"/water"+"/"+"water.init");
 
         //midPath
-        dataModel.put("midPath", BPATH+"/"+aid+"/water"+"/mid");
+        dataModel.put("midPath", BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
         //outPath
-        dataModel.put("outPath", BPATH+"/"+aid+"/water"+"/out");
+        dataModel.put("outPath", BPATH+"/"+aid+"/"+jid+"/water"+"/out");
 
 
         // 将数据模型传入模板进行处理
@@ -46,16 +46,17 @@ public class TemplateGenerator {
         template.process(dataModel, writer);
         XIFileUtils.mkdir(BPATH);
         XIFileUtils.mkdir(BPATH+"/"+aid);
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/water");
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/water"+"/mid");
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/water"+"/out");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid);
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/water");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/water"+"/mid");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/water"+"/out");
 
         FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"/water"+"/water.control");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
 
-    public static void createWaterRunsh(Integer aid) throws IOException, TemplateException {
+    public static void createWaterRunsh(Integer aid,Integer jid) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -68,11 +69,11 @@ public class TemplateGenerator {
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/water"+"/"+"runWater.sh");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+jid+"/water"+"/"+"runWater.sh");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
-    public static void createWaterInit(Integer aid) throws IOException, TemplateException {
+    public static void createWaterInit(Integer aid,Integer jid) throws IOException, TemplateException {
         FireInitVo vo =new FireInitVo();
 
         DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
@@ -86,7 +87,7 @@ public class TemplateGenerator {
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
         DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
         dssc.andAidEqualTo(aid);
-        dssc.andSTypeEqualTo("Water");
+//        dssc.andSTypeEqualTo("Water");
         List<DSource>  dources =dsm.selectByExample(dss);
 
 
@@ -123,13 +124,13 @@ public class TemplateGenerator {
         // 输出结果到控制台或保存为文件
 //        System.out.println(writer.toString());
 
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/water"+"/"+"water.init");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+jid+"/water"+"/"+"water.init");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
 
 
-    public static void createFireControl(Integer aid) throws IOException, TemplateException {
+    public static void createFireControl(Integer aid,Integer jid) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -152,7 +153,7 @@ public class TemplateGenerator {
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
         DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
         dssc.andAidEqualTo(aid);
-        dssc.andSTypeEqualTo("Fire");
+//        dssc.andSTypeEqualTo("Fire");
         List<DSource>  dources =dsm.selectByExample(dss);
         //fireSourceNum  灾源数量
         dataModel.put("fireSourceNum", dources.size());
@@ -161,15 +162,16 @@ public class TemplateGenerator {
         template.process(dataModel, writer);
         XIFileUtils.mkdir(BPATH);
         XIFileUtils.mkdir(BPATH+"/"+aid);
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/fire");
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/fire"+"/mid");
-        XIFileUtils.mkdir(BPATH+"/"+aid+"/fire"+"/out");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid);
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/fire");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/fire"+"/mid");
+        XIFileUtils.mkdir(BPATH+"/"+aid+"/"+jid+"/fire"+"/out");
 
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+"/fire"+"/Fire.control");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+jid+"/"+"/fire"+"/Fire.control");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
-    public static void createFireRunsh(Integer aid) throws IOException, TemplateException {
+    public static void createFireRunsh(Integer aid,Integer jid) throws IOException, TemplateException {
         Configuration cfg = new Configuration(Configuration.VERSION_2_3_0);
         // 设置模板所在目录
         cfg.setClassForTemplateLoading(TemplateGenerator.class, "/templates");
@@ -182,12 +184,12 @@ public class TemplateGenerator {
         // 将数据模型传入模板进行处理
         StringWriter writer = new StringWriter();
         template.process(dataModel, writer);
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/fire"+"/"+"runFile.sh");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+jid+"/fire"+"/"+"runFile.sh");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
 
-    public static void createFireInit(Integer aid) throws IOException, TemplateException {
+    public static void createFireInit(Integer aid,Integer jid) throws IOException, TemplateException {
         FireInitVo vo =new FireInitVo();
 
         DNodeValMapper dnvm= UtilTools.getBean(DNodeValMapper.class);
@@ -201,7 +203,7 @@ public class TemplateGenerator {
         DSourceSQLBuilder dss= new DSourceSQLBuilder();
         DSourceSQLBuilder.Criteria dssc = dss.createCriteria();
         dssc.andAidEqualTo(aid);
-        dssc.andSTypeEqualTo("Fire");
+//        dssc.andSTypeEqualTo("Fire");
         List<DSource>  dources =dsm.selectByExample(dss);
 
 
@@ -238,12 +240,12 @@ public class TemplateGenerator {
         // 输出结果到控制台或保存为文件
 //        System.out.println(writer.toString());
 
-        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/fire"+"/"+"Fire.init");
+        FileWriter fileWriter =new FileWriter(BPATH+"/"+aid+"/"+jid+"/fire"+"/"+"Fire.init");
         fileWriter.write(writer.toString());
         fileWriter.close();
     }
 
     public static void main(String[] args) throws Exception {
-        TemplateGenerator.createWaterRunsh(5);
+//        TemplateGenerator.createWaterRunsh(5);
     }
 }

src/test/java/com/miniframe/ApplicationTests.java

@@ -19,9 +19,9 @@ class ApplicationTests {
 //        TemplateGenerator.createFireControl(5);
 //        TemplateGenerator.createFireRunsh(5);
 //        TemplateGenerator.createFireInit(5);
-        TemplateGenerator.createWaterControl(5);
-        TemplateGenerator.createWaterRunsh(5);
-        TemplateGenerator.createWaterInit(5);
+//        TemplateGenerator.createWaterControl(5);
+//        TemplateGenerator.createWaterRunsh(5);
+//        TemplateGenerator.createWaterInit(5);
     }
 
     @Test

系统设计/实体Bean/system(实体列表).csv

@@ -18,4 +18,5 @@
 16,D_SOURCE_VAL,灾源观测数据,,
 17,D_ACCIDENT,灾情事故信息,,
 18,D_BOUNDARY,边界数据,,
-13,D_NODE_VAL,节点观测数据,,
+19,D_NODE_VAL,节点观测数据,,
+20,D_JOB,求解任务,,

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

@@ -1,3 +1,2 @@
 序号,英文名称,中文名称,数据类型,默认值,格式化,非空/引用,最小(长度/值),最大(长度/值),验证规则,标准数据ID,XML样式,TAG标签,映射/子标签,CDATA
-1,aid,事故Id,int,,,是,,,,,,,,
-2,stype,火灾类型,string,,,是,,,,,,,,
+1,aid,事故Id,int,,,是,,,,,,,,