场景中心 业务迁移

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneEditController.java

@@ -32,39 +32,32 @@ public class SceneEditController extends BaseController {
         return sceneProService.saveSceneInfo(param);
     }
 
-//    /**
-//     * 单独保存tourList
-//     * @return
-//     */
-//    @ApiOperation("单独保存tourList")
-//    @CheckCurrentUser(description = "单独保存tourList")
-//    @RequestMapping(value = "/saveTourList", method = RequestMethod.POST)
-//    @ApiImplicitParams({
-//            @ApiImplicitParam(name = "sceneNum", value = "场景编码", dataType = "String"),
-//            @ApiImplicitParam(name = "tourList", value = "tourList", dataType = "String"),
-//            @ApiImplicitParam(name = "screencapLen", value = "screenCapLen", dataType = "String")})
-//    public Result saveTourList(HttpServletRequest request, HttpServletResponse response) throws Exception {
-//        RequestSceneEdit base = new RequestSceneEdit();
-//        base.setSceneNum(request.getParameter("sceneNum"));
-//        base.setTourList(request.getParameter("tourList"));
-//        base.setScreencapLen(request.getParameter("screencapLen"));
-//        return sceneProService.saveTourList(base);
-//    }
-//
+    /**
+     * 单独保存tourList
+     * @return
+     */
+    /**
+     *
+     * @param base
+     * @return
+     * @throws Exception
+     */
+    @RequestMapping(value = "/saveTourList", method = RequestMethod.POST)
+    public ResultData saveTourList(@RequestBody SceneEditVO base) throws Exception {
+        return sceneProService.saveTourList(base);
+    }
+
 //    /**
 //     * 删除导览
 //     * @return
 //     */
-//    @ApiOperation("删除导览")
-//    @CheckCurrentUser(description = "删除导览")
 //    @RequestMapping(value = "/deleteScreencap", method = RequestMethod.POST)
-//    @ApiImplicitParam(name = "sceneNum", value = "场景编码", dataType = "String")
 //    public Result deleteScreencap(HttpServletRequest request, HttpServletResponse response) throws Exception {
 //        RequestSceneEdit base = new RequestSceneEdit();
 //        base.setSceneNum(request.getParameter("sceneNum"));
 //        return sceneProService.deleteScreencap(base);
 //    }
-//
+
 //    /**
 //     * 删除录屏音频文件
 //     * @return

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/TestController.java

@@ -3,7 +3,6 @@ package com.fdkankan.scene.controller;
 import com.alibaba.druid.pool.DruidDataSource;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
 import com.fdkankan.mq.message.BuildSceneMqMessage;
 import com.fdkankan.mq.util.RocketMQProducer;

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -1479,18 +1479,12 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         if(scenePro == null){
             throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
         }
-        StringBuffer dataBuf = new StringBuffer()
-                .append("data").append(File.separator)
-                .append("data").append(scenePro.getSceneCode())
-                .append(File.separator);
-
-        StringBuffer dataBuffer = new StringBuffer(ConstantFilePath.SCENE_PATH).append(dataBuf.toString());
-
         log.info("editScene/saveTourList：生成tourList.json文件");
-        String tourListPath = dataBuffer.toString() + ConstantFileName.TOUR_LIST;
+        String tourListPath = String.format(ConstantFilePath.TOURLIST_PATH_FORMAT, scenePro.getSceneCode());
         FileUtils.writeFile(tourListPath, base.getTourList());
 
-        String strsceneInfos = FileUtils.readFile(dataBuffer.toString() + "scene.json");
+        String sceneJsonPath = String.format(ConstantFilePath.SCENE_PATH_FORMAT, scenePro.getSceneCode());
+        String strsceneInfos = FileUtils.readFile(sceneJsonPath);
         JSONObject scenejson = new JSONObject();
         if(strsceneInfos!=null) {
             scenejson = JSONObject.parseObject(strsceneInfos);
@@ -1500,7 +1494,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         map.put("screencapLen", String.valueOf(base.getScreencapLen()));
         map.put("uploadTourList", 1);
         map.put("version", scenejson.getIntValue("version")+1);
-        FileUtils.writeJsonFile(dataBuffer.toString() + "scene.json", map);
+        FileUtils.writeJsonFile(sceneJsonPath, map);
 
         return ResultData.ok();
     }

4dkankan-center-scene/src/test/java/com/fdkankan/scene/SceneApplicationTests.java

@@ -1,15 +1,12 @@
 package com.fdkankan.scene;
 
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.util.MatrixToImageWriterUtil;
-import com.fdkankan.scene.entity.Folder;
 import com.fdkankan.scene.service.IFolderService;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 
 import java.io.File;
