Commit fd079ce9 authored by wujipeng's avatar wujipeng
Browse files

增加区域名

parent 594a2397
...@@ -86,4 +86,9 @@ public class RoadVO extends RoadEntity { ...@@ -86,4 +86,9 @@ public class RoadVO extends RoadEntity {
*/ */
private String fileName; private String fileName;
/**
* 区域名
*/
private String regionName;
} }
\ No newline at end of file
...@@ -96,12 +96,15 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -96,12 +96,15 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
Set<String> pipeType = new HashSet<>(); Set<String> pipeType = new HashSet<>();
//文件名 //文件名
String fileName = ""; String fileName = "";
//区域名
String regionName = "";
//列表 //列表
List<RoadVO> data = new ArrayList<>(); List<RoadVO> data = new ArrayList<>();
//获取relId //获取relId
List<BasicEntity> list = basicService.list(new LambdaQueryWrapper<BasicEntity>().eq(BasicEntity::getRoadName, roadDTO.getRoadName())); List<BasicEntity> list = basicService.list(new LambdaQueryWrapper<BasicEntity>().eq(BasicEntity::getRoadName, roadDTO.getRoadName()));
if(!list.isEmpty()){ if(!list.isEmpty()){
fileName = list.get(0).getReportName(); fileName = list.get(0).getReportName();
regionName = list.get(0).getRegion();
} }
List<String> relIds = new ArrayList<>(); List<String> relIds = new ArrayList<>();
for (BasicEntity basicEntity : list) { for (BasicEntity basicEntity : list) {
...@@ -164,6 +167,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme ...@@ -164,6 +167,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
result.setPipeDiameter(pipeDiameter); result.setPipeDiameter(pipeDiameter);
result.setPipeType(pipeType); result.setPipeType(pipeType);
result.setFileName(fileName); result.setFileName(fileName);
result.setRegionName(regionName);
result.setData(data); result.setData(data);
return Result.success(result); return Result.success(result);
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment