Эх сурвалжийг харах

求解路径生成 结果 查询

huangxingxing 1 жил өмнө
parent
commit
8f36fc9995

+ 64 - 0
generated/com/miniframe/generate/comm/system/D_D10036_ROWS_NRROWS_RECODE.java

@@ -0,0 +1,64 @@
+/**
+ * 系统服务
+ */
+package com.miniframe.generate.comm.system;
+import com.miniframe.core.BaseMapModel;
+import java.io.Serializable;
+/**
+ * 路径求解结果获取->数据->节点结果数据
+ */
+public class D_D10036_ROWS_NRROWS_RECODE extends BaseMapModel implements Serializable {
+	private static final long serialVersionUID = -1463838678425832212L;
+	String ncode;//节点编号
+	/**
+	 *节点编号
+	 */
+	public void setNcode(String ncode) {
+		this.ncode=ncode;
+	}
+	/**
+	 *节点编号
+	 */
+	public String getNcode() {
+		return this.ncode;
+	}
+	String v1;//节点编号
+	/**
+	 *节点编号
+	 */
+	public void setV1(String v1) {
+		this.v1=v1;
+	}
+	/**
+	 *节点编号
+	 */
+	public String getV1() {
+		return this.v1;
+	}
+	String v2;//节点编号
+	/**
+	 *节点编号
+	 */
+	public void setV2(String v2) {
+		this.v2=v2;
+	}
+	/**
+	 *节点编号
+	 */
+	public String getV2() {
+		return this.v2;
+	}
+	String v3;//节点编号
+	/**
+	 *节点编号
+	 */
+	public void setV3(String v3) {
+		this.v3=v3;
+	}
+	/**
+	 *节点编号
+	 */
+	public String getV3() {
+		return this.v3;
+	}
+}

+ 13 - 0
generated/com/miniframe/generate/comm/system/D_D10036_ROWS_RECODE.java

@@ -127,4 +127,17 @@ public class D_D10036_ROWS_RECODE extends BaseMapModel implements Serializable {
 	public List <D_D10036_ROWS_NROWS_RECODE> getNrows() {
 		return this.nrows;
 	}
+	List <D_D10036_ROWS_NRROWS_RECODE> nrrows;//节点结果数据
+	/**
+	 *节点结果数据
+	 */
+	public void setNrrows(List <D_D10036_ROWS_NRROWS_RECODE> nrrows) {
+		this.nrrows=nrrows;
+	}
+	/**
+	 *节点结果数据
+	 */
+	public List <D_D10036_ROWS_NRROWS_RECODE> getNrrows() {
+		return this.nrrows;
+	}
 }

+ 5 - 0
generated/validator/resources_d_d10036_rows_nrrows_recodeForm_validator.properties

@@ -0,0 +1,5 @@
+d_d10036_rows_nrrows_recode.ncode = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v1 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v2 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v3 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recodeForm = true

+ 5 - 0
generated/validator/resources_d_d10036_rows_nrrows_recodeForm_validator_zh_CN.properties

@@ -0,0 +1,5 @@
+d_d10036_rows_nrrows_recode.ncode = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v1 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v2 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recode.v3 = \u8282\u70B9\u7F16\u53F7
+d_d10036_rows_nrrows_recodeForm = true

+ 139 - 0
modelsrc/com/miniframe/model/system/DWaynodeResult.java

