dengsixing před 4 měsíci
rodič
revize
700913f888

+ 2 - 0
src/main/java/com/fdkankan/scene/service/ISceneMarkShapeService.java

@@ -29,4 +29,6 @@ public interface ISceneMarkShapeService extends IService<SceneMarkShape> {
     void editTrainStatus(SceneMarkShapeParamVO param);
 
     List<SceneMarkShape> findByNumAndType(String num,Integer type);
+
+    List<SceneMarkShape> findByNum(String num);
 }

+ 7 - 0
src/main/java/com/fdkankan/scene/service/impl/SceneMarkShapeServiceImpl.java

@@ -185,4 +185,11 @@ public class SceneMarkShapeServiceImpl extends ServiceImpl<MarkShapeMapper, Scen
         wrapper.eq(SceneMarkShape::getType,type);
         return list(wrapper);
     }
+
+    @Override
+    public List<SceneMarkShape> findByNum(String num) {
+        LambdaQueryWrapper<SceneMarkShape> wrapper = Wrappers.lambdaQuery();
+        wrapper.eq(SceneMarkShape::getNum,num);
+        return list(wrapper);
+    }
 }

+ 1 - 1
src/main/java/com/fdkankan/scene/service/impl/VisionServiceImpl.java

@@ -71,7 +71,7 @@ public class VisionServiceImpl implements IVisionService {
         }
         if (CollUtil.isNotEmpty(geoPoints) && geoPoints.size() >= 2) {
             Map<String, GeoPoint> res = new HashMap<>();
-            List<GeoPoint> statusFourPoints  = geoPoints.stream().filter(item -> item.getStatusIndicator() == 4).collect(Collectors.toList());
+            List<GeoPoint> statusFourPoints  = geoPoints.stream().filter(item -> item.getStatusIndicator() == 4 || item.getStatusIndicator() == 100 || item.getStatusIndicator() == 104).collect(Collectors.toList());
             if (statusFourPoints.size() >= 2) {
                 CoordinateUtil.divide(0, statusFourPoints.size() - 1, statusFourPoints.toArray(new GeoPoint[0]), res);
             }else {