Преглед на файлове

求解路径生成 结果保存

huangxingxing преди 1 година
родител
ревизия
6c36c16ab7

+ 123 - 0
modelsrc/com/miniframe/model/system/DWayResult.java

@@ -0,0 +1,123 @@
+package com.miniframe.model.system;
+
+import com.miniframe.system.MiniserviceBaseModel;
+import java.io.Serializable;
+import javax.persistence.*;
+
+@Table(name = "d_way_result")
+public class DWayResult extends MiniserviceBaseModel implements Serializable {
+    @Id
+    private Integer id;
+
+    private Integer aid;
+
+    private Integer jid;
+
+    private String person;
+
+    private String wcode;
+
+    private String safety;
+
+    private String flag;
+
+    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 person
+     */
+    public String getPerson() {
+        return person;
+    }
+
+    /**
+     * @param person
+     */
+    public void setPerson(String person) {
+        this.person = person == null ? null : person.trim();
+    }
+
+    /**
+     * @return wcode
+     */
+    public String getWcode() {
+        return wcode;
+    }
+
+    /**
+     * @param wcode
+     */
+    public void setWcode(String wcode) {
+        this.wcode = wcode == null ? null : wcode.trim();
+    }
+
+    /**
+     * @return safety
+     */
+    public String getSafety() {
+        return safety;
+    }
+
+    /**
+     * @param safety
+     */
+    public void setSafety(String safety) {
+        this.safety = safety == null ? null : safety.trim();
+    }
+
+    /**
+     * @return flag
+     */
+    public String getFlag() {
+        return flag;
+    }
+
+    /**
+     * @param flag
+     */
+    public void setFlag(String flag) {
+        this.flag = flag == null ? null : flag.trim();
+    }
+}

+ 660 - 0
modelsrc/com/miniframe/model/system/DWayResultSQLBuilder.java