@@ -0,0 +1,139 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_waynode_result")
+public class DWaynodeResult extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    private Integer aid;
+
+    private Integer jid;
+
+    private String wcode;
+
+    private String ncode;
+
+    private String v1;
+
+    private String v2;
+
+    private String v3;
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * @return id
+     */
+    public Integer getId() {
+        return id;
+    }
+
+    /**
+     * @param id
+     */
+    public void setId(Integer id) {
+        this.id = id;
+    }
+
+    /**
+     * @return aid
+     */
+    public Integer getAid() {
+        return aid;
+    }
+
+    /**
+     * @param aid
+     */
+    public void setAid(Integer aid) {
+        this.aid = aid;
+    }
+
+    /**
+     * @return jid
+     */
+    public Integer getJid() {
+        return jid;
+    }
+
+    /**
+     * @param jid
+     */
+    public void setJid(Integer jid) {
+        this.jid = jid;
+    }
+
+    /**
+     * @return wcode
+     */
+    public String getWcode() {
+        return wcode;
+    }
+
+    /**
+     * @param wcode
+     */
+    public void setWcode(String wcode) {
+        this.wcode = wcode == null ? null : wcode.trim();
+    }
+
+    /**
+     * @return ncode
+     */
+    public String getNcode() {
+        return ncode;
+    }
+
+    /**
+     * @param ncode
+     */
+    public void setNcode(String ncode) {
+        this.ncode = ncode == null ? null : ncode.trim();
+    }
+
+    /**
+     * @return v1
+     */
+    public String getV1() {
+        return v1;
+    }
+
+    /**
+     * @param v1
+     */
+    public void setV1(String v1) {
+        this.v1 = v1 == null ? null : v1.trim();
+    }
+
+    /**
+     * @return v2
+     */
+    public String getV2() {
+        return v2;
+    }
+
+    /**
+     * @param v2
+     */
+    public void setV2(String v2) {
+        this.v2 = v2 == null ? null : v2.trim();
+    }
+
+    /**
+     * @return v3
+     */
+    public String getV3() {
+        return v3;
+    }
+
+    /**
+     * @param v3
+     */
+    public void setV3(String v3) {
+        this.v3 = v3 == null ? null : v3.trim();
+    }
+}

+ 730 - 0
modelsrc/com/miniframe/model/system/DWaynodeResultSQLBuilder.java

