瀏覽代碼

瓦斯爆炸区设置

huangxingxing 9 月之前
父節點
當前提交
1ce6c782f7

+ 28 - 5
modelsrc/com/miniframe/model/system/DGasBlastArea.java

@@ -25,7 +25,7 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
     private Integer pid;
 
     /**
-     * 管道编号
+     * 管道名称
      */
     private String pname;
 
@@ -39,6 +39,11 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
      */
     private Float esite;
 
+    /**
+     * 管道编号
+     */
+    private String pcode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -110,18 +115,18 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
     }
 
     /**
-     * 获取管道编号
+     * 获取管道名称
      *
-     * @return pname - 管道编号
+     * @return pname - 管道名称
      */
     public String getPname() {
         return pname;
     }
 
     /**
-     * 设置管道编号
+     * 设置管道名称
      *
-     * @param pname 管道编号
+     * @param pname 管道名称
      */
     public void setPname(String pname) {
         this.pname = pname == null ? null : pname.trim();
@@ -162,4 +167,22 @@ public class DGasBlastArea extends MiniserviceBaseModel implements Serializable
     public void setEsite(Float esite) {
         this.esite = esite;
     }
+
+    /**
+     * 获取管道编号
+     *
+     * @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/DGasBlastAreaSQLBuilder.java

@@ -533,6 +533,76 @@ public class DGasBlastAreaSQLBuilder {
             addCriterion("esite not between", value1, value2, "esite");
             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 Mon Dec 09 09:32:55 CST 2024.
+    This file was generated on Mon Dec 09 09:59:15 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 4 - 2
src/main/java/com/miniframe/bisiness/system/D10024Service.java

@@ -48,7 +48,8 @@ public class D10024Service extends D10024BaseModel implements ExecProcessFlow {
 			gb.setAid(gas.getAid());
 			gb.setGid(gid);
 			gb.setPid(pid);
-			gb.setPname(pipe.getCode());
+			gb.setPname(pipe.getName());
+			gb.setPcode(pipe.getCode());
 			gb.setEsite(esite.floatValue());
 			gb.setSsite(ssite.floatValue());
 
@@ -62,7 +63,8 @@ public class D10024Service extends D10024BaseModel implements ExecProcessFlow {
 			gb.setAid(gas.getAid());
 			gb.setGid(gid);
 			gb.setPid(pid);
-			gb.setPname(pipe.getCode());
+			gb.setPname(pipe.getName());
+			gb.setPcode(pipe.getCode());
 			gb.setEsite(esite.floatValue());
 			gb.setSsite(ssite.floatValue());
 			blastAreaMapper.updateByPrimaryKey(gb);

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

@@ -8,7 +8,7 @@ ${b.ncode},${b.type},${b.flow},${b.pressure},${b.temperature} ,${b.polcon1} ,${b
 #MashGass
 MashGas1,${blastnum},${gathernum}
 <#list blastList as b>
-${b.pname},${b.ssite},${b.esite}
+${b.pcode},${b.ssite},${b.esite}
 </#list>
 grdfile,${gas.gfname}
 inpfile,${gas.bfname}