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

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

@@ -22,7 +22,7 @@ public class RailManagementDTO implements Serializable {
     private static final long serialVersionUID = 1L;
 
     @ApiModelProperty("钢轨编码")
-    private Integer railCode;
+    private String railCode;
 
     @ApiModelProperty("线路id")
     private String lightRailId;

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

@@ -20,5 +20,8 @@ public class SwitchManagementQueryDTO {
     @ApiModelProperty("线别id")
     private String lineAliasId;
 
+    @ApiModelProperty("车站id")
+    private String stationId;
+
 
 }

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

@@ -22,10 +22,13 @@
                 AND t1.switch_code like concat('%',#{dto.switchCode},'%')
             </if>
             <if test="dto.sectionId != null and dto.sectionId != ''">
-                AND t1.section_id = #{dto.sectionId}
+                AND t2.section_id = #{dto.sectionId}
+            </if>
+            <if test="dto.stationId != null and dto.stationId != ''">
+                AND t2.station_id = #{dto.stationId}
             </if>
             <if test="dto.lightRailId != null and dto.lightRailId != ''">
-                AND t3.light_rail_id = #{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}

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/entity/LightRail.java

@@ -57,4 +57,10 @@ public class LightRail implements Serializable {
     @ApiModelProperty(value = "状态")
     private Integer status;
 
+    @ApiModelProperty(value = "上行线路里程")
+    private BigDecimal upLineMileage;
+
+    @ApiModelProperty(value = "下线路里程")
+    private BigDecimal downLineMileage;
+
 }

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

@@ -12,10 +12,10 @@
             t1.status,
             t1.update_by,
             t1.update_time,
+            t1.up_line_mileage,
+            t1.down_line_mileage,
             (SELECT count(1) FROM t_sn_subway_section WHERE light_rail_id = t1.id  ) subwaySectionNum,
-            (SELECT count( DISTINCT station_name) FROM t_sn_train_station WHERE light_rail_id = t1.id  ) trainStationNum,
-            (SELECT max(end_mileage) FROM t_sn_train_station WHERE light_rail_id = t1.id AND line_alias_id = '1' ) upLineMileage,
-            (SELECT max(end_mileage) FROM t_sn_train_station WHERE light_rail_id = t1.id AND line_alias_id = '2' ) downLineMileage
+            (SELECT count( DISTINCT station_name) FROM t_sn_train_station WHERE light_rail_id = t1.id  ) trainStationNum
         FROM
             t_sn_light_rail t1
         <where>

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

@@ -82,7 +82,8 @@ public class DuplicateCheckController {
 		} else {
 			// 该值不可用
 			log.info("该值不可用，系统中已存在！");
-			return Result.error("该值不可用，系统中已存在！");
+//			return Result.error("该值不可用，系统中已存在！");
+			return Result.error("");
 		}
 	}