Browse Source

灾源数据保存

huangxingxing 9 tháng trước cách đây
mục cha
commit
47f26f4b4a

+ 23 - 0
modelsrc/com/miniframe/model/system/DSource.java

@@ -29,6 +29,11 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
      */
     private Float site;
 
+    /**
+     * 管道编号
+     */
+    private String pcode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -116,4 +121,22 @@ public class DSource extends MiniserviceBaseModel implements Serializable {
     public void setSite(Float site) {
         this.site = site;
     }
+
+    /**
+     * 获取管道编号
+     *
+     * @return pcode - 管道编号
+     */
+    public String getPcode() {
+        return pcode;
+    }
+
+    /**
+     * 设置管道编号
+     *
+     * @param pcode 管道编号
+     */
+    public void setPcode(String pcode) {
+        this.pcode = pcode == null ? null : pcode.trim();
+    }
 }

+ 70 - 0
modelsrc/com/miniframe/model/system/DSourceSQLBuilder.java

@@ -413,6 +413,76 @@ public class DSourceSQLBuilder {
             addCriterion("site not between", value1, value2, "site");
             return (Criteria) this;
         }
+
+        public Criteria andPcodeIsNull() {
+            addCriterion("pcode is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeIsNotNull() {
+            addCriterion("pcode is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeEqualTo(String value) {
+            addCriterion("pcode =", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeNotEqualTo(String value) {
+            addCriterion("pcode <>", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeGreaterThan(String value) {
+            addCriterion("pcode >", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeGreaterThanOrEqualTo(String value) {
+            addCriterion("pcode >=", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeLessThan(String value) {
+            addCriterion("pcode <", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeLessThanOrEqualTo(String value) {
+            addCriterion("pcode <=", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeLike(String value) {
+            addCriterion("pcode like", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeNotLike(String value) {
+            addCriterion("pcode not like", value, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeIn(List<String> values) {
+            addCriterion("pcode in", values, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeNotIn(List<String> values) {
+            addCriterion("pcode not in", values, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeBetween(String value1, String value2) {
+            addCriterion("pcode between", value1, value2, "pcode");
+            return (Criteria) this;
+        }
+
+        public Criteria andPcodeNotBetween(String value1, String value2) {
+            addCriterion("pcode not between", value1, value2, "pcode");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

+ 1 - 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 Fri Dec 06 13:53:30 CST 2024.
+    This file was generated on Mon Dec 09 09:20:51 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 2 - 1
src/main/java/com/miniframe/bisiness/system/D00004Service.java

@@ -51,7 +51,8 @@ public class D00004Service extends D00004BaseModel implements ExecProcessFlow {
 		DSource ds =new DSource();
 		ds.setAid(aid);
 		ds.setPid(pid);
-		ds.setPname(dp.getCode());
+		ds.setPcode(dp.getCode());
+		ds.setPname(dp.getName());
 		ds.setSite((float)this.getA_d00004().getSite());
 		dsm.insertSelective(ds);
 	}

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

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

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

@@ -8,7 +8,7 @@ ${b.nname},outlet
 #end
 #waters
 <#list vo.dourceVos as d>
-water ${d.dsource.pname} ${d.dsource.site} ${d.dsourceVals?size}
+water ${d.dsource.pcode} ${d.dsource.site} ${d.dsourceVals?size}
 <#list d.dsourceVals as dv>
 ${dv.timeline}  ${dv.val1}
 </#list>