|
|
@ -115,6 +115,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { |
|
|
|
} |
|
|
|
}); |
|
|
|
} |
|
|
|
// 网格名赋值
|
|
|
|
finalGrids.forEach(g -> { |
|
|
|
if (r.getGridId().equals(g.getGridId())){ |
|
|
|
r.setGridName(g.getGridName()); |
|
|
@ -124,6 +125,7 @@ public class StaffPatrolDetailServiceImpl implements StaffPatrolDetailService { |
|
|
|
result.forEach(r -> { |
|
|
|
if (!r.getLlStatus()){ |
|
|
|
finalGrids.forEach(g -> { |
|
|
|
// 网格相同,并且中心点位不为空,并且中心点位不等于 '[]'
|
|
|
|
if (r.getGridId().equals(g.getGridId()) && (StringUtils.isNotBlank(g.getCenterMark())&& !"[]".equals(g.getCenterMark()))){ |
|
|
|
r.setLongitude(getLL(g.getCenterMark(),PatrolConstant.LONGITUDE)); |
|
|
|
r.setLatitude(getLL(g.getCenterMark(),PatrolConstant.LATITUDE)); |
|
|
|