生成几何文件、监测点文件

modelsrc/com/miniframe/model/system/DNode.java

@@ -11,11 +11,11 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
 
     private String name;
 
-    private Float x;
+    private String x;
 
-    private Float y;
+    private String y;
 
-    private Float z;
+    private String z;
 
     @Column(name = "n_desc")
     private String nDesc;
@@ -58,43 +58,43 @@ public class DNode extends MiniserviceBaseModel implements Serializable {
     /**
      * @return x
      */
-    public Float getX() {
+    public String getX() {
         return x;
     }
 
     /**
      * @param x
      */
-    public void setX(Float x) {
-        this.x = x;
+    public void setX(String x) {
+        this.x = x == null ? null : x.trim();
     }
 
     /**
      * @return y
      */
-    public Float getY() {
+    public String getY() {
         return y;
     }
 
     /**
      * @param y
      */
-    public void setY(Float y) {
-        this.y = y;
+    public void setY(String y) {
+        this.y = y == null ? null : y.trim();
     }
 
     /**
      * @return z
      */
-    public Float getZ() {
+    public String getZ() {
         return z;
     }
 
     /**
      * @param z
      */
-    public void setZ(Float z) {
-        this.z = z;
+    public void setZ(String z) {
+        this.z = z == null ? null : z.trim();
     }
 
     /**

modelsrc/com/miniframe/model/system/DNodeSQLBuilder.java

@@ -244,52 +244,62 @@ public class DNodeSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andXEqualTo(Float value) {
+        public Criteria andXEqualTo(String value) {
             addCriterion("x =", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXNotEqualTo(Float value) {
+        public Criteria andXNotEqualTo(String value) {
             addCriterion("x <>", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXGreaterThan(Float value) {
+        public Criteria andXGreaterThan(String value) {
             addCriterion("x >", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXGreaterThanOrEqualTo(Float value) {
+        public Criteria andXGreaterThanOrEqualTo(String value) {
             addCriterion("x >=", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXLessThan(Float value) {
+        public Criteria andXLessThan(String value) {
             addCriterion("x <", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXLessThanOrEqualTo(Float value) {
+        public Criteria andXLessThanOrEqualTo(String value) {
             addCriterion("x <=", value, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXIn(List<Float> values) {
+        public Criteria andXLike(String value) {
+            addCriterion("x like", value, "x");
+            return (Criteria) this;
+        }
+
+        public Criteria andXNotLike(String value) {
+            addCriterion("x not like", value, "x");
+            return (Criteria) this;
+        }
+
+        public Criteria andXIn(List<String> values) {
             addCriterion("x in", values, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXNotIn(List<Float> values) {
+        public Criteria andXNotIn(List<String> values) {
             addCriterion("x not in", values, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXBetween(Float value1, Float value2) {
+        public Criteria andXBetween(String value1, String value2) {
             addCriterion("x between", value1, value2, "x");
             return (Criteria) this;
         }
 
-        public Criteria andXNotBetween(Float value1, Float value2) {
+        public Criteria andXNotBetween(String value1, String value2) {
             addCriterion("x not between", value1, value2, "x");
             return (Criteria) this;
         }
@@ -304,52 +314,62 @@ public class DNodeSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andYEqualTo(Float value) {
+        public Criteria andYEqualTo(String value) {
             addCriterion("y =", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYNotEqualTo(Float value) {
+        public Criteria andYNotEqualTo(String value) {
             addCriterion("y <>", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYGreaterThan(Float value) {
+        public Criteria andYGreaterThan(String value) {
             addCriterion("y >", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYGreaterThanOrEqualTo(Float value) {
+        public Criteria andYGreaterThanOrEqualTo(String value) {
             addCriterion("y >=", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYLessThan(Float value) {
+        public Criteria andYLessThan(String value) {
             addCriterion("y <", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYLessThanOrEqualTo(Float value) {
+        public Criteria andYLessThanOrEqualTo(String value) {
             addCriterion("y <=", value, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYIn(List<Float> values) {
+        public Criteria andYLike(String value) {
+            addCriterion("y like", value, "y");
+            return (Criteria) this;
+        }
+
+        public Criteria andYNotLike(String value) {
+            addCriterion("y not like", value, "y");
+            return (Criteria) this;
+        }
+
+        public Criteria andYIn(List<String> values) {
             addCriterion("y in", values, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYNotIn(List<Float> values) {
+        public Criteria andYNotIn(List<String> values) {
             addCriterion("y not in", values, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYBetween(Float value1, Float value2) {
+        public Criteria andYBetween(String value1, String value2) {
             addCriterion("y between", value1, value2, "y");
             return (Criteria) this;
         }
 
-        public Criteria andYNotBetween(Float value1, Float value2) {
+        public Criteria andYNotBetween(String value1, String value2) {
             addCriterion("y not between", value1, value2, "y");
             return (Criteria) this;
         }
@@ -364,52 +384,62 @@ public class DNodeSQLBuilder {
             return (Criteria) this;
         }
 
-        public Criteria andZEqualTo(Float value) {
+        public Criteria andZEqualTo(String value) {
             addCriterion("z =", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZNotEqualTo(Float value) {
+        public Criteria andZNotEqualTo(String value) {
             addCriterion("z <>", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZGreaterThan(Float value) {
+        public Criteria andZGreaterThan(String value) {
             addCriterion("z >", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZGreaterThanOrEqualTo(Float value) {
+        public Criteria andZGreaterThanOrEqualTo(String value) {
             addCriterion("z >=", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZLessThan(Float value) {
+        public Criteria andZLessThan(String value) {
             addCriterion("z <", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZLessThanOrEqualTo(Float value) {
+        public Criteria andZLessThanOrEqualTo(String value) {
             addCriterion("z <=", value, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZIn(List<Float> values) {
+        public Criteria andZLike(String value) {
+            addCriterion("z like", value, "z");
+            return (Criteria) this;
+        }
+
+        public Criteria andZNotLike(String value) {
+            addCriterion("z not like", value, "z");
+            return (Criteria) this;
+        }
+
+        public Criteria andZIn(List<String> values) {
             addCriterion("z in", values, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZNotIn(List<Float> values) {
+        public Criteria andZNotIn(List<String> values) {
             addCriterion("z not in", values, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZBetween(Float value1, Float value2) {
+        public Criteria andZBetween(String value1, String value2) {
             addCriterion("z between", value1, value2, "z");
             return (Criteria) this;
         }
 
-        public Criteria andZNotBetween(Float value1, Float value2) {
+        public Criteria andZNotBetween(String value1, String value2) {
             addCriterion("z not between", value1, value2, "z");
             return (Criteria) this;
         }

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 Mar 11 11:57:17 CST 2024.
+    This file was generated on Wed Mar 13 11:14:28 CST 2024.
   -->
   <mappers>
     <mapper resource="com/miniframe/model/system/xml/SysAppcodeMapper.xml" />

src/main/java/com/miniframe/bisiness/system/D10000Service.java

@@ -44,9 +44,9 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 		node.setName(name);
 		node.setnDesc(desc);
 		node.setNtype(ntype);
-		node.setX(Float.valueOf(x));
-		node.setY(Float.valueOf(y));
-		node.setZ(Float.valueOf(z));
+		node.setX(x);
+		node.setY(y);
+		node.setZ(z);
 		dNodeDao.updateByPrimaryKey(node);
 	}
 
@@ -55,18 +55,18 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 		node.setName(name);
 		node.setnDesc(desc);
 		node.setNtype(ntype);
-		node.setX(Float.valueOf(x));
-		node.setY(Float.valueOf(y));
-		node.setZ(Float.valueOf(z));
+		node.setX(x);
+		node.setY(y);
+		node.setZ(z);
 		dNodeDao.insertSelective(node);
 	}
 
 	private void pdXYZExId(DNodeMapper dNodeDao, String x, String y, String z,Integer nid) throws BusinessException {
 		DNodeSQLBuilder sb =new DNodeSQLBuilder();
 		DNodeSQLBuilder.Criteria sc =sb.createCriteria();
-		sc.andXEqualTo(Float.valueOf(x));
-		sc.andYEqualTo(Float.valueOf(y));
-		sc.andZEqualTo(Float.valueOf(z));
+		sc.andXEqualTo(x);
+		sc.andYEqualTo(y);
+		sc.andZEqualTo(z);
 		sc.andIdNotEqualTo(nid);
 		int conut = dNodeDao.selectCountByExample(sb);
 		if(conut>0){//已存在不能添加
@@ -85,9 +85,9 @@ public class D10000Service extends D10000BaseModel implements ExecProcessFlow {
 	private void pdXYZ(DNodeMapper dNodeDao, String x, String y, String z) throws BusinessException {
 		DNodeSQLBuilder sb =new DNodeSQLBuilder();
 		DNodeSQLBuilder.Criteria sc =sb.createCriteria();
-		sc.andXEqualTo(Float.valueOf(x));
-		sc.andYEqualTo(Float.valueOf(y));
-		sc.andZEqualTo(Float.valueOf(z));
+		sc.andXEqualTo(x);
+		sc.andYEqualTo(y);
+		sc.andZEqualTo(z);
 		int conut = dNodeDao.selectCountByExample(sb);
 		if(conut>0){//已存在不能添加
 			throw new BusinessException("EB3100000");

src/main/java/com/miniframe/template/NodeVo.java

@@ -1,40 +0,0 @@
-package com.miniframe.template;
-
-public class NodeVo {
-    private  String name ;
-    private String x;
-    private String y;
-    private String z;
-
-    public String getName() {
-        return name;
-    }
-
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public String getX() {
-        return x;
-    }
-
-    public void setX(String x) {
-        this.x = x;
-    }
-
-    public String getY() {
-        return y;
-    }
-
-    public void setY(String y) {
-        this.y = y;
-    }
-
-    public String getZ() {
-        return z;
-    }
-
-    public void setZ(String z) {
-        this.z = z;
-    }
-}

src/main/java/com/miniframe/template/TemplateGenerator.java

@@ -167,18 +167,9 @@ public class TemplateGenerator {
         Map<String, Object> dataModel = new HashMap<>();
 
         DNodeMapper nodeMapper =UtilTools.getBean(DNodeMapper.class);
-        List<DNode> dnodes = nodeMapper.selectAll();
-        Collections.sort(dnodes, (n1, n2) -> n1.getId().compareTo(n2.getId()));
-
-        List<NodeVo> nodes =new ArrayList<>();
-        for (DNode n:dnodes) {
-            NodeVo nvo =new NodeVo();
-            nvo.setName(n.getName());
-            nvo.setX(String.valueOf(n.getX()));
-            nvo.setY(String.valueOf(n.getY()));
-            nvo.setZ(String.valueOf(n.getZ()));
-            nodes.add(nvo);
-        }
+        List<DNode> nodes = nodeMapper.selectAll();
+        Collections.sort(nodes, (n1, n2) -> n1.getId().compareTo(n2.getId()));
+
 
         //节点数量
         dataModel.put("nodenum", nodes.size());