深光salm模式点位

src/main/java/com/fdkankan/manage/httpClient/service/LaserService.java

@@ -109,7 +109,7 @@ public class LaserService {
                 this.getLaserSceneGps(vo);
                 vo.setAddressComponent(commonService.getAddressComponent(vo.getGps()));
 
-                if(vo.getLocation() != null && vo.getLocation().equals(6)){
+                if( vo.getMixture() == 0 && vo.getLocation() != null && vo.getLocation().equals(6)){
                     vo.setShootCount(0);
                 }
                 sceneVoList.add(vo);

src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -47,4 +47,6 @@ public class SceneVo {
     private Long cameraId;
 
     private Integer location;
+
+    private Integer mixture = 0; // 0否 1是
 }