深光，添加shootCount参数

src/main/java/com/fdkankan/ucenter/controller/api/LaserController.java

@@ -5,6 +5,7 @@ import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.ucenter.common.BaseController;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.ScenePlus;
+import com.fdkankan.ucenter.entity.ScenePlusExt;
 import com.fdkankan.ucenter.entity.ScenePro;
 import com.fdkankan.ucenter.entity.User;
 import com.fdkankan.ucenter.service.*;
@@ -33,6 +34,8 @@ public class LaserController extends BaseController {
     @Autowired
     IScenePlusService scenePlusService;
     @Autowired
+    IScenePlusExtService scenePlusExtService;
+    @Autowired
     ICameraService cameraService;
     @Autowired
     IUserService userService;
@@ -97,11 +100,16 @@ public class LaserController extends BaseController {
         if(sceneProEntity!= null){
             vo.setNum(sceneProEntity.getNum());
             userId = sceneProEntity.getUserId();
+            vo.setShootCount(sceneProEntity.getShootCount());
         }
         ScenePlus scenePlus = scenePlusService.getByNum(num);
         if(scenePlus != null){
             vo.setNum(scenePlus.getNum());
             userId = scenePlus.getUserId();
+            ScenePlusExt byPlusId = scenePlusExtService.getByPlusId(scenePlus.getId());
+            if(byPlusId !=null){
+                vo.setShootCount(byPlusId.getShootCount());
+            }
         }
         if(userId != null){
             User user = userService.getById(userId);

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

@@ -179,7 +179,7 @@ public class LaserService {
 
     public void copy(String oldNum ,Long camaraId, String createTime, String newNum, Integer status,
                      String  path, String sceneKey, Integer location, Long userId,String version,Integer isObj,
-                     Integer sceneSource,String algorithmTime){
+                     Integer sceneSource,String algorithmTime,Integer shootCount){
         String phone = null;
         String snCode = null;
         if(userId != null){
@@ -210,6 +210,7 @@ public class LaserService {
         params.put("version",version);
         params.put("sceneSource",sceneSource);
         params.put("algorithmTime",algorithmTime);
+        params.put("shootCount",shootCount);
         if(location != null){
             params.put("location",location);
         }

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -241,7 +241,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
 
             if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                 laserService.copy(oldNum,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,0,null,
-                        sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                        sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime(),plusExt.getShootCount());
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
             }
@@ -263,7 +263,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 if(scenePlus.getSceneSource() == 4 || scenePlus.getSceneSource() == 5){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
                     laserService.copy(oldNum,scenePlus.getCameraId(),scenePlus.getCreateTime(),newNum,2,laserPath,
-                            sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                            sceneEditInfo.getScenePassword(),plusExt.getLocation(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime(),plusExt.getShootCount());
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -769,7 +769,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
 
             if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) {  //深时复制
                 laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                        oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                        oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime(),scenePro.getShootCount());
             }
 
             try {
@@ -802,7 +802,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5){  //深时复制
                     String laserPath = laserService.copyDataSource(oldDataSource,scenePro.getDataSource());
                     laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,2,laserPath,
-                            oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                            oldEditScene.getSceneKey(),null,scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime(),scenePro.getShootCount());
                 }
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);

src/main/java/com/fdkankan/ucenter/vo/LaserSceneVo.java

@@ -8,4 +8,5 @@ public class LaserSceneVo {
     private String userPhone;
     private String num;
     private String snCode;
+    private Integer shootCount;
 }