|
@@ -278,6 +278,22 @@ public class TemplateGenerator2 {
|
|
|
|
|
|
List<DPipeVo> vos =new ArrayList<>();
|
|
List<DPipeVo> vos =new ArrayList<>();
|
|
for (DPipe pipe:pipes) {
|
|
for (DPipe pipe:pipes) {
|
|
|
|
+ if(pipe.getSectionType().equals("HORZI_ELLIPSE")
|
|
|
|
+ || pipe.getSectionType().equals("VERT_ELLIPSE")
|
|
|
|
+ || pipe.getSectionType().equals("ARCH")
|
|
|
|
+ || pipe.getSectionType().equals("RECT_TRIANGULAR")
|
|
|
|
+ || pipe.getSectionType().equals("RECT_ROUND")
|
|
|
|
+ || pipe.getSectionType().equals("MODBASKETHANDLE")
|
|
|
|
+ || pipe.getSectionType().equals("EGG")
|
|
|
|
+ || pipe.getSectionType().equals("HORSESHOE")
|
|
|
|
+ || pipe.getSectionType().equals("GOTHIC")
|
|
|
|
+ || pipe.getSectionType().equals("CATENARY")
|
|
|
|
+ || pipe.getSectionType().equals("SEMIELLIPTICAL")
|
|
|
|
+ || pipe.getSectionType().equals("BASKETHANDLE")
|
|
|
|
+ || pipe.getSectionType().equals("SEMICIRCULAR")
|
|
|
|
+ ){//TODO 目前都按照方形处理
|
|
|
|
+ pipe.setSectionType("RECTANGLE");
|
|
|
|
+ }
|
|
DPipeVo vo = new DPipeVo();
|
|
DPipeVo vo = new DPipeVo();
|
|
vo.setdPipe(pipe);
|
|
vo.setdPipe(pipe);
|
|
vo.setEnName(getNnameById(pipe.getEnid()));
|
|
vo.setEnName(getNnameById(pipe.getEnid()));
|