Merge branch 'project-jmga-2.2.0-2.0.1' into project-jmga-dev

src/main/java/com/fdkankan/contro/service/IFdkkLaserService.java

@@ -25,7 +25,7 @@ public interface IFdkkLaserService {
 
     void pushBuildStatusToLaserSystem(String projectNum, String laserObjFilePath, Integer buildObjStatus);
 
-    void saveScene(ScenePlus scenePlus, JSONObject jsonObject, Camera cameraEntity, String userName, boolean b, Integer payStatus);
+    void saveScene(ScenePlus scenePlus, JSONObject jsonObject, Camera cameraEntity, String userName, boolean b, Integer payStatus, Integer status);
 
     void saveScene(ScenePro scenePro, String scenePassword, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus);
 

src/main/java/com/fdkankan/contro/service/impl/IFdkkLaserServiceImpl.java

@@ -136,20 +136,23 @@ public class IFdkkLaserServiceImpl implements IFdkkLaserService {
     }
 
 
-    public void saveScene(ScenePlus scenePlus, JSONObject fdageJson, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus) {
+    public void saveScene(ScenePlus scenePlus, JSONObject fdageJson, Camera cameraEntity, String phone, boolean rebuild, Integer payStatus, Integer status) {
         Map<String, Object> params = new HashMap<>();
         params.put("childName", cameraEntity.getChildName());
         params.put("createTime", scenePlus.getCreateTime());
         params.put("phone", phone);
         params.put("sceneCode", scenePlus.getNum());
         params.put("snCode", cameraEntity.getSnCode());
-        params.put("status", scenePlus.getSceneStatus());
-        if (!rebuild) {
-            if(Objects.nonNull(fdageJson)){
-                params.put("password", fdageJson.getString("pwd"));
+        if(status == null){
+            if(rebuild){
+                status = 4;
+            }else{
+                status = scenePlus.getSceneStatus();
             }
-        } else {
-            params.put("status", 4);
+        }
+        params.put("status", status);
+        if (!rebuild && Objects.nonNull(fdageJson)) {//场景重算，不需要重置为app设置的密码
+            params.put("password", fdageJson.getString("pwd"));
         }
         params.put("version",getSceneVersion(scenePlus.getNum()));
         params.put("title", scenePlus.getTitle());

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -966,7 +966,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             //判断 是否为激光相机
             Camera camera = cameraService.getByChildName(mac);
             if(Objects.nonNull(scenePlus)){
-                fdkkLaserService.saveScene(scenePlus,fdageJson,camera,userName,false, scenePlus.getPayStatus());
+                fdkkLaserService.saveScene(scenePlus,fdageJson,camera,userName,false, scenePlus.getPayStatus(), null);
             }else{
                 fdkkLaserService.saveScene(scenePro,fdageJson.getString("pwd"),camera,userName,false, scenePro.getPayStatus());
             }
@@ -1436,7 +1436,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             }
             Camera cameraEntity = cameraService.getById(scenePlus.getCameraId());
             if(Objects.isNull(scenePlusExt.getLocation()) || scenePlusExt.getLocation() != 7){
-                fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true, scenePlus.getPayStatus());
+                fdkkLaserService.saveScene(scenePlus,null,cameraEntity,userName,true, scenePlus.getPayStatus(), null);
             }
             message = this.getBuildSceneMqMessage(
                     num, cameraType, fdageData.getString("location") != null && "1".equals(fdageData.getString("location")) ? "sfm" : "slam",
@@ -1685,7 +1685,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 buildScenePost(dataSource, fdageData, "V3", cameraType, sceneNum, cameraEntity, detailEntity, rebuild, icon, user, customUserId, "zip");
 
                 scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
-                fdkkLaserService.saveScene(scenePlus,fdageData,cameraEntity,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus());
+                fdkkLaserService.saveScene(scenePlus,fdageData,cameraEntity,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus(), null);
 
                 break;
         }
@@ -2605,7 +2605,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
             scenePlus = scenePlusService.getScenePlusByNum(sceneNum);
 
             if(cameraType == 14){
-                fdkkLaserService.saveScene(scenePlus,fdageData,camera,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus());
+                fdkkLaserService.saveScene(scenePlus,fdageData,camera,user.getUserName(),rebuild == 1 ? true : false, scenePlus.getPayStatus(), null);
             }
         }catch (Exception e){
             log.error("通知计算报错,uuid:{}", uuid, e);

src/main/java/com/fdkankan/contro/service/impl/UploadShootingServiceImpl.java

@@ -8,6 +8,7 @@ import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.constant.PayStatus;
 import com.fdkankan.common.constant.SceneSource;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.AesUtil;
@@ -82,6 +83,10 @@ public class UploadShootingServiceImpl implements UploadShootingService {
     private ISceneEditControlsService sceneEditControlsService;
     @Autowired
     private RabbitMqProducer mqProducer;
+    @Autowired
+    private IFdkkLaserService fdkkLaserService;
+    @Autowired
+    private ICameraService cameraService;
 
     @Override
     public void uploadFile(SendCallAlgorithmParam param) throws InterruptedException {
@@ -162,6 +167,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
         String title = dataFdage.getString("name");
 
         OrigFileUploadBatch origFileUploadBatch = batches.get(0);
+        Camera camera = null;
         if(detail.getIndex() == null || detail.getIndex() != -1){
             OrigFileUpload origFileUpload = origFileUploadService.getByBatchIdAndFileName(origFileUploadBatch.getBatchId(), "config.json");
             String localPath = ConstantFilePath.BUILD_MODEL_PATH + "upload_while_shooting/" + detail.getUuid() + "/" + origFileUploadBatch.getPtIndex() + "/" + detail.getFileName();
@@ -175,6 +181,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
             cameraInStoreParams.put("cameraType", camType);
             cameraInStoreParams.put("snCode", snCode);
             ResultData post = myClient.post(cameraInStoreUrl, cameraInStoreParams);
+            camera = cameraService.getBySnCode(snCode);
             log.info("---------cameraInStore result:{}-----------", post);
 
             //注册用户
@@ -223,6 +230,7 @@ public class UploadShootingServiceImpl implements UploadShootingService {
             scenePlusExt.setDataSource(dataSource);
             scenePlus.setNum(sceneNum);
             scenePlus.setSceneSource(SceneSource.BM.code());
+            scenePlus.setCameraId(camera.getId());
             scenePlus.setPreview(CommonStatus.YES.code());
             if (camType == CameraTypeEnum.DOUBLE_EYE_TURN.getType()) {
                 scenePlus.setSceneSource(SceneSource.ZT.code());
@@ -264,6 +272,8 @@ public class UploadShootingServiceImpl implements UploadShootingService {
         sceneEditControls.setEditInfoId(sceneEditInfo.getId());
         sceneEditControlsService.saveOrUpdate(sceneEditControls);
 
+        fdkkLaserService.saveScene(scenePlus, dataFdage, camera, user.getUserName(), false, PayStatus.NOT_PAY.code(), 5);
+
         JSONObject preParams = new JSONObject();
         preParams.put("sceneCode", sceneNum);
         preParams.put("index", detail.getIndex());