Merge remote-tracking branch 'origin/dev-hkl' into dev

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/CurveManagementDTO.java

@@ -23,4 +23,14 @@ public class CurveManagementDTO implements Serializable {
 
     @ApiModelProperty("曲线编号")
     private String curveCode;
+
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/FastenerManagementDTO.java

@@ -12,4 +12,14 @@ public class FastenerManagementDTO {
     @ApiModelProperty("扣件编号")
     private String fastenerCode;
 
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/RailManagementDTO.java

 package org.jeecg.modules.deviceAsset.dto;
 
+import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -23,8 +24,13 @@ public class RailManagementDTO implements Serializable {
     @ApiModelProperty("钢轨编码")
     private Integer railCode;
 
-    @ApiModelProperty("备注")
-    private String remark;
+    @ApiModelProperty("线路id")
+    private String lightRailId;
 
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/SignBoardManagementDTO.java

@@ -24,8 +24,16 @@ import java.util.Date;
 @ApiModel(value = "SignBoardManagementDTO对象", description = "资产管理-轨行区标识牌管理")
 public class SignBoardManagementDTO implements Serializable {
 
-    private static final long serialVersionUID = 1L;
-
     @ApiModelProperty("轨行区标识牌编号")
     private String signBoardCode;
+
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/SleeperManagementDTO.java

@@ -31,4 +31,14 @@ public class SleeperManagementDTO implements Serializable {
 
     @ApiModelProperty("道床id")
     private String trackBedId;
+
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/SwitchManagementQueryDTO.java

@@ -8,7 +8,17 @@ import lombok.Data;
 @ApiModel(value = "资产管理-道岔管理DTO")
 public class SwitchManagementQueryDTO {
 
-    @ApiModelProperty(value = "线路name")
-    private String railLineName;
+    @ApiModelProperty(value = "道岔编码")
+    private String switchCode;
+
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/TrackBedManagementDTO.java

@@ -31,5 +31,14 @@ public class TrackBedManagementDTO implements Serializable {
     @ApiModelProperty("道床编号")
     private String trackBedCode;
 
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
 
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/dto/VerticalCurveManagementDTO.java

@@ -31,4 +31,14 @@ public class VerticalCurveManagementDTO implements Serializable {
     @ApiModelProperty("竖曲线编号")
     private String verticalCurveCode;
 
+    @ApiModelProperty("线路id")
+    private String lightRailId;
+
+    @ApiModelProperty("区间id")
+    private String sectionId;
+
+    @ApiModelProperty("线别id")
+    private String lineAliasId;
+
+
 }

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/CurveManagementMapper.xml

@@ -17,6 +17,15 @@
             <if test="dto.curveCode != null and dto.curveCode != ''">
                 AND t1.curve_code like concat('%',#{dto.curveCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/FastenerManagementMapper.xml

@@ -21,6 +21,15 @@
             <if test="dto.fastenerCode != null and dto.fastenerCode != ''">
                 AND t1.fastener_code like concat('%',#{dto.fastenerCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/RailManagementMapper.xml

@@ -16,6 +16,15 @@
             <if test="dto.railCode != null and dto.railCode != ''">
                 AND t1.rail_code like concat('%',#{dto.railCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SignBoardManagementMapper.xml

@@ -16,6 +16,15 @@
             <if test="dto.signBoardCode != null and dto.signBoardCode != ''">
                 AND t1.sign_board_code like concat('%',#{dto.signBoardCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SleeperManagementMapper.xml

@@ -21,6 +21,15 @@
             <if test="dto.sleeperCode != null and dto.sleeperCode != ''">
                 AND t1.sleeper_code like concat('%',#{dto.sleeperCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/SwitchManagementMapper.xml

@@ -17,6 +17,19 @@
         FROM
             t_da_switch_management t1 LEFT JOIN t_sn_section_station_map t2 ON t1.section_station_map_id = t2.id
             LEFT JOIN t_sn_line_alias t3 ON t1.line_alias_id = t3.id
-
+        <where>
+            <if test="dto.switchCode != null and dto.switchCode != ''">
+                AND t1.switch_code like concat('%',#{dto.switchCode},'%')
+            </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t3.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
+        </where>
     </select>
 </mapper>
\ No newline at end of file

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/TrackBedManagementMapper.xml

@@ -16,6 +16,15 @@
             <if test="dto.trackBedCode != null and dto.trackBedCode != ''">
                 AND t1.track_bed_code like concat('%',#{dto.trackBedCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/deviceAsset/mapper/xml/VerticalCurveManagementMapper.xml

@@ -16,6 +16,15 @@
             <if test="dto.verticalCurveCode != null and dto.verticalCurveCode != ''">
                 AND t1.vertical_curve_code like concat('%',#{dto.verticalCurveCode},'%')
             </if>
+            <if test="dto.sectionId != null and dto.sectionId != ''">
+                AND t1.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.lightRailId != null and dto.lightRailId != ''">
+                AND t2.light_rail_id = #{dto.lightRailId}
+            </if>
+            <if test="dto.lineAliasId != null and dto.lineAliasId != ''">
+                AND t1.line_alias_id = #{dto.lineAliasId}
+            </if>
         </where>
     </select>
 </mapper>

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/controller/SubwaySectionController.java

@@ -91,6 +91,7 @@ public class SubwaySectionController extends JeecgController<SubwaySection, ISub
             map.put("label", subwaySection.getSectionName());
             map.put("value", subwaySection.getId());
             map.put("parentId", subwaySection.getLightRailId());
+            map.put("lineAliasId",subwaySection.getLineAliasId());
             list.add(map);
         }
         return Result.OK(list);

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

@@ -32,12 +32,15 @@
             id,
             light_rail_id,
             light_rail_name,
-            section_name ,
-            section_id ,
+            section_name,
+            section_id,
             station_id,
-            station_name
+            station_name,
+            station_line_alias_id line_alias_id,
+            ( SELECT line_alias_name FROM t_sn_line_alias WHERE id = station_line_alias_id LIMIT 1 ) line_alias_name
         FROM
             t_sn_section_station_map
+
     </select>
 
 </mapper>
\ No newline at end of file

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

@@ -26,4 +26,10 @@ public class SectionStationMapVO {
 
     @ApiModelProperty(value = "车站名称")
     private String stationName;
+
+    @ApiModelProperty(value = "线别id")
+    private String lineAliasId;
+
+    @ApiModelProperty(value = "线别名称")
+    private String lineAliasName;
 }