@@ -0,0 +1,660 @@
+package com.miniframe.model.system;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DWayResultSQLBuilder {
+    protected String orderByClause;
+
+    protected boolean distinct;
+
+    protected List<Criteria> oredCriteria;
+
+    public DWayResultSQLBuilder() {
+        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 andPersonIsNull() {
+            addCriterion("person is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonIsNotNull() {
+            addCriterion("person is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonEqualTo(String value) {
+            addCriterion("person =", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonNotEqualTo(String value) {
+            addCriterion("person <>", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonGreaterThan(String value) {
+            addCriterion("person >", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonGreaterThanOrEqualTo(String value) {
+            addCriterion("person >=", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonLessThan(String value) {
+            addCriterion("person <", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonLessThanOrEqualTo(String value) {
+            addCriterion("person <=", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonLike(String value) {
+            addCriterion("person like", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonNotLike(String value) {
+            addCriterion("person not like", value, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonIn(List<String> values) {
+            addCriterion("person in", values, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonNotIn(List<String> values) {
+            addCriterion("person not in", values, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonBetween(String value1, String value2) {
+            addCriterion("person between", value1, value2, "person");
+            return (Criteria) this;
+        }
+
+        public Criteria andPersonNotBetween(String value1, String value2) {
+            addCriterion("person not between", value1, value2, "person");
+            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 andSafetyIsNull() {
+            addCriterion("safety is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyIsNotNull() {
+            addCriterion("safety is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyEqualTo(String value) {
+            addCriterion("safety =", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyNotEqualTo(String value) {
+            addCriterion("safety <>", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyGreaterThan(String value) {
+            addCriterion("safety >", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyGreaterThanOrEqualTo(String value) {
+            addCriterion("safety >=", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyLessThan(String value) {
+            addCriterion("safety <", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyLessThanOrEqualTo(String value) {
+            addCriterion("safety <=", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyLike(String value) {
+            addCriterion("safety like", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyNotLike(String value) {
+            addCriterion("safety not like", value, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyIn(List<String> values) {
+            addCriterion("safety in", values, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyNotIn(List<String> values) {
+            addCriterion("safety not in", values, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyBetween(String value1, String value2) {
+            addCriterion("safety between", value1, value2, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andSafetyNotBetween(String value1, String value2) {
+            addCriterion("safety not between", value1, value2, "safety");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIsNull() {
+            addCriterion("flag is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIsNotNull() {
+            addCriterion("flag is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagEqualTo(String value) {
+            addCriterion("flag =", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotEqualTo(String value) {
+            addCriterion("flag <>", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagGreaterThan(String value) {
+            addCriterion("flag >", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagGreaterThanOrEqualTo(String value) {
+            addCriterion("flag >=", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagLessThan(String value) {
+            addCriterion("flag <", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagLessThanOrEqualTo(String value) {
+            addCriterion("flag <=", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagLike(String value) {
+            addCriterion("flag like", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotLike(String value) {
+            addCriterion("flag not like", value, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagIn(List<String> values) {
+            addCriterion("flag in", values, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotIn(List<String> values) {
+            addCriterion("flag not in", values, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagBetween(String value1, String value2) {
+            addCriterion("flag between", value1, value2, "flag");
+            return (Criteria) this;
+        }
+
+        public Criteria andFlagNotBetween(String value1, String value2) {
+            addCriterion("flag not between", value1, value2, "flag");
+            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/DWayResultMapper.java

@@ -0,0 +1,10 @@
+package com.miniframe.model.system.dao;
+
+import com.miniframe.model.system.DWayResult;
+import com.miniframe.model.system.DWayResultSQLBuilder;
+import com.miniframe.spring.db.MFBaseMapper;
+import com.miniframe.system.MiniserviceBaseDao;
+
+public interface DWayResultMapper extends MiniserviceBaseDao, MFBaseMapper<DWayResult> {
+    long countByExample(DWayResultSQLBuilder 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 Thu Apr 18 18:37:29 CST 2024.
+    This file was generated on Sat Apr 20 10:12:10 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />
@@ -39,5 +39,6 @@
     <mapper resource="com/miniframe/model/system/xml/DThresholdMapper.xml" />
     <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" />
   </mappers>
 </configuration>

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

+ 57 - 0
src/main/java/com/miniframe/bisiness/system/D00008Service.java

@@ -341,6 +341,8 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 
 				saveMonitorValue(aid,jid);
+				//路径保存
+				saveWayValue(aid,jid);
 				JobSucces(jid);
 				LogService.addLog(aid,jid,"Water","求解——————————————————成功");
 			} catch (IOException | BusinessException e) {
@@ -376,6 +378,9 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 
 				//监测点数据保存
 				saveMonitorValue(aid,jid);
+
+				//路径保存
+				saveWayValue(aid,jid);
 				LogService.addLog(aid,jid,"Fire","求解——————————————————成功");
 				JobSucces(jid);
 			} catch (IOException | BusinessException e) {
@@ -389,6 +394,58 @@ public class D00008Service extends D00008BaseModel implements ExecProcessFlow {
 	}
 
 
+	public void saveWayValue(Integer aid,Integer jid) throws FileNotFoundException, BusinessException {
+		DJobMapper dJobDao= UtilTools.getBean(DJobMapper.class);
+		DJob job =dJobDao.selectByPrimaryKey(jid);
+		Integer stepNum = Integer.valueOf(job.getTotaltime())/Integer.valueOf(job.getReportstep());
+
+		DAccidentMapper accidentDao  = UtilTools.getBean(DAccidentMapper.class);
+		DAccident accident= accidentDao.selectByPrimaryKey(aid);
+
+
+		String SafetyFile="";
+		if(accident.getStype().endsWith("Fire")){
+			SafetyFile= TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/fire/out/Safety";
+		}
+		if(accident.getStype().endsWith("Water")){
+			SafetyFile=TemplateGenerator.BPATH+"/"+aid+"/"+accident.getJid()+"/water/out/Safety";
+		}
+
+
+		List<DWayResult> wayResults =new ArrayList<>();
+		FileReader fileReader = new FileReader(SafetyFile);
+		BufferedReader reader = new BufferedReader(fileReader);
+		/**
+		 * person1,line2,safety,0
+		 * person1,line1,safety,0
+		 */
+		String line;
+		try{
+			while ((line = reader.readLine()) != null) {
+				String[] t = line.trim().split(",");
+				DWayResult result = new DWayResult();
+				result.setAid(aid);
+				result.setJid(jid);
+				result.setPerson(t.length>0?t[0]:"0");
+				result.setWcode(t.length>1?t[1]:"0");
+				result.setSafety(t.length>2?t[2]:"0");
+				result.setFlag(t.length>3?t[3]:"0");
+				wayResults.add(result);
+				}
+			fileReader.close();
+			reader.close();
+
+		}catch (Exception e){
+			System.out.println(e);
+			throw  new BusinessException("EB3100014");
+		}
+
+		DWayResultMapper rMapper =UtilTools.getBean(DWayResultMapper.class);
+		for (DWayResult r:wayResults) {
+			rMapper.insertSelective(r);
+		}
+	}
+
 	
 	/**
 	 *

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

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

@@ -32,4 +32,5 @@
 27,D_THRESHOLD,报警设置,FALSE,
 
 28,d_way,预设路径,FALSE,
-29,D_WAYNODE,预设路径节点,FALSE,
+29,D_WAYNODE,预设路径节点,FALSE,
+20,D_WAY_RESULT,路径求解结果,FALSE,