|
|
@@ -525,17 +525,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
//写scene.json
|
|
|
commonService.writeSceneJson(sceneCode, videosJson,sceneEditInfo, sceneEditInfoExt, sceneEditControls, scenePlus,scenePlusExt,company);
|
|
|
|
|
|
- String qrLogo = !ObjectUtils.isEmpty(company) && !ObjectUtils.isEmpty(company.getQrLogo()) ? company.getQrLogo() : null;
|
|
|
-
|
|
|
- qrLogo = ObjectUtils.isEmpty(qrLogo) && !ObjectUtils.isEmpty(sceneEditInfoExt.getShareLogoImg()) ? fYunFileConfig.getHost().concat(sceneEditInfoExt.getShareLogoImg()) : null;
|
|
|
-
|
|
|
- createQrCode(sceneCode, scenePlusExt, qrLogo);
|
|
|
-
|
|
|
- //计算成功，通知APP
|
|
|
- Integer pushChannel = fdageData.getInteger("pushChannel");
|
|
|
- String pushToken = fdageData.getString("pushToken");
|
|
|
- this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePlus.getTitle(), scenePlusExt.getWebSite());
|
|
|
-
|
|
|
//删除计算目录
|
|
|
if(CollUtil.isEmpty(notDeleteNasNumList) || !notDeleteNasNumList.contains(sceneCode)){
|
|
|
CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/"));
|
|
|
@@ -558,18 +547,9 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
params.put("kNo",scenePlus.getKNo());
|
|
|
mqProducer.sendByWorkQueue("queue-aj-add-scene", params);
|
|
|
|
|
|
- //国际环境需要发邮件通知
|
|
|
- if("eur".equals(env)){
|
|
|
- commonService.sendEmail(sceneCode);
|
|
|
- }
|
|
|
-
|
|
|
//推送ai识别平面图mq
|
|
|
this.sendMqForAiPano(sceneCode);
|
|
|
|
|
|
-// redisUtil.set(String.format(RedisKey.SCENE_BUILD_FINISH_NUM, sceneCode), "1");
|
|
|
-
|
|
|
- status = true;
|
|
|
-
|
|
|
log.info("场景计算结果处理结束，场景码：{}", sceneCode);
|
|
|
|
|
|
if(sceneOrigBdId != null){
|
|
|
@@ -596,8 +576,6 @@ public class BuildSceneServiceImpl implements IBuildSceneService {
|
|
|
Map<String, Object> sceneStatusParam = new HashMap<>();
|
|
|
sceneStatusParam.put("num", sceneCode);
|
|
|
sceneStatusParam.put("status", message.getBuildSuccess() ? 1 : -1);
|
|
|
-// commonService.sendUpdateSceneStatusMqToQueues(sceneStatusParam);
|
|
|
-
|
|
|
if(StrUtil.isNotEmpty(batchIds)){
|
|
|
origFileUploadBatchService.update(new LambdaUpdateWrapper<OrigFileUploadBatch>().set(OrigFileUploadBatch::getStatus, 3).in(OrigFileUploadBatch::getBatchId, batchIds.split(",")));
|
|
|
}
|
dengsixing