feat:1.更新线路管理

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/dto/TrainStationEditDTO.java

@@ -22,8 +22,8 @@ public class TrainStationEditDTO {
     @ApiModelProperty(value = "车站编码")
     private String stationCode;
 
-    @ApiModelProperty(value = "线别Code")
-    private String lineAliasCode;
+    @ApiModelProperty(value = "线别id")
+    private String lineAliasId;
 
     @ApiModelProperty(value = "起始里程")
     private BigDecimal startingMileage;

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

@@ -16,6 +16,7 @@
             (SELECT line_alias_name FROM t_sn_line_alias WHERE id =	t1.line_alias_id  limit 1) line_alias_name,
             t1.section_starting_mileage,
             t1.section_end_mileage,
+            t1.section_starting_mileage-t1.section_end_mileage sectionMileage,
             t1.remark
         FROM
             t_sn_subway_section t1 LEFT JOIN t_sn_light_rail t2 ON t1.light_rail_id = t2.id

jeecg-module-system/src/main/java/org/jeecg/modules/subwayNetwork/service/impl/SubwaySectionServiceImpl.java

@@ -48,24 +48,31 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
 
     @Override
     public void edit(SubwaySectionEditDTO dto) {
+        // 1.查询[起,始]站信息
+        TrainStation startTrainStation = trainStationMapper.selectById(dto.getStartTrainStationId());
+        TrainStation endTrainStation = trainStationMapper.selectById(dto.getEndTrainStationId());
+
+
+        // 2.设置区间信息
         SubwaySection subwaySection = BeanUtil.copyProperties(dto, SubwaySection.class);
-        LightRail rail = lightRailMapper.selectById(dto.getLightRailId());
-        subwaySection.setLightRailName(rail.getRailLineName());
+        LightRail rail = lightRailMapper.selectById(dto.getLightRailId()); // 线路id
+        subwaySection.setLightRailName(rail.getRailLineName());// 线路昵称
+        subwaySection.setSectionStartingMileage(startTrainStation.getStartingMileage()); // 区间起始里程
+        subwaySection.setSectionEndMileage(endTrainStation.getEndMileage());// 区间结束里程
         if (ObjectUtil.isEmpty(dto.getId())) {
             this.save(subwaySection);
         } else {
             this.updateById(subwaySection);
         }
 
-        // 先删除
+
+        // 3.设置区间-车站关联信息
+        // 3.1 先删除关联信息
         LambdaQueryWrapper<SectionStationMap> ssmQueryWrapper = new LambdaQueryWrapper<>();
         ssmQueryWrapper.eq(SectionStationMap::getSectionId, subwaySection.getId());
         sectionStationMapMapper.delete(ssmQueryWrapper);
 
-
-        // 查询这个区间的车站
-        TrainStation startTrainStation = trainStationMapper.selectById(subwaySection.getStartTrainStationId());
-        TrainStation endTrainStation = trainStationMapper.selectById(subwaySection.getEndTrainStationId());
+        // 3.2 查询这个单行区间的车站
         QueryWrapper<TrainStation> tsQueryWrapper = new QueryWrapper<>();
         tsQueryWrapper.lambda().ge(TrainStation::getSeq, startTrainStation.getSeq())
                 .eq(TrainStation::getLineAliasId, dto.getLineAliasId())
@@ -74,8 +81,7 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
         List<TrainStation> trainStations = trainStationMapper.selectList(tsQueryWrapper);
         LightRail lightRail = lightRailMapper.selectById(subwaySection.getLightRailId());
 
-
-        // 后新增
+        // 3.3 保存关联关系
         for (TrainStation trainStation : trainStations) {
             SectionStationMap sectionStationMap = new SectionStationMap();
             sectionStationMap.setLightRailId(lightRail.getId());// 车站id
@@ -84,9 +90,12 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
             sectionStationMap.setSectionName(subwaySection.getSectionName()); // 区间名称
             sectionStationMap.setStationId(trainStation.getId()); // 车站id
             sectionStationMap.setStationName(trainStation.getStationName()); // 车站名称
+            sectionStationMap.setLightRailId(dto.getLightRailId());
+            sectionStationMap.setStationStartingMileage(trainStation.getStartingMileage());// 车站起始里程
+            sectionStationMap.setStationCenterMileage(trainStation.getCenterMileage());// 车站中心里程
+            sectionStationMap.setStationEndMileage(trainStation.getEndMileage());// 车站结束里程
             sectionStationMapMapper.insert(sectionStationMap);
         }
-
     }
 
     @Override
@@ -94,22 +103,7 @@ public class SubwaySectionServiceImpl extends ServiceImpl<SubwaySectionMapper, S
         // 分页查询
         IPage<SubwaySectionVO> page = new Page<>(dto.getPageNo(), dto.getPageSize());
         page = this.baseMapper.queryPageList(page, dto.getQuery());
-
-        for (SubwaySectionVO record : page.getRecords()) {
-            // 计算区间里程
-            TrainStation startTrainStation = trainStationMapper.selectById(record.getStartTrainStationId());
-            TrainStation endTrainStation = trainStationMapper.selectById(record.getEndTrainStationId());
-            BigDecimal sectionMileage = endTrainStation.getEndMileage().subtract(startTrainStation.getEndMileage());
-            record.setSectionMileage(sectionMileage);
-
-
-            // 车站数量
-            int trainStationNum = endTrainStation.getSeq() - startTrainStation.getSeq() + 1;
-            record.setTrainStationNum(trainStationNum);
-        }
-
         return page;
-
     }
 
     @Override