Ver código fonte

监测点保存 存储巷道名称

huangxingxing 9 meses atrás
pai
commit
8917492840

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

@@ -34,6 +34,11 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
      */
     private String chcode;
 
+    /**
+     * 管道编号
+     */
+    private String pcode;
+
     private static final long serialVersionUID = 1L;
 
     /**
@@ -139,4 +144,22 @@ public class DChecknode extends MiniserviceBaseModel implements Serializable {
     public void setChcode(String chcode) {
         this.chcode = chcode == null ? null : chcode.trim();
     }
+
+    /**
+     * 获取管道编号
+     *
+     * @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/DChecknodeSQLBuilder.java

@@ -493,6 +493,76 @@ public class DChecknodeSQLBuilder {
             addCriterion("chcode not between", value1, value2, "chcode");
             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 Nov 25 15:00:20 CST 2024.
+    This file was generated on Fri Dec 06 09:33:28 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

+ 3 - 0
src/main/java/com/miniframe/bisiness/system/D10005Service.java

@@ -34,6 +34,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			throw new BusinessException("EB3100015");
 		}
 		String pname =pipe.getName();
+		String pcode = pipe.getCode();
 		if(cid ==null||cid<=0 ){//添加
 			pdPidSite(checknodeDao, pid, (float) site);
 			DChecknode node =new DChecknode();
@@ -42,6 +43,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setPname(pname);
 			node.setChname(chname);
 			node.setChcode(chcode);
+			node.setPcode(pcode);
 			checknodeDao.insertSelective(node);
 		}else{//修改
 			DChecknode node= checknodeDao.selectByPrimaryKey(cid);
@@ -54,6 +56,7 @@ public class D10005Service extends D10005BaseModel implements ExecProcessFlow {
 			node.setPname(pname);
 			node.setChname(chname);
 			node.setChcode(chcode);
+			node.setPcode(pcode);
 			checknodeDao.updateByPrimaryKey(node);
 
 		}

+ 2 - 0
src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -232,6 +232,8 @@ public class TemplateGenerator {
 
         DChecknodeMapper checknodeMapper = UtilTools.getBean(DChecknodeMapper.class);
         List<DChecknode> monitors = checknodeMapper.selectAll();
+
+
         Collections.sort(monitors, (n1, n2) -> n1.getId().compareTo(n2.getId()));
         dataModel.put("monnum", monitors.size());
         //管道

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

@@ -1,5 +1,5 @@
 #monitor number:${monnum}
 <#list monitors as m>
-${m.chcode},${m.pname},${m.site}
+${m.chcode},${m.pcode},${m.site}
 </#list>
 #end