-import java.util.List;
 
 @SpringBootTest
 class ApplicationTests {

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantCmd.java

@@ -1,52 +0,0 @@
-package com.fdkankan.common.constant;
-
-public class ConstantCmd {
-
-	//生成模型的命令
-	public static final String BUILD_MODEL_COMMAND = "bash /home/ubuntu/bin/Launcher.sh ";
-
-	//生成模型的命令
-	public static final String BUILD_MODEL_COMMAND2 = "bash /opt/ossutil/sshoss.sh ";
-
-	public static final String BUILD_MODEL_OLD_COMMAND = "bash /home/ubuntu/bin_old/Launcher.sh ";
-	public static final String BUILD_MODEL_SFM_COMMAND = "bash /home/ubuntu/run_sfm.sh ";
-
-	public static final String OBJ_TO_TXT = "bash /home/ubuntu/bin_old/obj2txt.sh ";
-
-	public static final String REBUILD_MODEL_FLLOR = "bash /home/ubuntu/bin/Panoramix_Floorplan.sh ";
-	//切图命令
-	public static final String CUT_IMG_COMMAND = "bash /home/ubuntu/OpenSfM/bin/run_cube.sh ";
-	//调整图片的命令
-	public static final String ADJUST_IMG_COMMAND = "/home/ubuntu/OpenSfM/bin/run_skybox ";
-	  
-	  
-	  
-	//转台拼图命令
-	public static final String BUILD_PANORAMA = "AutopanoGiga /home/ubuntu/data/";
-	//六目，拼图，计算，切图（二代）
-	public static final String BUILD_FOR_SIX = "bash /home/ubuntu/run_all_m6.sh ";
-
-	//合并音频
-	public static final String MERGE_VIDEO = "bash /monchickey/ffmpeg/bin/ff_synthesis.sh ";
-
-	//生成一段静音音频
-	public static final String CREATE_MUTE_VIDEO = "bash /monchickey/ffmpeg/bin/ff_mtue.sh ";
-
-	//将mp4文件转换成flv
-	public static final String MP4_TO_FLV = "bash /monchickey/ffmpeg/bin/ff_mp4TOflv.sh ";
-
-	//删除/mnt/data/下的数据脚本
-	public static final String DELETE_FILE = "bash /monchickey/ffmpeg/bin/delete.sh ";
-
-	public static final String OSS_UTIL_CP ="bash /opt/ossutil/oss.sh ";
-
-	public static final String OSS_FILE_CP = "bash /opt/ossutil/file.sh ";
-
-	public static final String MATTERPRO_CUT_IMG = "node /opt/4dkankan_scene/index.js ";
-
-	//激光相机 extra迁移
-	public static final String CP_JG_EXTRA = "bash /opt/ossutil/laser-copy.sh ";
-
-	public static final String CP_JG_ALL = "bash /opt/ossutil/laser-cp-r.sh ";
-
-}

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantFileName.java

@@ -1,39 +0,0 @@
-package com.fdkankan.common.constant;
-
-public class ConstantFileName {
-    //背景音乐
-    public static final String BACKGROUND_MUSIC = "bg.mp3";
-    //编辑页面，第二代
-    public static final String MODEL_DATAFILE = "modeldata.json";
-    public static final String HOT_DATAFILE = "hot.json";
-    public static final String MEDIA_DATAFILE = "mediaInfo.json";
-    public static final String SCREEN_CRP_DATAFILE = "screenCap";
-    //导览（一代）
-    public static final String GUIDE_DATAFILE = "tour.json";
-
-    //文件夹名称
-    public static final String GUIDE_MEDIA_FOLDER = "guide";
-    public static final String HOT_MEDIA_FOLDER = "hot";
-    public static final String OTHER_MEDIA_FOLDER = "other";
-
-    //论坛过滤文档
-    public static final String BBS_SENSITIVE = "SensitiveWord.txt";
-    public static final String LOGO_NAME = "logo.jpg";
-
-    //app部分
-    public static final String APP_FOLDER = "appupload";
-
-    public static final String FLOOR_LOGO_PIC_NAME = "floorLogoImg.png";
-
-    public static final String TOUR_LIST = "tourList.json";
-    public static final String VOICE_NAME = "201810";
-    public static final String WECHAT_VOICE_NAME = "wechat";
-    public static final String APP_VOICE_NAME = "app";
-
-    public static final String TOURLIST_FOLDER = "tour";
-    //public static final String TEMPFILES = "tempFiles";
-
-    public static final String modelUUID = "dacf7dfa24ae47fab8fcebfe4dc41ab9";
-
-    public static final String BUCKET_NAME = "4dkankan";
-}

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantFilePath.java

@@ -1,54 +0,0 @@
-package com.fdkankan.common.constant;
-
-import org.springframework.beans.factory.annotation.Value;
-import org.springframework.stereotype.Component;
-
-@Component
-public class ConstantFilePath {
-    public static final String BASE_PATH = "/mnt/4Dkankan";
-    //论坛上传图片后，服务器存放的地址
-    public static final String BBS_IMAGES_PATH = "/mnt/4Dkankan/bbs/upload/image/";
-    // 用户上传图片
-    public static final String USER_IMAGES_PATH = "/mnt/4Dkankan/user/";
-    // 图片暂存地址（创建二维码等）
-    public static final String TEMP_IMAGES_PATH = "/mnt/4Dkankan/temp/upload/image/";
-    // 场景
-    public static final String SCENE_PATH = "/mnt/4Dkankan/scene/";
-    // 代理商
-    public static final String AGENT_PATH = "/mnt/4Dkankan/agent/";
-    //电子发票
-    public static final String INVOICE_PATH = "/mnt/4Dkankan/invoice/";
-    // 场景二维码
-    public static final String SCENE_QR_CODE_PATH = "/mnt/4Dkankan/sceneQRcode/";
-    // excel
-    public static final String EXCEL_PATH = "/mnt/4Dkankan/excel/";
-//    public static final String EXCEL_PATH = "F:\\excel\\";
-    // medias
-    public static final String MEDIAS_PATH = "/mnt/4Dkankan/medias/";
-    // logo
-    public static final String LOGO_PATH = "/mnt/4Dkankan/logo/";
-    // login qr code
-    public static final String LOGIN_QR_CODE_PATH = "/mnt/4Dkankan/login/qrcode/";
-
-    public static final String WEIXIN_CERT = "/mnt/home/ubuntu/user/apiclient_cert.p12";
-
-    public static final String PREFIX = "/home/user";
-    public static final String CREATE_MODEL_PATH = PREFIX + "/photo_data/model/";
-    //大场景
-    public static final String CREATE_BIG_SCENE_PATH = PREFIX + "/photo_data/bigscene/";
-    //生成模型的路径
-    public static final String BUILD_MODEL_PATH = "/mnt/data/";
-    //生成模型的路径
-    public static String BUILD_MODEL_LASER_PATH ="/mnt-laser/data/";
-
-    //支付二维码图片存放路径
-    public static final String ALI_QRCODE_FOLDER = "/mnt/4Dkankan/alicode/";
-    public static final String WEIXIN_QRCODE_FOLDER = "/mnt/4Dkankan/weixincode/";
-
-    public static final String OSS_PREFIX = "home/";
-
-    @Value("${file.route.hardDiskLaser:/mnt-laser/data/}")
-    public void setHardDiskLaser(String value){
-        ConstantFilePath.BUILD_MODEL_LASER_PATH = value;
-    }
-}

4dkankan-common/src/main/java/com/fdkankan/common/constant/ConstantUrl.java

@@ -1,29 +0,0 @@
-package com.fdkankan.common.constant;
-
-public class ConstantUrl {
-
-//	public static final String MAIN_URL = "https://www.4dkankan.com/";
-//	public static final String MAIN_URL = "http://120.79.15.136:8086/";
-//	public static final String MAIN_URL2 = "https://www.4dkankan.com/";
-//	public static final String DEFAULT_USER_HEAD = "https://scene3d.4dage.com/head.png";
-	public static final String DEFAULT_USER_HEAD = "https://4dkk.4dage.com/newHead.png";
-	public static final String BBS_TOUPLOAD = "https://scene3d.4dage.com/model/upload/image/";
-	public static final String DEFAULT_PREFIX_QINIU_PIC = "http://orw69myb5.bkt.clouddn.com/";
-	public static final String DEFAULT_SCENE_PIC="https://4dkk.4dage.com/loading/thumb.jpg";
-//	public static final String SCENE_URL = MAIN_URL + "show.html?m=";
-//	public static final String SCENE_URL2 = MAIN_URL + "showV2.html?m=";
-
-//	public static final String PRO_SCENE_URL = MAIN_URL + "showProMobile.html?m=";
-	public static final String PREFIX_ALI = "https://4dkk.4dage.com/";
-	//亚马逊S3
-	public static final String PREFIX_AWS = "https://testeurs3.4dkankan.com/";
-	public static final String PREFIX_QINIU = "https://scene3d.4dage.com/";
-	public static final String PREFIX_QINIU2 = "https://creator.4dkankan.com/";
-	public static final String WEIXIN_PAYURL = "https://www.4dkankan.com/weixinmobilepay/weixinInfo?orderId=";
-	public static final String WEIXIN_TOKEN_URL1 = "https://api.weixin.qq.com/sns/oauth2/access_token?appid=";
-	public static final String WEIXIN_TOKEN_URL2 = "https://api.weixin.qq.com/sns/userinfo?access_token=";
-	public static final String WEIXIN_MOBILE_PAY_URL = "mobile.html#/pay?timeStamp=";
-	public static final String WEIXIN_NOTIFY_URL = "https://www.4dkankan.com/weixinpay/Notify";
-	public static final String WEIXIN_ORDER_URL="https://api.mch.weixin.qq.com/pay/unifiedorder";
-
-}