@@ -0,0 +1,730 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DWaynodeResultSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DWaynodeResultSQLBuilder() {
+        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 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 Criteria andWcodeIsNull() {
+            addCriterion("wcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeIsNotNull() {
+            addCriterion("wcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeEqualTo(String value) {
+            addCriterion("wcode =", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeNotEqualTo(String value) {
+            addCriterion("wcode <>", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeGreaterThan(String value) {
+            addCriterion("wcode >", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("wcode >=", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeLessThan(String value) {
+            addCriterion("wcode <", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeLessThanOrEqualTo(String value) {
+            addCriterion("wcode <=", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeLike(String value) {
+            addCriterion("wcode like", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeNotLike(String value) {
+            addCriterion("wcode not like", value, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeIn(List<String> values) {
+            addCriterion("wcode in", values, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeNotIn(List<String> values) {
+            addCriterion("wcode not in", values, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeBetween(String value1, String value2) {
+            addCriterion("wcode between", value1, value2, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andWcodeNotBetween(String value1, String value2) {
+            addCriterion("wcode not between", value1, value2, "wcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeIsNull() {
+            addCriterion("ncode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeIsNotNull() {
+            addCriterion("ncode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeEqualTo(String value) {
+            addCriterion("ncode =", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeNotEqualTo(String value) {
+            addCriterion("ncode <>", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeGreaterThan(String value) {
+            addCriterion("ncode >", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("ncode >=", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeLessThan(String value) {
+            addCriterion("ncode <", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeLessThanOrEqualTo(String value) {
+            addCriterion("ncode <=", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeLike(String value) {
+            addCriterion("ncode like", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeNotLike(String value) {
+            addCriterion("ncode not like", value, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeIn(List<String> values) {
+            addCriterion("ncode in", values, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeNotIn(List<String> values) {
+            addCriterion("ncode not in", values, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeBetween(String value1, String value2) {
+            addCriterion("ncode between", value1, value2, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andNcodeNotBetween(String value1, String value2) {
+            addCriterion("ncode not between", value1, value2, "ncode");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1IsNull() {
+            addCriterion("v1 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1IsNotNull() {
+            addCriterion("v1 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1EqualTo(String value) {
+            addCriterion("v1 =", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1NotEqualTo(String value) {
+            addCriterion("v1 <>", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1GreaterThan(String value) {
+            addCriterion("v1 >", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1GreaterThanOrEqualTo(String value) {
+            addCriterion("v1 >=", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1LessThan(String value) {
+            addCriterion("v1 <", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1LessThanOrEqualTo(String value) {
+            addCriterion("v1 <=", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1Like(String value) {
+            addCriterion("v1 like", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1NotLike(String value) {
+            addCriterion("v1 not like", value, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1In(List<String> values) {
+            addCriterion("v1 in", values, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1NotIn(List<String> values) {
+            addCriterion("v1 not in", values, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1Between(String value1, String value2) {
+            addCriterion("v1 between", value1, value2, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV1NotBetween(String value1, String value2) {
+            addCriterion("v1 not between", value1, value2, "v1");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2IsNull() {
+            addCriterion("v2 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2IsNotNull() {
+            addCriterion("v2 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2EqualTo(String value) {
+            addCriterion("v2 =", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2NotEqualTo(String value) {
+            addCriterion("v2 <>", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2GreaterThan(String value) {
+            addCriterion("v2 >", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2GreaterThanOrEqualTo(String value) {
+            addCriterion("v2 >=", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2LessThan(String value) {
+            addCriterion("v2 <", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2LessThanOrEqualTo(String value) {
+            addCriterion("v2 <=", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2Like(String value) {
+            addCriterion("v2 like", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2NotLike(String value) {
+            addCriterion("v2 not like", value, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2In(List<String> values) {
+            addCriterion("v2 in", values, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2NotIn(List<String> values) {
+            addCriterion("v2 not in", values, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2Between(String value1, String value2) {
+            addCriterion("v2 between", value1, value2, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV2NotBetween(String value1, String value2) {
+            addCriterion("v2 not between", value1, value2, "v2");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3IsNull() {
+            addCriterion("v3 is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3IsNotNull() {
+            addCriterion("v3 is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3EqualTo(String value) {
+            addCriterion("v3 =", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3NotEqualTo(String value) {
+            addCriterion("v3 <>", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3GreaterThan(String value) {
+            addCriterion("v3 >", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3GreaterThanOrEqualTo(String value) {
+            addCriterion("v3 >=", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3LessThan(String value) {
+            addCriterion("v3 <", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3LessThanOrEqualTo(String value) {
+            addCriterion("v3 <=", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3Like(String value) {
+            addCriterion("v3 like", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3NotLike(String value) {
+            addCriterion("v3 not like", value, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3In(List<String> values) {
+            addCriterion("v3 in", values, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3NotIn(List<String> values) {
+            addCriterion("v3 not in", values, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3Between(String value1, String value2) {
+            addCriterion("v3 between", value1, value2, "v3");
+            return (Criteria) this;
+        }
+
+        public Criteria andV3NotBetween(String value1, String value2) {
+            addCriterion("v3 not between", value1, value2, "v3");
+            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);
+        }
+    }
+}

+ 10 - 0
modelsrc/com/miniframe/model/system/dao/DWaynodeResultMapper.java

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

+ 2 - 1
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 Sat Apr 20 10:12:10 CST 2024.
+    This file was generated on Sat Apr 20 11:22:36 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -40,5 +40,6 @@
     <mapper resource="com/miniframe/model/system/xml/DWayMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DWaynodeMapper.xml" />
     <mapper resource="com/miniframe/model/system/xml/DWayResultMapper.xml" />
+    <mapper resource="com/miniframe/model/system/xml/DWaynodeResultMapper.xml" />
   </mappers>
 </configuration>

+ 50 - 0
modelsrc/com/miniframe/model/system/xml/DWaynodeResultMapper.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.DWaynodeResultMapper">
+  <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.DWaynodeResultSQLBuilder" resultType="java.lang.Long">
+    <!--
+      WARNING - @mbg.generated
+    -->
+    select count(*) from d_waynode_result
+    <if test="_parameter != null">
+      <include refid="Example_Where_Clause" />
+    </if>
+  </select>
+  <cache>
+    <!--
+      WARNING - @mbg.generated
+    -->
+  </cache>
+</mapper>

+ 25 - 1
src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -413,11 +413,13 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 
 		List<DWayResult> wayResults =new ArrayList<>();
+		List<DWaynodeResult> wayNodeResults =new ArrayList<>();
 		FileReader fileReader = new FileReader(SafetyFile);
 		BufferedReader reader = new BufferedReader(fileReader);
 		/**
+		 * person1,line1,danger,1
+		 * nodes29,987.7211,10.0000,1800.0000
 		 * person1,line2,safety,0
-		 * person1,line1,safety,0
 		 */
 		String line;
 		try{
@@ -430,6 +432,24 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 				result.setWcode(t.length>1?t[1]:"0");
 				result.setSafety(t.length>2?t[2]:"0");
 				result.setFlag(t.length>3?t[3]:"0");
+				int i =0;
+				if(result.getSafety().equals("danger")){
+					if(i<Integer.valueOf(result.getFlag())){
+						while ((line = reader.readLine()) != null) {
+							i++;
+							String[] t1 = line.trim().split(",");
+							DWaynodeResult wnr =new DWaynodeResult();
+							wnr.setAid(aid);
+							wnr.setJid(jid);
+							wnr.setWcode(result.getWcode());
+							wnr.setNcode(t1.length>0?t1[0]:"0");
+							wnr.setV1(t1.length>0?t1[1]:"0");
+							wnr.setV2(t1.length>0?t1[2]:"0");
+							wnr.setV3(t1.length>0?t1[3]:"0");
+							wayNodeResults.add(wnr);
+						}
+					}
+				}
 				wayResults.add(result);
 				}
 			fileReader.close();
@@ -444,6 +464,10 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 		for (DWayResult r:wayResults) {
 			rMapper.insertSelective(r);
 		}
+		DWaynodeResultMapper wnrMapper = UtilTools.getBean(DWaynodeResultMapper.class);
+		for (DWaynodeResult r:wayNodeResults) {
+			wnrMapper.insertSelective(r);
+		}
 	}
 
 	

+ 56 - 29
src/main/java/com/miniframe/bisiness/system/D10036Service.java

@@ -7,6 +7,7 @@ import com.miniframe.core.ExecProcessFlow;
 import com.miniframe.core.ext.UtilTools;
 import com.miniframe.generate.business.system.model.D10036BaseModel;
 import com.miniframe.generate.comm.system.D_D10036_ROWS_NROWS_RECODE;
+import com.miniframe.generate.comm.system.D_D10036_ROWS_NRROWS_RECODE;
 import com.miniframe.generate.comm.system.D_D10036_ROWS_RECODE;
 import com.miniframe.model.system.*;
 import com.miniframe.model.system.dao.*;
@@ -43,41 +44,67 @@ public class D10036Service extends D10036BaseModel implements ExecProcessFlow {
 			row.setSafety(r.getSafety());
 			row.setFlag(r.getFlag());
 			row.setWcode(r.getWcode());
+			List<D_D10036_ROWS_NROWS_RECODE> nrows = findWayNode(r);
+			List<D_D10036_ROWS_NRROWS_RECODE> nrrows = findWayNodeResult(r);
+			row.setNrows(nrows);
+			row.setNrrows(nrrows);
+			rows.add(row);
+		}
+		this.getD_d10036().setRows(rows);
+	}
 
-			DWayMapper wayMapper =UtilTools.getBean(DWayMapper.class);
-			DWaySQLBuilder wsb =new DWaySQLBuilder();
-			DWaySQLBuilder.Criteria wsc = wsb.createCriteria();
-			wsc.andCodeEqualTo(r.getWcode());
-			DWay way =wayMapper.selectOneByExample(wsb);
+	private List<D_D10036_ROWS_NROWS_RECODE> findWayNode(DWayResult r) {
+		DWayMapper wayMapper =UtilTools.getBean(DWayMapper.class);
+		DWaySQLBuilder wsb =new DWaySQLBuilder();
+		DWaySQLBuilder.Criteria wsc = wsb.createCriteria();
+		wsc.andCodeEqualTo(r.getWcode());
+		DWay way =wayMapper.selectOneByExample(wsb);
 
-			List<D_D10036_ROWS_NROWS_RECODE> nrows =new ArrayList<>();
-			DWaynodeMapper nMapper = UtilTools.getBean(DWaynodeMapper.class);
-			DWaynodeSQLBuilder nsb =new DWaynodeSQLBuilder();
-			DWaynodeSQLBuilder.Criteria nsc =nsb.createCriteria();
-			nsc.andWidEqualTo(way.getId());
-			nsb.setOrderByClause("seq ASC");
+		List<D_D10036_ROWS_NROWS_RECODE> nrows =new ArrayList<>();
+		DWaynodeMapper nMapper = UtilTools.getBean(DWaynodeMapper.class);
+		DWaynodeSQLBuilder nsb =new DWaynodeSQLBuilder();
+		DWaynodeSQLBuilder.Criteria nsc =nsb.createCriteria();
+		nsc.andWidEqualTo(way.getId());
+		nsb.setOrderByClause("seq ASC");
 
-			List<DWaynode> nlist = nMapper.selectByExample(nsb);
-			for (DWaynode n :
-					nlist) {
-				D_D10036_ROWS_NROWS_RECODE nr =new D_D10036_ROWS_NROWS_RECODE();
-				nr.setNcode(n.getNcode());
-				nr.setNid(n.getNid());
-				nr.setNname(n.getNname());
+		List<DWaynode> nlist = nMapper.selectByExample(nsb);
+		for (DWaynode n :
+				nlist) {
+			D_D10036_ROWS_NROWS_RECODE nr =new D_D10036_ROWS_NROWS_RECODE();
+			nr.setNcode(n.getNcode());
+			nr.setNid(n.getNid());
+			nr.setNname(n.getNname());
 
-				DNodeMapper dNodeMapper = UtilTools.getBean(DNodeMapper.class);
-				DNode dn=dNodeMapper.selectByPrimaryKey(n.getNid());
-				nr.setX(dn.getX());
-				nr.setY(dn.getY());
-				nr.setZ(dn.getZ());
-				nrows.add(nr);
-			}
-			row.setNrows(nrows);
-			rows.add(row);
+			DNodeMapper dNodeMapper = UtilTools.getBean(DNodeMapper.class);
+			DNode dn=dNodeMapper.selectByPrimaryKey(n.getNid());
+			nr.setX(dn.getX());
+			nr.setY(dn.getY());
+			nr.setZ(dn.getZ());
+			nrows.add(nr);
 		}
-		this.getD_d10036().setRows(rows);
+		return nrows;
 	}
-	
+
+
+	private List<D_D10036_ROWS_NRROWS_RECODE> findWayNodeResult(DWayResult r) {
+		List<D_D10036_ROWS_NRROWS_RECODE> nrrows =new ArrayList<>();
+		DWaynodeResultMapper nrMapper =UtilTools.getBean(DWaynodeResultMapper.class);
+		DWaynodeResultSQLBuilder nrsb =new DWaynodeResultSQLBuilder();
+		DWaynodeResultSQLBuilder.Criteria nrsc = nrsb.createCriteria();
+		nrsc.andWcodeEqualTo(r.getWcode());
+		List<DWaynodeResult> nrList =nrMapper.selectByExample(nrsb);
+		for (DWaynodeResult nr :
+				nrList) {
+			D_D10036_ROWS_NRROWS_RECODE nrrow =new D_D10036_ROWS_NRROWS_RECODE();
+			nrrow.setNcode(nr.getNcode());
+			nrrow.setV1(nr.getV1());
+			nrrow.setV2(nr.getV2());
+			nrrow.setV3(nr.getV3());
+			nrrows.add(nrrow);
+		}
+		return nrrows;
+	}
+
 	/**
 	 * 基础系统,“路径求解结果获取”业务前处理
  	 */

+ 23 - 0
src/main/java/com/miniframe/dbtransfer/DWaynodeResultDbTransfer.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.DWaynodeResult;
+
+/**
+ * 实体列表,“D_WAYNODE_RESULT”数据库数据转化逻辑处理(重新生成不覆盖)。
+ */
+public class DWaynodeResultDbTransfer extends DbTransfer implements Serializable {
+	
+	private static final long serialVersionUID = -7051358269847459502L;
+
+	@Override
+	public List transfer(final List l,Map map) throws Exception{
+		List<DWaynodeResult> list=l;
+		return list;
+	};
+
+}

+ 2 - 1
系统设计/实体Bean/system(实体列表).csv

@@ -33,4 +33,5 @@
 
 28,d_way,预设路径,FALSE,
 29,D_WAYNODE,预设路径节点,FALSE,
-20,D_WAY_RESULT,路径求解结果,FALSE,
+20,D_WAY_RESULT,路径求解结果,FALSE,
+21,D_WAYNODE_RESULT,路径节点求解结果,FALSE,

+ 6 - 1
系统设计/通信设计/通讯报文/system(系统服务)/报文体/D10036_D(路径求解结果获取).csv

@@ -14,4 +14,9 @@
 1.9.3,ncode,节点编号,string,,,,,,,,,,,
 1.9.4,x,x,string,,,,,,,,,,,
 1.9.5,y,y,string,,,,,,,,,,,
-1.9.6,z,z,string,,,,,,,,,,,
+1.9.6,z,z,string,,,,,,,,,,,
+1.10,nrrows,节点结果数据,list,,,,0,,,,,,,
+1.10.1,ncode,节点编号,string,,,,,,,,,,,
+1.10.2,v1,节点编号,string,,,,,,,,,,,
+1.10.3,v2,节点编号,string,,,,,,,,,,,
+1.10.4,v3,节点编号,string,,,,,,,,,,,