dengsixing пре 1 месец
родитељ
комит
89061344dd

+ 50 - 56
pom.xml

@@ -16,33 +16,11 @@
 
 
   <dependencies>
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-common-utils</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-      <exclusions>
-        <exclusion>
-          <groupId>com.aliyun</groupId>
-          <artifactId>aliyun-java-sdk-core</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.aliyun</groupId>
-          <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>com.auth0</groupId>
-          <artifactId>java-jwt</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>org.bytedeco.javacpp-presets</groupId>
-          <artifactId>ffmpeg-platform</artifactId>
-        </exclusion>
-        <exclusion>
-          <groupId>io.jsonwebtoken</groupId>
-          <artifactId>jjwt</artifactId>
-        </exclusion>
-      </exclusions>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-common-utils</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>org.springframework.boot</groupId>
@@ -71,23 +49,45 @@
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-dingtalk</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-utils-dingtalk</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>com.fdkankan</groupId>
       <artifactId>4dkankan-common-web</artifactId>
       <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-app-push</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
+        <exclusions>
+            <exclusion>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-core</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>com.aliyun</groupId>
+                <artifactId>aliyun-java-sdk-dysmsapi</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>com.auth0</groupId>
+                <artifactId>java-jwt</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>org.bytedeco.javacpp-presets</groupId>
+                <artifactId>ffmpeg-platform</artifactId>
+            </exclusion>
+            <exclusion>
+                <groupId>io.jsonwebtoken</groupId>
+                <artifactId>jjwt</artifactId>
+            </exclusion>
+        </exclusions>
+    </dependency>
+
+<!--    <dependency>-->
+<!--      <groupId>com.fdkankan</groupId>-->
+<!--      <artifactId>4dkankan-utils-app-push</artifactId>-->
+<!--      <version>3.0.0-SNAPSHOT</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>com.fdkankan</groupId>
@@ -148,13 +148,7 @@
 
     <dependency>
       <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-s3</artifactId>
-      <version>3.0.0-SNAPSHOT</version>
-    </dependency>
-
-    <dependency>
-      <groupId>com.fdkankan</groupId>
-      <artifactId>4dkankan-utils-fyun-oss</artifactId>
+      <artifactId>4dkankan-utils-fyun-local</artifactId>
       <version>3.0.0-SNAPSHOT</version>
     </dependency>
 
@@ -170,17 +164,17 @@
       <version>1.3.6</version>
     </dependency>
 
-    <dependency>
-      <groupId>net.logstash.logback</groupId>
-      <artifactId>logstash-logback-encoder</artifactId>
-      <version>5.0</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>net.logstash.logback</groupId>-->
+<!--      <artifactId>logstash-logback-encoder</artifactId>-->
+<!--      <version>5.0</version>-->
+<!--    </dependency>-->
 
-    <dependency>
-      <groupId>com.yomahub</groupId>
-      <artifactId>tlog-logstash-logback</artifactId>
-      <version>1.5.0</version>
-    </dependency>
+<!--    <dependency>-->
+<!--      <groupId>com.yomahub</groupId>-->
+<!--      <artifactId>tlog-logstash-logback</artifactId>-->
+<!--      <version>1.5.0</version>-->
+<!--    </dependency>-->
 
     <dependency>
       <groupId>org.apache.logging.log4j</groupId>

+ 0 - 53
src/main/java/com/fdkankan/contro/mq/listener/BuildV3SceneListener.java

