feat:1.获取首页tree字段调整

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/LightRailMapper.xml

@@ -59,10 +59,7 @@
             true isLeaf
         FROM
             t_sn_light_rail
-        <where>
-            1=1
-            AND status = 1
-        </where>
+        WHERE status = 1
     <!-- UNION ALL
         SELECT
             concat(id,'-2') id,

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/SubwaySectionMapper.xml

@@ -36,19 +36,19 @@
     </select>
     <select id="getTreeSubwaySectionList" resultType="org.jeecg.modules.subwayNetwork.vo.SectionStationNode">
         SELECT t.id,
-               t.section_name                                                      label,
-               '2'                                                               level,
-               t.light_rail_id                                                     parent,
+               t.section_name                                                        label,
+               '2'                                                                   level,
+               t.light_rail_id                                                       parent,
                t.line_alias_id,
+               t3.line_alias_code,
                t.light_rail_id,
-               t.section_starting_mileage                                          startMileage,
+               t.section_starting_mileage                                            startMileage,
                TRUNCATE((t.section_end_mileage + t.section_starting_mileage) / 2, 3) centerMileage,
-               t.section_end_mileage                                               endMileage,
-               true                                                              isLeaf
-        FROM t_sn_subway_section t left join t_sn_light_rail t2 ON t.light_rail_id = t2.id
-        <where>
-            1=1
-            AND t2.status = 1
-        </where>
+               t.section_end_mileage                                                 endMileage,
+               true                                                                  isLeaf
+        FROM t_sn_subway_section t
+                 LEFT JOIN t_sn_light_rail t2 ON t.light_rail_id = t2.id
+                 LEFT JOIN t_sn_line_alias t3 ON t.line_alias_id = t3.id
+        WHERE t2.status = 1
     </select>
 </mapper>
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/mapper/xml/TrainStationMapper.xml

@@ -39,16 +39,15 @@
             '3'  level,
             t2.section_id parent,
             t1.line_alias_id,
+            t4.line_alias_code,
             t1.starting_mileage startMileage,
             t1.center_mileage centerMileage,
             t1.end_mileage endMileage,
             true isLeaf
-        FROM
-            t_sn_train_station t1 LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id
-            LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id
-        <where>
-            1=1
-            AND t3.status = 1
-        </where>
+        FROM t_sn_train_station t1
+        LEFT JOIN t_sn_section_station_map t2 ON t1.id = t2.station_id
+        LEFT JOIN t_sn_light_rail t3 on t1.light_rail_id = t3.id and t2.light_rail_id = t3.id
+        LEFT JOIN t_sn_line_alias t4 ON t1.line_alias_id = t4.id
+        WHERE t3.status = 1
     </select>
 </mapper>
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/vo/SectionStationNode.java

 package org.jeecg.modules.subwayNetwork.vo;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
-import com.fasterxml.jackson.annotation.JsonIgnore;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -28,6 +26,9 @@ public class SectionStationNode {
     @ApiModelProperty(value = "线别id")
     private String lineAliasId;
 
+    @ApiModelProperty(value = "线别code【冠号】")
+    private String lineAliasCode;
+
     @ApiModelProperty(value = "起始里程")
     private BigDecimal startMileage;