|
|
@@ -1,811 +0,0 @@
|
|
|
-package com.fdkankan.contro.mq.service.impl;
|
|
|
-
|
|
|
-import cn.hutool.core.bean.BeanUtil;
|
|
|
-import cn.hutool.core.collection.CollUtil;
|
|
|
-import cn.hutool.core.io.FileUtil;
|
|
|
-import cn.hutool.core.io.file.FileNameUtil;
|
|
|
-import cn.hutool.core.util.StrUtil;
|
|
|
-import cn.hutool.core.util.ZipUtil;
|
|
|
-import cn.hutool.extra.qrcode.QrCodeUtil;
|
|
|
-import cn.hutool.extra.qrcode.QrConfig;
|
|
|
-import cn.hutool.http.HttpUtil;
|
|
|
-import com.alibaba.fastjson.JSON;
|
|
|
-import com.alibaba.fastjson.JSONArray;
|
|
|
-import com.alibaba.fastjson.JSONObject;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
|
|
-import com.fdkankan.common.constant.*;
|
|
|
-import com.fdkankan.common.util.FileUtils;
|
|
|
-import com.fdkankan.contro.bean.SceneJsonBean;
|
|
|
-import com.fdkankan.contro.entity.*;
|
|
|
-import com.fdkankan.contro.mq.service.IBuildSceneService;
|
|
|
-import com.fdkankan.contro.service.*;
|
|
|
-import com.fdkankan.contro.vo.SceneEditControlsVO;
|
|
|
-import com.fdkankan.fyun.config.FYunFileConfig;
|
|
|
-import com.fdkankan.fyun.constant.FYunTypeEnum;
|
|
|
-import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
|
-import com.fdkankan.model.constants.ConstantFileName;
|
|
|
-import com.fdkankan.model.constants.ConstantFilePath;
|
|
|
-import com.fdkankan.model.constants.UploadFilePath;
|
|
|
-import com.fdkankan.model.enums.ModelTypeEnums;
|
|
|
-import com.fdkankan.model.utils.CreateHouseJsonUtil;
|
|
|
-import com.fdkankan.model.utils.CreateObjUtil;
|
|
|
-import com.fdkankan.push.config.PushMessageConfig;
|
|
|
-import com.fdkankan.push.utils.PushMsgUtil;
|
|
|
-import com.fdkankan.rabbitmq.bean.BuildSceneCallMessage;
|
|
|
-import com.fdkankan.rabbitmq.bean.BuildSceneResultMqMessage;
|
|
|
-import com.fdkankan.rabbitmq.util.RabbitMqProducer;
|
|
|
-import com.fdkankan.redis.constant.RedisKey;
|
|
|
-import com.fdkankan.redis.util.RedisUtil;
|
|
|
-import lombok.extern.slf4j.Slf4j;
|
|
|
-import org.apache.commons.lang3.ObjectUtils;
|
|
|
-import org.apache.commons.lang3.StringUtils;
|
|
|
-import org.springframework.beans.factory.annotation.Autowired;
|
|
|
-import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.stereotype.Service;
|
|
|
-
|
|
|
-import java.io.File;
|
|
|
-import java.io.IOException;
|
|
|
-import java.util.*;
|
|
|
-import java.util.Map.Entry;
|
|
|
-import java.util.stream.Collectors;
|
|
|
-
|
|
|
-
|
|
|
-/**
|
|
|
- * <p>
|
|
|
- * TODO
|
|
|
- * </p>
|
|
|
- *
|
|
|
- * @author dengsixing
|
|
|
- * @since 2022/4/20
|
|
|
- **/
|
|
|
-@Slf4j
|
|
|
-@Service
|
|
|
-public class BuildSceneByZipServiceImpl extends BuildSceneServiceImpl {
|
|
|
-
|
|
|
- @Value("${queue.modeling.modeling-call}")
|
|
|
- private String queueModelingCall;
|
|
|
-
|
|
|
- @Value("${queue.modeling.zip.modeling-post}")
|
|
|
- private String queueZipModelingPost;
|
|
|
-
|
|
|
- @Value("${model.type:#{null}}")
|
|
|
- private String modelType;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private RabbitMqProducer mqProducer;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private FYunFileServiceInterface fYunFileService;
|
|
|
- @Autowired
|
|
|
- private ICameraDetailService cameraDetailService;
|
|
|
- @Autowired
|
|
|
- private ISceneEditInfoService sceneEditInfoService;
|
|
|
- @Autowired
|
|
|
- private ISceneEditControlsService sceneEditControlsService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private FYunFileConfig fYunFileConfig;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private RedisUtil redisUtil;
|
|
|
- @Autowired
|
|
|
- private IScenePlusService scenePlusService;
|
|
|
- @Autowired
|
|
|
- private IScenePlusExtService scenePlusExtService;
|
|
|
- @Autowired
|
|
|
- private ISceneEditInfoExtService sceneEditInfoExtService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private IUserIncrementService userIncrementService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private IFdkkLaserService fdkkLaserService;
|
|
|
-
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private IBuildSceneDTService buildSceneDTService;
|
|
|
-
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private IIncrementTypeService incrementTypeService;
|
|
|
-
|
|
|
- @Autowired
|
|
|
- private ICompanyService companyService;
|
|
|
-
|
|
|
- @Override
|
|
|
- public void buildScenePre(BuildSceneCallMessage message) {
|
|
|
- boolean success = false;
|
|
|
- try {
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- //重新计算时需要删除文件夹，否知使用缓存
|
|
|
- if(new File(message.getPath() + File.separator + "results").exists()){
|
|
|
- FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
|
|
|
- }
|
|
|
- //根据相机类型，组装资源路径
|
|
|
- //下载资源到本地
|
|
|
- this.downLoadSource(message, message.getPath());
|
|
|
-
|
|
|
- if (!ObjectUtils.isEmpty(modelType)) {
|
|
|
- // 修改dataFdage文件
|
|
|
- JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
|
|
|
- fdageJson.put("modelType", modelType);
|
|
|
- FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
|
|
|
- }
|
|
|
- message.getBuildContext().put("cameraType",message.getCameraType());
|
|
|
- message.setResultReceiverMqName(queueZipModelingPost);
|
|
|
- mqProducer.sendByWorkQueue(queueModelingCall, message);
|
|
|
-
|
|
|
- success = true;
|
|
|
-
|
|
|
- log.info("场景计算资源准备结束，场景码：{}", message.getSceneNum());
|
|
|
-
|
|
|
- }catch (Exception e){
|
|
|
- log.error("场景计算前置处理出错", e);
|
|
|
- }finally {
|
|
|
- //如果前置处理失败，发送钉钉消息
|
|
|
- if(!success){
|
|
|
- buildSceneDTService.handBaseFail("场景计算资源准备异常！", message.getPath(), message.getSceneNum(), "计算控制服务器");
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- @Override
|
|
|
- public void downLoadSource(BuildSceneCallMessage buildSceneMqMessage,String path){
|
|
|
- String ossPath = ConstantFilePath.OSS_PREFIX
|
|
|
- + path.replace(ConstantFilePath.BUILD_MODEL_PATH, "")
|
|
|
- .replace(ConstantFilePath.BUILD_MODEL_LASER_PATH, "");
|
|
|
- if (!ossPath.endsWith("/")) {
|
|
|
- ossPath = ossPath.concat("/");
|
|
|
- }
|
|
|
- fYunFileService.downloadFileByCommand(path + File.separator + "capture", ossPath);
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- @Override
|
|
|
- public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
|
|
|
- String sceneCode = message.getBuildContext().get("sceneNum").toString();
|
|
|
- String path = message.getPath();
|
|
|
- try {
|
|
|
- // 上传计算日志
|
|
|
- //如果是重复计算，没有走到计算逻辑，不需要上传日志文件
|
|
|
- log.info("开始上传计算日志");
|
|
|
- String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, sceneCode);
|
|
|
- fYunFileService.uploadFile(path + File.separator + "console.log", buildLogPath + "console.log");
|
|
|
- log.info("计算日志上传完成");
|
|
|
-
|
|
|
- if (!message.getBuildSuccess()) {
|
|
|
- log.error("建模失败，修改状态为失败状态");
|
|
|
- scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>()
|
|
|
- .set(ScenePlus::getSceneStatus, SceneStatus.FAILD.code())
|
|
|
- .eq(ScenePlus::getNum, sceneCode));
|
|
|
-
|
|
|
- // 发送钉钉消息，计算失败
|
|
|
- buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
|
|
|
- return;
|
|
|
- }
|
|
|
- JSONObject fdageData = getFdageData(path + File.separator + "capture" +File.separator+"data.fdage");
|
|
|
-
|
|
|
- ScenePlus scenePlus = scenePlusService.getScenePlusByNum(sceneCode);
|
|
|
-
|
|
|
- Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
|
|
|
- Map<String, String> uploadFiles = getUploadFiles(scenePlus,path,cameraType,fdageData);
|
|
|
-
|
|
|
- //计算场景消耗磁盘空间
|
|
|
- long space = this.calUseSpace(uploadFiles);
|
|
|
-
|
|
|
-
|
|
|
- scenePlus.setPayStatus(PayStatus.PAY.code());
|
|
|
- //如果相机容量不足，需要把场景的paystatus改为容量不足状态
|
|
|
- if (cameraType != 14) {
|
|
|
- scenePlus.setPayStatus(this.getPayStatus(scenePlus.getCameraId(), space));
|
|
|
- }
|
|
|
- scenePlus.setUpdateTime(new Date());
|
|
|
- scenePlus.setSceneStatus(SceneStatus.NO_DISPLAY.code());
|
|
|
- scenePlusService.updateById(scenePlus);
|
|
|
-
|
|
|
-
|
|
|
- Integer videoVersion = fdageData.getInteger("videoVersion");
|
|
|
- //读取计算结果文件生成videosJson
|
|
|
- JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
|
|
|
-
|
|
|
- ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
- boolean isObj = fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1;
|
|
|
- //写入数据库
|
|
|
- this.updateDbPlus(scenePlus.getSceneSource(), space, videosJson.toJSONString(), message.getComputeTime(),isObj,scenePlusExt);
|
|
|
-
|
|
|
- Object[] editInfoArr = this.updateEditInfo(scenePlus);
|
|
|
- SceneEditInfo sceneEditInfo = (SceneEditInfo)editInfoArr[0];
|
|
|
- SceneEditInfoExt sceneEditInfoExt = (SceneEditInfoExt)editInfoArr[1];
|
|
|
- SceneEditControls sceneEditControls = (SceneEditControls)editInfoArr[2];
|
|
|
-
|
|
|
- //上传全景图俯视图
|
|
|
- this.uploadFloorCad(path, sceneCode, uploadFiles);
|
|
|
-
|
|
|
- //上传文件
|
|
|
- log.info("开始上传场景计算结果数据，num:{}", sceneCode);
|
|
|
- fYunFileService.uploadMulFiles(uploadFiles);
|
|
|
-
|
|
|
- Map<String,String> damFileHeaders = new HashMap<>();
|
|
|
- damFileHeaders.put("Content-Encoding","gzip");
|
|
|
-
|
|
|
- if (!fYunFileService.getFyunType().equals(FYunTypeEnum.LOCAL.code())) {
|
|
|
- // dam 文件设置请求头
|
|
|
- uploadFiles.entrySet().stream().filter(entry -> FileNameUtil.extName(entry.getKey()).equals("dam"))
|
|
|
- .filter(entry -> new File(entry.getKey()).exists())
|
|
|
- .forEach(entry -> {
|
|
|
- // gzip压缩
|
|
|
- FileUtil.writeBytes(ZipUtil.gzip(new File(entry.getKey())), entry.getKey() + ".gzip");
|
|
|
- // 重命名
|
|
|
- FileUtil.rename(new File(entry.getKey() + ".gzip"), entry.getKey(), true);
|
|
|
- fYunFileService.uploadFile(entry.getKey(), entry.getValue(), damFileHeaders);
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- //拷贝部分文件到编辑目录，用于用户编辑
|
|
|
- this.copyToEditDir(sceneCode);
|
|
|
-
|
|
|
- //生成houseTypejson并上传
|
|
|
- uploadFiles.entrySet().stream().filter(entry-> FileNameUtil.getName(entry.getKey()).equals("floorplan_cad.json"))
|
|
|
- .forEach(entry-> uploadHouseTypeJson(sceneCode,entry.getKey()));
|
|
|
-
|
|
|
- //写scene.json
|
|
|
-
|
|
|
-
|
|
|
- log.info("生成scene.json上传oss并设置缓存，num:{}", sceneCode);
|
|
|
- CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePlus.getCameraId());
|
|
|
- Company company = !ObjectUtils.isEmpty(cameraDetail.getCompanyId()) ? companyService.getById(cameraDetail.getCompanyId()) : null;
|
|
|
-
|
|
|
- if (cameraType == 14) {
|
|
|
- // 如果是激光场景，上传全景文件到V3路径,激光系统上线后，可不用上传
|
|
|
- String imagePath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneCode);
|
|
|
- String V3ImagePath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, sceneCode);
|
|
|
- uploadFiles.entrySet().stream().filter(entry -> entry.getValue().contains(imagePath)).forEach(entry -> {
|
|
|
- fYunFileService.uploadFile(entry.getKey(), entry.getValue().replace(imagePath, V3ImagePath));
|
|
|
- });
|
|
|
- //计算成功 激光转台相机 同步 请求
|
|
|
- fdkkLaserService.syncBuildResult(scenePlus.getNum(), scenePlusExt.getDataSource(),scenePlus.getCreateTime());
|
|
|
- sceneEditControlsService.update(new LambdaUpdateWrapper<SceneEditControls>().set(SceneEditControls::getShowMap,0)
|
|
|
- .eq(SceneEditControls::getEditInfoId,sceneEditInfo.getId()));
|
|
|
- sceneEditControls.setShowMap(0);
|
|
|
- }
|
|
|
-
|
|
|
- this.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());
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
|
|
|
-
|
|
|
- log.info("场景计算结果处理结束，场景码：{}", sceneCode);
|
|
|
-
|
|
|
- }catch (Exception e){
|
|
|
- e.printStackTrace();
|
|
|
- buildSceneDTService.handBaseFail("场景计算结果处理出错！", message.getPath(), sceneCode, "计算控制服务器");
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private Map<String, String> getUploadFiles(ScenePlus scenePlus,String path,Integer cameraType,JSONObject fdageData) throws Exception {
|
|
|
- if (ObjectUtils.isEmpty(scenePlus)) {
|
|
|
- throw new Exception("未找到场景信息：" + path);
|
|
|
- }
|
|
|
-
|
|
|
- String projectNum = scenePlus.getNum();
|
|
|
-
|
|
|
- String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, projectNum);
|
|
|
- String imagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, projectNum);
|
|
|
- String videoPath = String.format(UploadFilePath.VIDEOS_VIEW_PATH, projectNum);
|
|
|
- String resultsPath = path + File.separator + "results" + File.separator;
|
|
|
-
|
|
|
- String uploadData = FileUtils.readFile(resultsPath + "upload.json");
|
|
|
- JSONArray array = JSONObject.parseObject(uploadData).getJSONArray("upload");
|
|
|
-
|
|
|
- JSONObject fileJson = null;
|
|
|
- String fileName = "";
|
|
|
-
|
|
|
- Map<String, String> map = new HashMap();
|
|
|
-
|
|
|
- for (int i = 0; i < array.size(); ++i) {
|
|
|
- fileJson = array.getJSONObject(i);
|
|
|
- fileName = fileJson.getString("file");
|
|
|
- String filePath = resultsPath + fileName;
|
|
|
-
|
|
|
- if (!(new File(filePath)).exists()) {
|
|
|
- throw new Exception(filePath + "文件不存在");
|
|
|
- }
|
|
|
-
|
|
|
- if ("vision2.txt".equals(fileName)) {
|
|
|
- CreateObjUtil.convertTxtToVisionmodeldata(resultsPath + "vision2.txt", resultsPath + "vision2.modeldata");
|
|
|
- map.put(resultsPath + "vision2.modeldata", imagesPath + "vision2.modeldata");
|
|
|
- map.put(resultsPath + "vision2.txt", imagesPath + "vision2.txt");
|
|
|
- }
|
|
|
-
|
|
|
- if (fileJson.getIntValue("clazz") == 2) {
|
|
|
- map.put(filePath, imagesPath + ConstantFileName.modelUUID + "_50k_texture_jpg_high1/" + fileName.replace("tex/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 3) {
|
|
|
- map.put(filePath, imagesPath + "pan/high/" + fileName.replace("high/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 4) {
|
|
|
- map.put(filePath, imagesPath + "pan/low/" + fileName.replace("low/", ""));
|
|
|
- } else if (fileJson.getIntValue("clazz") == 5) {
|
|
|
- map.put(filePath, imagesPath + fileName);
|
|
|
- } else if (fileJson.getIntValue("clazz") == 7) {
|
|
|
- map.put(filePath, imagesPath + fileName);
|
|
|
- } else if (fileJson.getIntValue("clazz") == 10) {
|
|
|
- String updown = FileUtils.readFile(filePath);
|
|
|
- JSONObject updownJson = JSONObject.parseObject(updown);
|
|
|
- String mappingOssPath = String.format("scene_edit_data/%s/data/", projectNum) + fileName.replace("updown", "mapping");
|
|
|
- map.put(filePath, mappingOssPath);
|
|
|
- } else {
|
|
|
- if (fileJson.getIntValue("clazz") == 11 || fileJson.getIntValue("clazz") == 12) {
|
|
|
- map.put(filePath, videoPath + fileName.replace("videos/", ""));
|
|
|
- if (fileName.contains(".mp4")) {
|
|
|
- map.put(resultsPath + fileName.replace("mp4", "flv"), videoPath + fileName.replace("videos/", "").replace("mp4", "flv"));
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if (fileJson.getIntValue("clazz") == 16) {
|
|
|
- map.put(filePath, dataViewPath + fileName);
|
|
|
- }
|
|
|
-
|
|
|
- if (fileJson.getIntValue("clazz") == 18) {
|
|
|
- map.put(filePath, imagesPath + fileName);
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
- if ((fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1)
|
|
|
- || (!ObjectUtils.isEmpty(cameraType) && (!cameraType.equals(14)))) {
|
|
|
- CreateObjUtil.convertTxtToDam(path + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
|
|
|
- CreateObjUtil.convertDamToLzma(path + File.separator + "results/");
|
|
|
- CreateObjUtil.convertTxtToDam(path + File.separator + "results" + File.separator + "tex" + File.separator + "modeldata.txt", path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam");
|
|
|
- map.put(path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam.lzma", imagesPath + ConstantFileName.modelUUID + "_50k.dam.lzma");
|
|
|
- map.put(path + File.separator + "results" + File.separator + ConstantFileName.modelUUID + "_50k.dam", imagesPath + ConstantFileName.modelUUID + "_50k.dam");
|
|
|
- }
|
|
|
-
|
|
|
- CreateObjUtil.convertTxtToVisionmodeldata(resultsPath + "vision.txt", resultsPath + "vision.modeldata");
|
|
|
- map.put(resultsPath + "vision.txt", imagesPath + "vision.txt");
|
|
|
- map.put(resultsPath + "vision.modeldata", imagesPath + "vision.modeldata");
|
|
|
-
|
|
|
- log.info("数据转换完成：" + projectNum);
|
|
|
-
|
|
|
- FileUtil.touch("/mnt/4Dkankan/scene/data" + File.separator + "data" + projectNum);
|
|
|
- map.put(resultsPath + "floorplan.json", dataViewPath + "floor.json");
|
|
|
- map.put(resultsPath + "floorplan_cad.json", dataViewPath + "floorplan_cad.json");
|
|
|
- map.put(path + File.separator + "capture/stitch_params.txt", dataViewPath + "stitch_params.txt");
|
|
|
- map.put(path + File.separator + "capture/Up.xml", dataViewPath + "Up.xml");
|
|
|
- map.put(path + File.separator + "capture/Up2.xml", dataViewPath + "Up2.xml");
|
|
|
- map.put(path + File.separator + "capture/Up.txt", dataViewPath + "Up.txt");
|
|
|
- map.put(path + File.separator + "capture/Up2.txt", dataViewPath + "Up2.txt");
|
|
|
- return map;
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- private JSONObject getFdageData(String dataFdagePath) {
|
|
|
- log.info("dataFdagePath 文件路径 ：{}", dataFdagePath);
|
|
|
- String data = FileUtils.readFile(dataFdagePath);
|
|
|
- //获取data.fdage的内容
|
|
|
- JSONObject dataJson = new JSONObject();
|
|
|
- if(data!=null){
|
|
|
- dataJson = JSONObject.parseObject(data);
|
|
|
- }
|
|
|
- return dataJson;
|
|
|
- }
|
|
|
-
|
|
|
- private void uploadFloorCad(String path, String num, Map<String, String> uploadFiles){
|
|
|
-
|
|
|
- //户型图上传
|
|
|
- String userEditPath = UploadFilePath.USER_EDIT_PATH + "floor-cad-%s.%s";
|
|
|
- String userViewPath = UploadFilePath.USER_VIEW_PATH + "floor-cad-%s.%s";
|
|
|
- String floorCadPath = path + "/results/floorplan_cad";
|
|
|
- List<String> floorCadList = FileUtils.getFileList(floorCadPath);
|
|
|
- if(CollUtil.isNotEmpty(floorCadList)){
|
|
|
- floorCadList.stream().forEach(str->{
|
|
|
- String substring = str.substring(str.lastIndexOf(File.separator) + 1);
|
|
|
- String[] arr = substring.split("floor");
|
|
|
- String[] arr2 = arr[1].split("\\.");
|
|
|
- uploadFiles.put(str, String.format(userEditPath, num, arr2[0], arr2[1]));
|
|
|
- uploadFiles.put(str, String.format(userViewPath, num, arr2[0], arr2[1]));
|
|
|
- });
|
|
|
- }
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- private void writeSceneJson(String num, JSONObject videosJson, SceneEditInfo sceneEditInfo, SceneEditInfoExt sceneEditInfoExt,
|
|
|
- SceneEditControls sceneEditControls, ScenePlus scenePlus, ScenePlusExt scenePlusExt,Company company){
|
|
|
- String dataViewPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
|
-
|
|
|
- SceneJsonBean sceneJson = new SceneJsonBean();
|
|
|
- BeanUtil.copyProperties(sceneEditInfoExt, sceneJson);
|
|
|
- BeanUtil.copyProperties(sceneEditInfo, sceneJson);
|
|
|
- SceneEditControlsVO sceneEditControlsVO = BeanUtil.copyProperties(sceneEditControls, SceneEditControlsVO.class);
|
|
|
- sceneJson.setControls(sceneEditControlsVO);
|
|
|
- sceneJson.setNum(num);
|
|
|
- sceneJson.setCreateTime(scenePlus.getCreateTime());
|
|
|
- sceneJson.setSceneResolution(scenePlusExt.getSceneResolution());
|
|
|
- sceneJson.setVersion(sceneEditInfo.getVersion());
|
|
|
- sceneJson.setImgVersion(sceneEditInfo.getImgVersion());
|
|
|
- sceneJson.setSceneFrom(scenePlusExt.getSceneFrom());
|
|
|
- sceneJson.setSceneKind(scenePlusExt.getSceneKind());
|
|
|
- sceneJson.setVideos(JSON.toJSONString(videosJson));
|
|
|
- sceneJson.setPayStatus(scenePlus.getPayStatus());
|
|
|
-
|
|
|
- if(!ObjectUtils.isEmpty(company)){
|
|
|
- String userViewPath = String.format(UploadFilePath.USER_VIEW_PATH, num);
|
|
|
- String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, num);
|
|
|
- String localLogoPath = null;
|
|
|
- if (StrUtil.isNotEmpty(company.getTopLogo())) {
|
|
|
- localLogoPath = ConstantFilePath.AGENT_PATH + company.getTopLogo().substring(company.getTopLogo().lastIndexOf("//") + 1);
|
|
|
- HttpUtil.downloadFile(company.getTopLogo(), localLogoPath);
|
|
|
- fYunFileService.uploadFile(localLogoPath, userViewPath + "loadingLogo-user.png");
|
|
|
- fYunFileService.uploadFile(localLogoPath, userEditPath + "loadingLogo-user.png");
|
|
|
- sceneJson.setLoadingLogo("user");
|
|
|
- sceneJson.setLoadingLogoFile("loadingLogo-user.png");
|
|
|
- sceneEditInfo.setLoadingLogo("user");
|
|
|
- sceneEditInfo.setLoadingLogoFile("loadingLogo-user.png");
|
|
|
- }
|
|
|
- if (StrUtil.isNotEmpty(company.getFloorLogo())) {
|
|
|
- localLogoPath = ConstantFilePath.AGENT_PATH + company.getFloorLogo().substring(company.getFloorLogo().lastIndexOf("//") + 1);
|
|
|
- HttpUtil.downloadFile(company.getFloorLogo(), localLogoPath);
|
|
|
- fYunFileService.uploadFile(localLogoPath, userViewPath + "floorLogo-user.png");
|
|
|
- fYunFileService.uploadFile(localLogoPath, userEditPath + "floorLogo-user.png");
|
|
|
- sceneJson.setFloorLogo("user");
|
|
|
- sceneJson.setFloorLogoFile("floorLogo-user.png");
|
|
|
-
|
|
|
- sceneEditInfo.setFloorLogo("user");
|
|
|
- sceneEditInfo.setFloorLogoFile("floorLogo-user.png");
|
|
|
- }
|
|
|
- if(!ObjectUtils.isEmpty(localLogoPath)){
|
|
|
- sceneEditInfoService.updateById(sceneEditInfo);
|
|
|
- FileUtils.deleteFile(localLogoPath);
|
|
|
- }
|
|
|
- }
|
|
|
- String sceneJsonStr = JSON.toJSONString(sceneJson);
|
|
|
- //上传sceneJson文件
|
|
|
- fYunFileService.uploadFile(sceneJsonStr.getBytes(), dataViewPath + "scene.json");
|
|
|
- //scenejson写入缓存
|
|
|
- redisUtil.set(String.format(RedisKey.SCENE_JSON, num), sceneJsonStr);
|
|
|
-
|
|
|
- // 上传status JSON.
|
|
|
- JSONObject statusJson = new JSONObject();
|
|
|
- //临时将-2改成1，app还没完全更新
|
|
|
- statusJson.put("status", 1);
|
|
|
- statusJson.put("webSite", scenePlusExt.getWebSite());
|
|
|
- statusJson.put("sceneNum", num);
|
|
|
- statusJson.put("thumb", scenePlusExt.getThumb());
|
|
|
- statusJson.put("payStatus", scenePlus.getPayStatus());
|
|
|
- statusJson.put("sceneScheme", scenePlusExt.getSceneScheme());
|
|
|
- FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json", statusJson.toString());
|
|
|
-
|
|
|
- fYunFileService.uploadFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "status.json",
|
|
|
- dataViewPath + "status.json");
|
|
|
-
|
|
|
- }
|
|
|
-
|
|
|
- private void createQrCode(String num, ScenePlusExt scenePlusExt, String qrLogo) {
|
|
|
- String localLogoPath = null;
|
|
|
- if (!ObjectUtils.isEmpty(qrLogo)) {
|
|
|
- try {
|
|
|
- localLogoPath = ConstantFilePath.AGENT_PATH + qrLogo.substring(qrLogo.lastIndexOf("//") + 1);
|
|
|
- HttpUtil.downloadFile(qrLogo, localLogoPath);
|
|
|
- } catch (Exception e) {
|
|
|
- log.error("公司logo下载失败：{}", qrLogo);
|
|
|
- localLogoPath = null;
|
|
|
- }
|
|
|
- }
|
|
|
- //生成二维码
|
|
|
- String outPathZh = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+ num +".png";
|
|
|
- String outPathEn = ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+ num +"_en.png";
|
|
|
- QrConfig qrConfig = QrConfig.create();
|
|
|
- if(!ObjectUtils.isEmpty(localLogoPath)){
|
|
|
- qrConfig.setImg(localLogoPath);
|
|
|
- }
|
|
|
- QrCodeUtil.generate(scenePlusExt.getWebSite(), qrConfig, FileUtil.file(outPathZh));
|
|
|
- QrCodeUtil.generate(scenePlusExt.getWebSite() + "&lang=en", qrConfig, FileUtil.file(outPathEn));
|
|
|
- //上传二维码
|
|
|
- fYunFileService.uploadFile(outPathZh, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + ".png");
|
|
|
- fYunFileService.uploadFile(outPathEn, String.format(UploadFilePath.DOWNLOADS_QRCODE, num) + num + "_en.png");
|
|
|
-
|
|
|
- if(!ObjectUtils.isEmpty(localLogoPath)){
|
|
|
- FileUtils.deleteFile(localLogoPath);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private void pushMsgToApp(Integer pushChannel, String pushToken, int cameraType, String sceneName, String webSite){
|
|
|
- log.info("推送消息，渠道是 {}, 手机token是 {}", pushChannel, pushToken);
|
|
|
- if(Objects.isNull(pushChannel) && StrUtil.isBlank(pushToken)){
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- String title = sceneName + "计算完成";
|
|
|
- String body = "您上传的" + sceneName + "计算完成，点击查看";
|
|
|
-
|
|
|
- try{
|
|
|
- if(FYunTypeEnum.AWS.code().equals(fYunFileService.getFyunType())){
|
|
|
- PushMsgUtil.googlePushMsg(ConstantFilePath.BASE_PATH + "/refreshToken.json", pushToken,
|
|
|
- title, body , webSite);
|
|
|
- return;
|
|
|
- }
|
|
|
-
|
|
|
- PushMessageConfig pushConfig = null;
|
|
|
- if(pushChannel == 0){
|
|
|
- if(cameraType == 10 || cameraType == 13){
|
|
|
- //ios
|
|
|
- pushConfig = new PushMessageConfig(PushMessageConfig.IOS_KEY_Z, PushMessageConfig.IOS_SECRET_Z);
|
|
|
- pushConfig.sendIOSUnicast(pushToken, "四维看看Minion",title, body, webSite);
|
|
|
- }else {
|
|
|
- //ios
|
|
|
- pushConfig = new PushMessageConfig(PushMessageConfig.IOS_KEY, PushMessageConfig.IOS_SECRET);
|
|
|
- pushConfig.sendIOSUnicast(pushToken, "四维看看Pro",title, body, webSite);
|
|
|
- }
|
|
|
- }else {
|
|
|
- if(cameraType == 10 || cameraType == 13){
|
|
|
- //ios
|
|
|
- //安卓
|
|
|
- pushConfig = new PushMessageConfig(PushMessageConfig.ANDROID_KEY_Z, PushMessageConfig.ANDROID_SECRET_Z);
|
|
|
- pushConfig.sendAndroidUnicast2(pushToken, "四维看看Minion",title, body, webSite);
|
|
|
- }else {
|
|
|
- //安卓
|
|
|
- pushConfig = new PushMessageConfig(PushMessageConfig.ANDROID_KEY, PushMessageConfig.ANDROID_SECRET);
|
|
|
- pushConfig.sendAndroidUnicast(pushToken, "四维看看Pro",title, body, webSite);
|
|
|
- }
|
|
|
- }
|
|
|
- log.info("消息推送结束！");
|
|
|
- }catch (Exception e){
|
|
|
- log.error("推送消息失败：", e);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private void copyToEditDir(String num) throws IOException {
|
|
|
-
|
|
|
- String editImagesPath = String.format(UploadFilePath.IMG_EDIT_PATH, num);
|
|
|
- String viewImagesPath = String.format(UploadFilePath.IMG_VIEW_PATH, num);
|
|
|
-
|
|
|
- String editDataPath = String.format(UploadFilePath.DATA_EDIT_PATH, num);
|
|
|
- String viewDataPath = String.format(UploadFilePath.DATA_VIEW_PATH, num);
|
|
|
-
|
|
|
- Map<String, String> map = new HashMap<>();
|
|
|
- map.put(editImagesPath + "vision.modeldata", viewImagesPath + "vision.modeldata");
|
|
|
- map.put(editImagesPath + "vision2.modeldata", viewImagesPath + "vision2.modeldata");
|
|
|
- map.put(editDataPath + "floorplan_cad.json", viewDataPath + "floorplan_cad.json");
|
|
|
-
|
|
|
- for (Entry<String, String> entry : map.entrySet()) {
|
|
|
- fYunFileService.copyFileInBucket(entry.getValue(), entry.getKey());
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- private JSONObject getVideosJson(String path, Integer videoVersion, String projectNum, int cameraType) throws Exception {
|
|
|
- //读取videos_hdr_param.json, 保存点位视频的value
|
|
|
- Map<String, Object> videoMap = new HashMap<>();
|
|
|
- String videosHdr = FileUtils.readFile(path + File.separator + "results/videos/videos_hdr_param.json");
|
|
|
- JSONArray videoArray = null;
|
|
|
- if(StringUtils.isNotEmpty(videosHdr)){
|
|
|
- videoArray = JSONObject.parseObject(videosHdr).getJSONArray("hdr_param");
|
|
|
- }
|
|
|
- if(videoArray != null){
|
|
|
- for(int i = 0, len = videoArray.size(); i < len; i++) {
|
|
|
- videoMap.put(videoArray.getJSONObject(i).getString("name"), videoArray.getJSONObject(i).getString("value"));
|
|
|
- if(videoArray.getJSONObject(i).containsKey("fov")){
|
|
|
- videoMap.put(videoArray.getJSONObject(i).getString("name") + "_fov", videoArray.getJSONObject(i).getString("fov"));
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- //获取upload中的video视频名称
|
|
|
- String uploadData = FileUtils.readFile(path + File.separator + "results" +File.separator+"upload.json");
|
|
|
- JSONObject uploadJson = null;
|
|
|
- JSONArray array = null;
|
|
|
- if(uploadData!=null) {
|
|
|
- uploadJson = JSONObject.parseObject(uploadData);
|
|
|
- array = uploadJson.getJSONArray("upload");
|
|
|
- }
|
|
|
- JSONObject fileJson = null;
|
|
|
- String fileName = "";
|
|
|
-
|
|
|
- //计算ts文件的大小，并拼接成json格式
|
|
|
- JSONArray jsonArray = new JSONArray();
|
|
|
- JSONObject videoJson = null;
|
|
|
- JSONObject videosJson = new JSONObject();
|
|
|
- long videoSize = 0L;
|
|
|
- for(int i = 0, len = array.size(); i < len; i++) {
|
|
|
- fileJson = array.getJSONObject(i);
|
|
|
- fileName = fileJson.getString("file");
|
|
|
- if(fileJson.getIntValue("clazz") == 11 && fileName.contains(".mp4") && !fileName.contains("-ios.mp4")){
|
|
|
- videoJson = new JSONObject();
|
|
|
- videoJson.put("id", fileName.substring(
|
|
|
- 0, fileName.lastIndexOf(".")).replace("videos/", ""));
|
|
|
-
|
|
|
- //如果ts文件存在，就计算ts大小
|
|
|
- if(new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).exists()){
|
|
|
- videoSize = new File(path + File.separator + "results" +File.separator+ fileName.replace(".mp4", ".ts")).length();
|
|
|
- videoJson.put("tsSize", videoSize);
|
|
|
- }
|
|
|
- if(videoMap.containsKey(videoJson.get("id"))){
|
|
|
- videoJson.put("value", videoMap.get(videoJson.get("id")));
|
|
|
- }
|
|
|
- if(videoMap.containsKey(videoJson.get("id") + "_fov")){
|
|
|
- videoJson.put("blend_fov", videoMap.get(videoJson.get("id") + "_fov"));
|
|
|
- }else {
|
|
|
- videoJson.put("blend_fov", 7);
|
|
|
- }
|
|
|
- jsonArray.add(videoJson);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- videosJson.put("data", jsonArray);
|
|
|
- if(Objects.nonNull(videoVersion) && videoVersion >= 4){
|
|
|
- videosJson.put("version", 3);
|
|
|
- videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up.xml");
|
|
|
- if(cameraType == 13){
|
|
|
- //转台相机
|
|
|
- videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
|
|
|
- }
|
|
|
- }else {
|
|
|
- videosJson.put("version", 1);
|
|
|
- videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "Up2.xml");
|
|
|
- if(cameraType == 13){
|
|
|
- //转台相机
|
|
|
- videosJson.put("upPath", videosJson.getString("upPath").replace(".xml", ".txt"));
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- if(cameraType == 5 || cameraType == 6){
|
|
|
- videosJson.put("version", 1);
|
|
|
- videosJson.put("upPath", fYunFileConfig.getHost() + String.format(UploadFilePath.DATA_VIEW_PATH, projectNum) + "stitch_params.txt");
|
|
|
- }
|
|
|
-
|
|
|
- return videosJson;
|
|
|
- }
|
|
|
-
|
|
|
- private Long calUseSpace(Map<String, String> uploadFile) {
|
|
|
- return uploadFile.keySet().stream().map(File::new).filter(File::exists).mapToLong(File::length).sum();
|
|
|
- }
|
|
|
-
|
|
|
- private void sealScene(Long scenePlusId){
|
|
|
- scenePlusService.update(
|
|
|
- new LambdaUpdateWrapper<ScenePlus>()
|
|
|
- .set(ScenePlus::getPayStatus, PayStatus.NO_CAPACITY.code())
|
|
|
- .eq(ScenePlus::getId, scenePlusId));
|
|
|
- }
|
|
|
-
|
|
|
- /**
|
|
|
- * <p>
|
|
|
- 双目场景更新数据库
|
|
|
- * </p>
|
|
|
- * @author dengsixing
|
|
|
- * @date 2022/3/21
|
|
|
- * @param num
|
|
|
- * @param space
|
|
|
- **/
|
|
|
- private void updateDb4Sm(String num, long space){
|
|
|
- List<ScenePlus> ScenePlusList = scenePlusService.list(
|
|
|
- new LambdaQueryWrapper<ScenePlus>().select(ScenePlus::getId).eq(ScenePlus::getNum, num));
|
|
|
-
|
|
|
- if(CollUtil.isEmpty(ScenePlusList)){
|
|
|
- return ;
|
|
|
- }
|
|
|
-
|
|
|
- List<Long> sceneIds = ScenePlusList.stream().map(ScenePlus::getId).collect(Collectors.toList());
|
|
|
-
|
|
|
- //更新场景创建时间
|
|
|
- scenePlusService.update(new LambdaUpdateWrapper<ScenePlus>().in(ScenePlus::getId, sceneIds)
|
|
|
- .set(ScenePlus::getSceneStatus, SceneStatus.NO_DISPLAY.code()));
|
|
|
-
|
|
|
- //更新使用容量
|
|
|
- scenePlusExtService.update(new LambdaUpdateWrapper<ScenePlusExt>().in(ScenePlusExt::getPlusId, sceneIds)
|
|
|
- .set(ScenePlusExt::getSpace, space)
|
|
|
- .set(ScenePlusExt::getAlgorithmTime, Calendar.getInstance().getTime()));
|
|
|
- }
|
|
|
-
|
|
|
- private void updateDbPlus(int sceneSource,Long space,String videosJson, Long computeTime,boolean isObj,ScenePlusExt scenePlusExt){
|
|
|
-
|
|
|
- scenePlusExt.setSpace(space);
|
|
|
- scenePlusExt.setComputeTime(computeTime.toString());
|
|
|
- scenePlusExt.setAlgorithmTime(new Date());
|
|
|
- scenePlusExt.setVideos(videosJson);
|
|
|
- scenePlusExt.setIsObj(isObj ? 1 : 0);
|
|
|
-
|
|
|
- if(ModelTypeEnums.TILE_CODE.equals(modelType)){
|
|
|
- scenePlusExt.setSceneScheme(3);
|
|
|
- }
|
|
|
-
|
|
|
- switch (SceneSource.get(sceneSource)){
|
|
|
- case BM:
|
|
|
- scenePlusExt.setSceneResolution(SceneResolution.two_K.code());
|
|
|
- scenePlusExt.setSceneFrom(SceneFrom.PRO.code());
|
|
|
- break;
|
|
|
- case SM:
|
|
|
- scenePlusExt.setSceneResolution(SceneResolution.one_k.code());
|
|
|
- scenePlusExt.setSceneFrom(SceneFrom.LITE.code());
|
|
|
- break;
|
|
|
- case ZT:
|
|
|
- scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
|
|
|
- scenePlusExt.setSceneFrom(SceneFrom.MINION.code());
|
|
|
- break;
|
|
|
- case JG:
|
|
|
- scenePlusExt.setSceneResolution(SceneResolution.four_K.code());
|
|
|
- scenePlusExt.setSceneFrom(SceneFrom.LASER.code());
|
|
|
- break;
|
|
|
- }
|
|
|
-
|
|
|
- String sceneKind = scenePlusExt.getSceneScheme() == 3 ? SceneKind.FACE.code():SceneKind.TILES.code();
|
|
|
- scenePlusExt.setSceneKind(sceneKind);
|
|
|
-
|
|
|
- scenePlusExtService.updateById(scenePlusExt);
|
|
|
- }
|
|
|
-
|
|
|
- private int getPayStatus(Long cameraId, Long space){
|
|
|
- //更新相机使用用量
|
|
|
- CameraDetail cameraDetail = cameraDetailService.updateCameraDetailByCameraIdAndSpace(cameraId, space);
|
|
|
- Long totalSpace = cameraDetail.getTotalSpace();
|
|
|
-
|
|
|
- UserIncrement userIncrement = userIncrementService.getByCameraId(cameraId);
|
|
|
- if(!ObjectUtils.isEmpty(userIncrement) && userIncrement.getIsExpired().equals(ExpiredStatus.NOT_EXPIRED.code())){
|
|
|
- IncrementType type = incrementTypeService.getById(userIncrement.getIncrementTypeId());
|
|
|
- if (ObjectUtils.isEmpty(type) || type.getType().equals("cn")) {
|
|
|
- return PayStatus.PAY.code();
|
|
|
- } else if (type.getType().equals("eur")) {
|
|
|
- totalSpace = type.getCameraCapacity() * 1024 * 1024L;
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return totalSpace.compareTo(cameraDetail.getUsedSpace()) == -1 ? PayStatus.NO_CAPACITY.code() : PayStatus.PAY.code();
|
|
|
- }
|
|
|
-
|
|
|
- private Object[] updateEditInfo(ScenePlus scenePlus){
|
|
|
- SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlus.getId());
|
|
|
- SceneEditControls sceneEditControls = null;
|
|
|
- SceneEditInfoExt sceneEditInfoExt = null;
|
|
|
- if(sceneEditInfo == null){
|
|
|
- sceneEditInfo = new SceneEditInfo();
|
|
|
- sceneEditInfo.setScenePlusId(scenePlus.getId());
|
|
|
- sceneEditInfo.setDescription(scenePlus.getDescription());
|
|
|
- sceneEditInfo.setTitle(scenePlus.getTitle());
|
|
|
- sceneEditInfoService.save(sceneEditInfo);
|
|
|
-
|
|
|
- }else{
|
|
|
- sceneEditControls = sceneEditControlsService.getBySceneEditId(sceneEditInfo.getId());
|
|
|
- sceneEditInfoExt = sceneEditInfoExtService.getByEditInfoId(sceneEditInfo.getId());
|
|
|
- sceneEditInfo.setVersion(sceneEditInfo.getVersion() + 1);
|
|
|
- sceneEditInfo.setImgVersion(sceneEditInfo.getImgVersion() + 1);
|
|
|
- sceneEditInfoService.updateById(sceneEditInfo);
|
|
|
- }
|
|
|
- if(sceneEditControls == null){
|
|
|
- sceneEditControls = new SceneEditControls();
|
|
|
- sceneEditControls.setEditInfoId(sceneEditInfo.getId());
|
|
|
- sceneEditControlsService.save(sceneEditControls);
|
|
|
- }
|
|
|
- if(sceneEditInfoExt == null){
|
|
|
- sceneEditInfoExt = new SceneEditInfoExt();
|
|
|
- sceneEditInfoExt.setScenePlusId(scenePlus.getId());
|
|
|
- sceneEditInfoExt.setEditInfoId(sceneEditInfo.getId());
|
|
|
- sceneEditInfoExtService.save(sceneEditInfoExt);
|
|
|
- }
|
|
|
- return new Object[]{sceneEditInfo, sceneEditInfoExt, sceneEditControls};
|
|
|
- }
|
|
|
-
|
|
|
- public void uploadHouseTypeJson(String num, String floorPlanCardFilePath) {
|
|
|
- if (!new File(floorPlanCardFilePath).exists()) {
|
|
|
- log.error("floorplan_cad.json 文件不存在，文件路径：{}", floorPlanCardFilePath);
|
|
|
- return;
|
|
|
- }
|
|
|
- JSONObject json = CreateHouseJsonUtil.createHouseTypeJsonByCad(floorPlanCardFilePath);
|
|
|
- String hourseTypeJsonPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "houseType.json";
|
|
|
- fYunFileService.uploadFile(json.toJSONString().getBytes(), hourseTypeJsonPath);
|
|
|
- hourseTypeJsonPath = String.format(UploadFilePath.DATA_EDIT_PATH, num) + "houseType.json";
|
|
|
- fYunFileService.uploadFile(json.toJSONString().getBytes(), hourseTypeJsonPath);
|
|
|
- }
|
|
|
-}
|