@@ -1,53 +0,0 @@
-package com.fdkankan.contro.mq.listener;
-
-import com.fdkankan.contro.mq.service.impl.BuildV3SceneServiceImpl;
-import com.rabbitmq.client.Channel;
-import lombok.extern.slf4j.Slf4j;
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.Queue;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Slf4j
-@Component
-public class BuildV3SceneListener extends AbstrackBuildSceneListener {
-
-    @Value("${queue.modeling.v3.modeling-pre}")
-    private String queueModelingPre;
-    @Value("${queue.modeling.v3.modeling-post}")
-    private String queueModelingPost;
-
-    @Autowired
-    private BuildV3SceneServiceImpl buildSceneService;
-
-    /**
-     * 场景计算前置资源准备处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-pre}"),
-            concurrency = "${maxThread.modeling.modeling-pre}"
-    )
-    public void buildScenePreHandler(Channel channel, Message message) throws Exception {
-        preHandle(channel,queueModelingPre,message,buildSceneService, "standard");
-    }
-
-    /**
-     * 场景计算后置结果处理
-     * @param channel
-     * @param message
-     * @throws Exception
-     */
-    @RabbitListener(
-            queuesToDeclare = @Queue("${queue.modeling.v3.modeling-post}"),
-            concurrency = "${maxThread.modeling.modeling-post}"
-    )
-    public void buildScenePostHandler(Channel channel, Message message) throws Exception {
-        postHandle(channel,queueModelingPost,message,buildSceneService, "standard");
-
-    }
-}

+ 0 - 651
src/main/java/com/fdkankan/contro/mq/service/impl/BuildV3SceneServiceImpl.java

