Merge branch 'task-del-home' into test

# Conflicts:
#	src/main/java/com/fdkankan/ucenter/httpClient/service/LaserService.java
#	src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java
#	src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

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

@@ -6,6 +6,7 @@ import com.alibaba.nacos.common.http.client.NacosAsyncRestTemplate;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
+import com.fdkankan.ucenter.common.CameraTypeEnum;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
 import com.fdkankan.ucenter.common.utils.ShellUtil;
@@ -105,7 +106,7 @@ public class LaserService {
             HashMap<Long, User> userMap = userService.getByIds(userIds);
             for (Long cameraId : detailMap.keySet()) {
                 CameraDetail cameraDetail = detailMap.get(cameraId);
-                if (cameraDetail.getType() == 10) {
+                if (cameraDetail.getType() == CameraTypeEnum.LASER_TURN.getType()) {
                     Camera cameraEntity = cameraMap.get(cameraId);
                     Map<String, String> param = new HashMap<>();
                     param.put("snCode", cameraEntity.getSnCode());
@@ -121,7 +122,7 @@ public class LaserService {
         List<Map<String, String>> laserParams = new ArrayList<>();
             for (Long cameraId : detailMap.keySet()) {
                 CameraDetail cameraDetail = detailMap.get(cameraId);
-                if (cameraDetail.getType() == 10 ) {
+                if (cameraDetail.getType() == CameraTypeEnum.LASER_TURN.getType()) {
                     Camera cameraEntity = cameraMap.get(cameraId);
                     Map<String, String> param = new HashMap<>();
                     param.put("snCode", cameraEntity.getSnCode());
@@ -178,7 +179,8 @@ public class LaserService {
 
 
     public void copy(String oldNum ,Long camaraId, String createTime, String newNum, Integer status,
-                     String  path, String sceneKey, String sceneName, Long userId,String version,Integer isObj,Integer sceneSource){
+                     String  path, String sceneKey, String sceneName, Long userId,String version,Integer isObj,
+                     Integer sceneSource,String algorithmTime){
         String phone = null;
         String snCode = null;
         if(userId != null){
@@ -207,6 +209,7 @@ public class LaserService {
         params.put("path",path);
         params.put("version",version);
         params.put("sceneSource",sceneSource);
+        params.put("algorithmTime",algorithmTime);
         if(isObj == 1){
             params.put("buildObjStatus",isObj);
 

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

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

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