Commit 4ffdf4a2 authored by wujipeng's avatar wujipeng
Browse files

管径优化

parent 96f70f44
......@@ -56,7 +56,7 @@ public class BasicEntity {
* 管径
*/
@TableField(value = "pipe_diameter")
private Double pipeDiameter;
private String pipeDiameter;
/**
* 管道类型
......
......@@ -73,7 +73,7 @@ public class RoadVO extends RoadEntity {
/**
* 管径
*/
private Double pipeDiameter;
private String pipeDiameter;
/**
......
......@@ -91,7 +91,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
//功能性缺陷
int functionalDefect = 0;
//管径
double pipeDiameter = 0;
Set<String> pipeDiameter = new HashSet<>();
//管道类型
Set<String> pipeType = new HashSet<>();
//文件名
......@@ -116,7 +116,8 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
length += basicEntity.getDetectionLength();
}
if (basicEntity.getPipeDiameter() != null) {
pipeDiameter += basicEntity.getPipeDiameter();
String[] split = basicEntity.getPipeDiameter().split("/Φ");
pipeDiameter.addAll(Arrays.asList(split));
}
if (basicEntity.getPipeType() != null) {
pipeType.add(basicEntity.getPipeType());
......@@ -164,7 +165,7 @@ public class RoadServiceImpl extends ServiceImpl<RoadMapper, RoadEntity> impleme
result.setLength(length);
result.setStructuralDefect(structuralDefect);
result.setFunctionalDefect(functionalDefect);
result.setPipeDiameter(pipeDiameter);
result.setPipeDiameter(pipeDiameter.toString());
result.setPipeType(pipeType);
result.setFileName(fileName);
result.setRegionName(regionName);
......
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