@@ -1,651 +0,0 @@
-package com.fdkankan.contro.mq.service.impl;
-
-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 com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.constant.PayStatus;
-import com.fdkankan.common.constant.SceneScheme;
-import com.fdkankan.common.constant.SceneStatus;
-import com.fdkankan.common.constant.SceneVersionType;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.contro.bean.SyncLaserResultBean;
-import com.fdkankan.contro.entity.*;
-import com.fdkankan.contro.mq.service.IBuildSceneService;
-import com.fdkankan.contro.service.ICommonService;
-import com.fdkankan.contro.service.*;
-import com.fdkankan.contro.service.impl.FdkkV4Service;
-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 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.cloud.context.config.annotation.RefreshScope;
-import org.springframework.stereotype.Service;
-
-import java.io.File;
-import java.util.*;
-
-
-/**
- * <p>
- * TODO
- * </p>
- *
- * @author dengsixing
- * @since 2022/4/20
- **/
-@Slf4j
-@Service
-@RefreshScope
-public class BuildV3SceneServiceImpl implements IBuildSceneService {
-
-    @Value("${queue.modeling.modeling-call}")
-    private String queueModelingCall;
-
-    @Value("${queue.modeling.v3.modeling-post}")
-    private String queueV3ModelingPost;
-
-    @Value("${model.type:#{null}}")
-    private String modelSceneKind;
-
-    @Value("${model.modelKind:3dtiles}")
-    private String modelKind;
-
-    @Value("${env:gn}")
-    private String env;
-
-    @Autowired
-    private ICommonService commonService;
-
-    @Autowired
-    private RabbitMqProducer mqProducer;
-
-    @Autowired
-    private FYunFileServiceInterface fYunFileService;
-    @Autowired
-    private ICameraDetailService cameraDetailService;
-
-    @Autowired
-    private FYunFileConfig fYunFileConfig;
-
-    @Autowired
-    private ISceneProService sceneProService;
-
-    @Autowired
-    private IUserIncrementService userIncrementService;
-
-    @Autowired
-    private IFdkkLaserService fdkkLaserService;
-
-    @Autowired
-    private FdkkV4Service fdkkV4Service;
-
-    @Autowired
-    private IIncrementTypeService incrementTypeService;
-
-    @Autowired
-    private IBuildSceneDTService buildSceneDTService;
-
-    @Autowired
-    private ISceneProEditService sceneProEditService;
-
-    @Autowired
-    private ISceneColdStorageService sceneColdStorageService;
-
-    @Autowired
-    private ICompanyService companyService;
-    @Autowired
-    private IBuildService buildService;
-
-    @Override
-    public void buildScenePre(BuildSceneCallMessage message) {
-        String num = message.getSceneNum();
-        try {
-
-            //重新计算时需要删除文件夹,否知使用缓存
-            if(new File(message.getPath() + File.separator + "results").exists()){
-                FileUtils.deleteDirectory(message.getPath() + File.separator + "results");
-            }
-            //由于刘强说caches会影响计算结果,所以这里删除caches
-            if(new File(message.getPath() + File.separator + "caches").exists()){
-                FileUtils.deleteDirectory(message.getPath() + File.separator + "caches");
-            }
-
-            //用户相机重新全量上传,需要解冻结
-            sceneColdStorageService.unfreeze(num, "用户相机重新全量上传", message.getPath());
-
-            //根据相机类型,组装资源路径
-            //下载资源到本地
-            this.downLoadSource(message, message.getPath());
-            JSONObject fdageJson = JSONObject.parseObject(FileUtils.readFile(message.getPath().concat("/capture/data.fdage")));
-            // 兼容旧的数据,防止OnlyExportMeshObj标志未删除掉
-            boolean rewrite = false;
-            if (fdageJson.containsKey("OnlyExportMeshObj")) {
-                log.info("data.fdage 包含 OnlyExportMeshObj,进行去除!");
-                // 写入data.fdage 防止重算
-                fdageJson.remove("OnlyExportMeshObj");
-                String ossPath = getOssPath(message.getPath());
-                fYunFileService.uploadFile(fdageJson.toJSONString().getBytes(), ossPath + "data.fdage");
-                rewrite = true;
-            }
-
-            if (!ObjectUtils.isEmpty(modelSceneKind)) {
-                // 修改dataFdage文件
-                fdageJson.put("modelType", modelSceneKind);
-                rewrite = true;
-            }
-
-            if (rewrite) {
-                FileUtils.writeFile(message.getPath().concat("/capture/data.fdage"), fdageJson.toJSONString());
-            }
-
-            message.getBuildContext().put("cameraType",message.getCameraType());
-            message.setResultReceiverMqName(queueV3ModelingPost);
-            message.setBizType("standard");
-
-            buildService.writeDataJson(message, fdageJson, null, null);
-
-            log.info("场景计算资源准备结束,场景码:{}", message.getSceneNum());
-
-        }catch (Exception e){
-            log.error("场景计算前置处理出错,num="+num, e);
-            buildSceneDTService.handBaseFail("场景计算资源准备异常!", message.getPath(), message.getSceneNum(), "计算控制服务器");
-            throw e;
-        }
-    }
-
-    private String getOssPath(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("/");
-        }
-        return ossPath;
-    }
-
-    @Override
-    public void downLoadSource(BuildSceneCallMessage buildSceneMqMessage,String path){
-        String ossPath = getOssPath(path);
-        fYunFileService.downloadFileByCommand(path + File.separator + "capture", ossPath);
-    }
-
-
-    @Override
-    public void buildScenePost(BuildSceneResultMqMessage message) throws Exception {
-        String sceneCode = message.getBuildContext().get("sceneNum").toString();
-        try {
-
-            Integer cameraType = Integer.parseInt(message.getBuildContext().get("cameraType").toString());
-            Long computeTime = message.getComputeTime();
-
-            String path = message.getPath();
-
-            Boolean buildSuccess = message.getBuildSuccess();
-            JSONObject fdageData = getFdageData(path + File.separator + "capture" +File.separator+"data.fdage");
-            Integer videoVersion = fdageData.getInteger("videoVersion");
-            // 上传计算日志
-            //如果是重复计算,没有走到计算逻辑,不需要上传日志文件
-            log.info("开始上传计算日志");
-            String buildLogPath = String.format(UploadFilePath.BUILD_LOG_PATH, sceneCode);
-            fYunFileService.uploadFile(path + File.separator + "console.log", buildLogPath + "console.log");
-            log.info("计算日志上传完成");
-
-            if (!buildSuccess) {
-                log.error("建模失败,修改状态为失败状态");
-                sceneProService.update(new LambdaUpdateWrapper<ScenePro>()
-                        .set(ScenePro::getStatus, SceneStatus.FAILD.code())
-                        .eq(ScenePro::getNum, sceneCode));
-                // 发送钉钉消息,计算失败
-                buildSceneDTService.handModelFail("计算失败", message.getPath(), sceneCode, message.getHostName());
-                return;
-            }
-
-            Map<String, String> uploadFiles = getUploadFiles(sceneCode,path,cameraType,fdageData);
-
-            copyFiles(path,sceneCode);
-
-            //建模成功走以下逻辑
-            log.info("cameraType:{}",cameraType);
-
-            //计算场景消耗磁盘空间
-            long space = this.calUseSpace(uploadFiles);
-
-            //读取计算结果文件生成videosJson
-            JSONObject videosJson = this.getVideosJson(path, videoVersion, sceneCode, cameraType);
-
-            //写入数据库
-            ScenePro scenePro = this.updateDbPlus(sceneCode, space, videosJson.toJSONString(), computeTime,fdageData.containsKey("exportMeshObj") && fdageData.getIntValue("exportMeshObj") == 1);
-
-            scenePro.setPayStatus(PayStatus.PAY.code());
-            //如果相机容量不足,需要把场景的paystatus改为容量不足状态
-            scenePro.setPayStatus(commonService.getPayStatus(scenePro.getCameraId(), space, fdageData));
-            sceneProService.update(
-                    new LambdaUpdateWrapper<ScenePro>()
-                            .set(ScenePro::getPayStatus, scenePro.getPayStatus())
-                            .eq(ScenePro::getId, scenePro.getId()));
-
-            //上传文件
-            log.info("开始上传场景计算结果数据,num:{}", sceneCode);
-            fYunFileService.uploadMulFiles(uploadFiles);
-
-            Map<String,String> damFileHeaders = new HashMap<>();
-            damFileHeaders.put("Content-Encoding","gzip");
-
-            // 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);
-                });
-
-            //生成houseTypejson并上传
-            uploadFiles.entrySet().stream().filter(entry-> FileNameUtil.getName(entry.getKey()).equals("floorplan_cad.json"))
-                    .forEach(entry-> uploadHouseTypeJson(sceneCode,entry.getKey()));
-
-            //生成二维码
-            this.createQrcode(sceneCode);
-
-            //计算成功,通知APP
-            Integer pushChannel = fdageData.getInteger("pushChannel");
-            String pushToken = fdageData.getString("pushToken");
-            this.pushMsgToApp(pushChannel,pushToken, cameraType, scenePro.getSceneName(), scenePro.getWebSite());
-
-            SceneProEdit sceneProEdit = sceneProEditService.getByProId(scenePro.getId());
-            sceneProEdit.setVersion(ObjectUtils.isEmpty(sceneProEdit.getVersion()) ? 0 : sceneProEdit.getVersion() + 1);
-            sceneProEdit.setImagesVersion(ObjectUtils.isEmpty(sceneProEdit.getImagesVersion()) ? 0 : sceneProEdit.getImagesVersion() + 1);
-            sceneProEdit.setFloorEditVer(ObjectUtils.isEmpty(sceneProEdit.getFloorEditVer()) ? 0 : sceneProEdit.getFloorEditVer() + 1);
-            sceneProEdit.setFloorPublishVer(ObjectUtils.isEmpty(sceneProEdit.getFloorPublishVer()) ? 0 : sceneProEdit.getFloorPublishVer() + 1);
-            if (cameraType == 14) {
-                //计算成功  激光转台相机 同步 请求
-                fdkkLaserService.syncBuildResult(
-                        SyncLaserResultBean.builder()
-                        .num(sceneCode).dataSource(path)
-                        .sceneStatus(2)
-                        .createTime(scenePro.getCreateTime())
-                        .shootCount(scenePro.getShootCount())
-                        .payStatus(scenePro.getPayStatus())
-                        .mixture(0)
-                        .version(SceneVersionType.V3.code()).build());
-                sceneProEdit.setMapVisi(0);
-            }
-            sceneProEditService.updateById(sceneProEdit);
-
-            //写scene.json
-            log.info("生成scene.json上传oss并设置缓存,num:{}", sceneCode);
-            this.writeSceneJson(videosJson,scenePro,sceneProEdit);
-
-//            CreateObjUtil.deleteFile(path.replace(ConstantFilePath.BUILD_MODEL_PATH, "/") + "/capture");
-            log.info("场景计算结果处理结束,场景码:{}", sceneCode);
-            // 判断是否升级V4
-//            if(fdageData.containsKey("updateV4") && fdageData.getIntValue("updateV4") == 1){
-//                fdkkV4Service.upgradeToV4(sceneCode);
-//            }
-
-            //国际环境需要发邮件通知
-            if("eur".equals(env)){
-                commonService.sendEmail(sceneCode, "standar");
-            }
-
-        }catch (Exception e){
-            log.error("场景计算结果处理出错,num"+sceneCode, e);
-            buildSceneDTService.handBaseFail("场景计算结果处理出错!", message.getPath(), sceneCode, "计算控制服务器");
-            throw e;
-        }
-    }
-
-    private void createQrcode(String num){
-        ScenePro scenePro = sceneProService.getByNum(num);
-        String logoPath = null;
-        if(Objects.nonNull(scenePro.getCameraId())){
-            CameraDetail cameraDetail = cameraDetailService.getByCameraId(scenePro.getId());
-            if(Objects.nonNull(cameraDetail) && Objects.nonNull(cameraDetail.getCompanyId())){
-                Company company = companyService.getById(cameraDetail.getCompanyId());
-                if(Objects.nonNull(company) && StrUtil.isNotEmpty(company.getQrLogo())){
-                    logoPath =  ConstantFilePath.BASE_PATH + File.separator + company.getQrLogo();
-                }
-            }
-        }
-
-        //生成二维码
-        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();
-        qrConfig.setWidth(1024);
-        qrConfig.setHeight(1024);
-        if(StrUtil.isNotEmpty(logoPath)){
-            qrConfig.setImg(logoPath);
-        }
-        QrCodeUtil.generate(scenePro.getWebSite(), qrConfig, FileUtil.file(outPathZh));
-        QrCodeUtil.generate(scenePro.getWebSite() + "&lang=en", qrConfig, FileUtil.file(outPathEn));
-    }
-
-    private void copyFiles(String path, String num) {
-        if (new File(path + File.separator + "results" + File.separator + "floor.json").exists()) {
-            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floor.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floor.json", true);
-        }
-        if (new File(path + File.separator + "results" + File.separator + "floorplan.json").exists()) {
-            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floorplan.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floor.json", true);
-            FileUtils.copyFile(path + File.separator + "results" + File.separator + "floorplan.json", ConstantFilePath.SCENE_PATH + "data" + File.separator + "data" + num + File.separator + "floorplan.json", true);
-        }
-    }
-
-    private Map<String, String> getUploadFiles(String projectNum,String path,Integer cameraType,JSONObject fdageData) throws Exception {
-        String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, projectNum);
-        String imagesPath = String.format(ConstantFilePath.IMAGE_PATH_FORMAT, projectNum);
-        String videoPath = String.format(ConstantFilePath.VIDEO_PATH_FORMAT, 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 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 != 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 writeSceneJson(JSONObject videosJson, ScenePro scenePro,SceneProEdit sceneProEdit)  throws Exception{
-        String num = scenePro.getNum();
-        String dataViewPath = String.format(ConstantFilePath.DATA_PATH_FORMAT, num);
-        //如果云端没有scene.json文件,生成一份
-
-        JSONObject sceneJson = JSONObject.parseObject(JSONObject.toJSONString(scenePro));
-        sceneJson.put("videos",videosJson.toJSONString());
-        sceneJson.put("version",sceneProEdit.getVersion());
-        sceneJson.put("imagesVersion",sceneProEdit.getImagesVersion());
-        sceneJson.put("floorEditVer",sceneProEdit.getFloorEditVer());
-        sceneJson.put("floorPublishVer",sceneProEdit.getFloorPublishVer());
-        String sceneJsonStr = JSON.toJSONString(sceneJson);
-
-        FileUtils.writeFile(ConstantFilePath.SCENE_PATH + "data/data" + num + File.separator + "scene.json", sceneJsonStr);
-        //上传sceneJson文件
-        fYunFileService.uploadFile(sceneJsonStr.getBytes(), dataViewPath + "scene.json");
-
-        // 上传status JSON.
-        JSONObject statusJson = new JSONObject();
-        //临时将-2改成1,app还没完全更新
-        statusJson.put("status", 1);
-        statusJson.put("webSite", scenePro.getWebSite());
-        statusJson.put("sceneNum", num);
-        statusJson.put("thumb", scenePro.getThumb());
-        statusJson.put("payStatus", scenePro.getPayStatus());
-        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 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 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(ConstantFilePath.DATA_PATH_FORMAT, 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(ConstantFilePath.DATA_PATH_FORMAT, 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(ConstantFilePath.DATA_PATH_FORMAT, 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 ScenePro updateDbPlus(String num, Long space, String videosJson, Long computeTime,boolean isObj){
-        LambdaUpdateWrapper<ScenePro> wrapper = new LambdaUpdateWrapper<ScenePro>()
-                .eq(ScenePro::getNum, num)
-                .set(ScenePro::getStatus, SceneStatus.NO_DISPLAY.code())
-                .set(ScenePro::getUpdateTime, new Date())
-                .set(ScenePro::getCreateTime, new Date())
-                .set(ScenePro::getSpace, space)
-                .set(ScenePro::getComputeTime, computeTime)
-                .set(ScenePro::getVideos, videosJson)
-                .set(ScenePro::getIsObj, isObj ? 1 : 0)
-                .set(ScenePro::getPayStatus, PayStatus.PAY.code());
-
-        if(ModelTypeEnums.TILE_CODE.equals(modelSceneKind)){
-            wrapper.set(ScenePro::getSceneScheme, SceneScheme.LM.code());
-        }
-        sceneProService.update(wrapper);
-       return sceneProService.getByNum(num);
-    }
-
-    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(ConstantFilePath.DATA_PATH_FORMAT, 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);
-    }
-}

+ 0 - 5
src/main/java/com/fdkankan/contro/service/impl/BuildSceneDTServiceImpl.java

@@ -2,9 +2,7 @@ package com.fdkankan.contro.service.impl;
 
 import cn.hutool.core.util.StrUtil;
 import com.fdkankan.contro.service.IBuildSceneDTService;
-import com.fdkankan.dingtalk.DingTalkSendUtils;
 import com.fdkankan.fyun.config.FYunFileConfig;
-import com.taobao.api.ApiException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -36,9 +34,6 @@ public class BuildSceneDTServiceImpl implements IBuildSceneDTService {
     public static final String contentExt = "**algorithm-log**: [%sbuild_log/%s/console.log](%sbuild_log/%s/console.log)";
 
     @Autowired
-    private DingTalkSendUtils dingTalkSendUtils;
-
-    @Autowired
     private FYunFileConfig fYunFileConfig;
 
     @Value("${main.url}")

+ 1 - 3
src/main/java/com/fdkankan/contro/service/impl/CommonServiceImpl.java

@@ -3,10 +3,8 @@ package com.fdkankan.contro.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.util.ObjUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
-import cn.hutool.core.util.StrUtil;
 import cn.hutool.core.util.ZipUtil;
 import cn.hutool.http.HttpUtil;
 import com.alibaba.fastjson.JSON;
@@ -925,7 +923,7 @@ public class CommonServiceImpl implements ICommonService {
                     String detectPath = workDir + subgroup + "/detect.json";
                     sceneMarkShape = sceneMarkShapeService.readDetectJson(detectPath);
                 }
-                if (ObjUtil.isNull(sceneMarkShape)){
+                if (Objects.isNull(sceneMarkShape)){
                     sceneMarkShape = new SceneMarkShape();
                     String infoJsonPath = path + "/results/floorplan/info.json";
                     JSONObject infoObj = JSON.parseObject(FileUtil.readUtf8String(infoJsonPath));