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

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

@@ -12,10 +12,7 @@ import freemarker.template.TemplateException;
 import java.io.FileWriter;
 import java.io.IOException;
 import java.io.StringWriter;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 public class TemplateGenerator {
     public static final String BPATH="/cephfs/disaster";
@@ -171,7 +168,7 @@ public class TemplateGenerator {
 
         DNodeMapper nodeMapper =UtilTools.getBean(DNodeMapper.class);
         List<DNode> nodes = nodeMapper.selectAll();
-
+        Collections.sort(nodes, (n1, n2) -> n1.getId().compareTo(n2.getId()));
         //节点数量
         dataModel.put("nodenum", nodes.size());
         //节点
@@ -179,6 +176,7 @@ public class TemplateGenerator {
 
         DPipeMapper pipeMapper =UtilTools.getBean(DPipeMapper.class);
         List<DPipe> pipes =pipeMapper.selectAll();
+        Collections.sort(pipes, (n1, n2) -> n1.getId().compareTo(n2.getId()));
         //管道数量
         dataModel.put("pipenum", pipes.size());
         //管道
@@ -216,7 +214,7 @@ 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());
         //管道
         dataModel.put("monitors", monitors);