1

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

@@ -177,47 +177,21 @@ 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 algorithmTime){
-        String phone = null;
-        String snCode = null;
-        if(userId != null){
-            User user = userService.getById(userId);
-            phone = user == null ? null :user.getUserName();
-        }
-        if(camaraId != null){
-            Camera camera = cameraService.getById(camaraId);
-            snCode = camera == null ? null :camera.getSnCode();
-        }
-//        JSONObject sceneInfo = this.getSceneByNum(oldNum);
-//        if(sceneInfo != null){
-//            sceneName = sceneInfo.getString("title") +"(copy)";
-//        }
+    @Value("${queue.application.laser.copy-scene:laser-copy-scene}")
+    private String laserCopyScene;
+    @Value("${queue.application.laser.copy-scene:laser-copy-scene-init}")
+    private String laserInitCopyScene;
+    public void copy(String oldNum, String newNum, String path, Boolean flag) {
         Map<String,Object> params = new HashMap<>();
-        params.put("childName",snCode);
-        params.put("createTime", createTime);
-        params.put("phone", phone);
         params.put("sceneCode", newNum);
         params.put("oldSceneCode", oldNum);
-        params.put("snCode",snCode);
-        params.put("status", status);
-        params.put("password", sceneKey);
-        //params.put("title", sceneName);
-        params.put("userId", userId);
-        params.put("isCopy", true);
         params.put("path",path);
-        params.put("version",version);
-        params.put("sceneSource",sceneSource);
-        params.put("algorithmTime",algorithmTime);
-        if(isObj == 1){
-            params.put("buildObjStatus",isObj);
-
-        }
-        Result result = laserClient.saveOrEdit(newNum, params);
-        if( result.getCode() != HttpStatus.OK.value()){
-            log.error("激光场景状态同步失败!");
+        params.put("init",flag);
+        if(flag){
+            rabbitMqProducer.sendByWorkQueue(laserInitCopyScene,params);
+            return;
         }
+        rabbitMqProducer.sendByWorkQueue(laserCopyScene,params);
     }
 
     public List<SceneBySnCodeVo> getScenesBySnCode(String snCode, String token) {

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

@@ -14,7 +14,6 @@ import com.fdkankan.ucenter.vo.response.AppCameraSpace;
 import com.fdkankan.ucenter.vo.response.CameraAppVo;
 import com.fdkankan.ucenter.vo.response.GroupByCount;
 import org.apache.commons.lang3.StringUtils;
-import org.opencv.face.Face;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;

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

@@ -9,7 +9,6 @@ import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.common.util.NumberUtils;
 import com.fdkankan.common.util.SecurityUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.sms.SmsService;
 import com.fdkankan.ucenter.common.MailUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
@@ -194,7 +193,7 @@ public class LoginService {
         if(!file.exists()){
             fYunFileServiceInterface.downloadFile(QrCodeFilePath.LOGO_IMAGE_OSS,QrCodeFilePath.LOGO_IMAGE_LOCAL);
         }
-        MatrixToImageWriterUtil.createQRCode(NacosProperty.getMainUrl() + "app/index.html?m="+uuid, filePath,true,QrCodeFilePath.LOGO_IMAGE_LOCAL);
+        //MatrixToImageWriterUtil.createQRCode(NacosProperty.getMainUrl() + "app/index.html?m="+uuid, filePath,true,QrCodeFilePath.LOGO_IMAGE_LOCAL);
         JSONObject json = new JSONObject();
         json.put("url", filePath.replace(ConstantFilePath.BASE_PATH, ""));
         json.put("uuid", uuid);

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

@@ -15,8 +15,6 @@ import com.fdkankan.common.constant.SceneVersionType;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.image.MatrixToImageWriterUtil;
-import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.Result;
@@ -240,8 +238,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(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                laserService.copy(oldNum,newNum,newDataSource,true);
             }else {
                 laserService.cloudPointBuild(oldNum,newNum);
             }
@@ -261,9 +258,8 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 sceneCommonService.updateNasSceneJson(targetData,oldNum,newNum,scenePlus.getTitle(),"v4","scene.json");
 
                 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(),scenePlus.getTitle(),scenePlus.getUserId(),"V4",plusExt.getIsObj(),scenePlus.getSceneSource(),plusExt.getAlgorithmTime());
+                    //String laserPath = laserService.copyDataSource(oldDataSource,plusExt.getDataSource());
+                    laserService.copy(oldNum,newNum,newDataSource,false);
                 }
                 scenePlus.setSceneStatus(-2);
                 this.updateById(scenePlus);
@@ -362,7 +358,7 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
                 String visionModeldataOssPath = String.format(UploadFilePath.IMG_VIEW_PATH, num) + "vision.modeldata";
                 fYunFileServiceInterface.downloadFile(visionModeldataOssPath, visionModeldataPath);
                 String visionTxtLocalPath = ConstantFilePath.SCENE_V4_PATH + num + File.separator + "vision.txt";
-                CreateObjUtil.convertVisionmodeldataToTxt(visionModeldataPath, visionTxtLocalPath);
+                //CreateObjUtil.convertVisionmodeldataToTxt(visionModeldataPath, visionTxtLocalPath);
                 String roamingPoint = RoamingPointUtil.createRoamingPoint(num, visionTxtLocalPath);
                 if (StrUtil.isNotEmpty(roamingPoint)) {
                     fYunFileServiceInterface.uploadFile(roamingPoint.getBytes(StandardCharsets.UTF_8), roamingPointOssPath);

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

@@ -15,14 +15,12 @@ import com.fdkankan.common.constant.SceneKind;
 import com.fdkankan.common.constant.SceneVersionType;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.*;
-import com.fdkankan.model.constants.UploadFilePath;
 import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
 import com.fdkankan.rabbitmq.util.RabbitMqProducer;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
-import com.fdkankan.image.MatrixToImageWriterUtil;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.ucenter.common.constants.NacosProperty;
@@ -772,8 +770,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             sceneProEditService.save(oldEditScene);
 
             if(scenePro.getSceneSource() == 4 || scenePro.getSceneSource() == 5) {  //深时复制
-                laserService.copy(oldNum,scenePro.getCameraId(),scenePro.getCreateTime(),newNum,0,null,
-                        oldEditScene.getSceneKey(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                laserService.copy(oldNum,newNum,newDataSource,true);
+
             }
 
             try {
@@ -804,9 +802,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 this.copyOssAndNas(oldNum,scenePro.getNum(),sourceVoice,targetVoice);
 
                 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(),scenePro.getSceneName(),scenePro.getUserId(),"V3",scenePro.getIsObj(),scenePro.getSceneSource(),scenePro.getCreateTime());
+                    laserService.copy(oldNum,newNum,newDataSource,false);
                 }
                 scenePro.setStatus(-2);
                 this.updateById(scenePro);