|
|
@@ -567,10 +567,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
|
|
|
String icon = null;
|
|
|
if(jsonObject.containsKey("icon") && StrUtil.isNotEmpty(jsonObject.getString("icon"))){
|
|
|
- fYunFileService.downloadFile(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"), filePath);
|
|
|
+ fYunFileService.copyFileInBucket(ConstantFilePath.OSS_PREFIX + prefix + jsonObject.getString("icon"),imageViewPath + jsonObject.getString("icon"));
|
|
|
icon = fYunFileConfig.getHost() + imageViewPath + jsonObject.getString("icon");
|
|
|
- fYunFileService.uploadFile(filePath + jsonObject.getString("icon"), imageViewPath + jsonObject.getString("icon"));
|
|
|
-
|
|
|
log.info("上传icon成功....");
|
|
|
}
|
|
|
|
|
|
@@ -639,9 +637,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
|
|
|
log.info("复制企业logo");
|
|
|
SceneEditInfo sceneEditInfo = sceneEditInfoService.getByScenePlusId(scenePlusVO.getId());
|
|
|
-// SceneProEdit sceneProEdit = sceneProEditService.findByProId(scene.getId());
|
|
|
-// SceneProEditExt sceneProEditExt = sceneProEditExtService.getByProEditId(sceneProEdit.getId());
|
|
|
-
|
|
|
|
|
|
if(StrUtil.isNotEmpty(company.getTopLogo())){
|
|
|
FileUtils.copyFile(ConstantFilePath.BASE_PATH + File.separator + company.getTopLogo(),localImagesPath + "logo-main.png", true);
|
|
|
@@ -660,22 +655,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
|
|
|
if(StrUtil.isNotEmpty(company.getQrLogo())){
|
|
|
-
|
|
|
- // TODO: 2022/7/25 目前v4版本不需要生成带logo的二维码，这里先注释掉 dsx-------------------------------start
|
|
|
-// FileUtils.copyFile(ConstantFilePath.BASE_PATH + File.separator + company.getQrLogo(),
|
|
|
-// ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png", true);
|
|
|
-//
|
|
|
-// uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png",
|
|
|
-// imageViewPath + "QRShareLogo.png");
|
|
|
-//
|
|
|
-// // TODO: 2022/1/24 暂时保留旧版本，系统稳定后删除
|
|
|
-// uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png",
|
|
|
-// "images/images" + sceneNum + "/QRShareLogo.png");
|
|
|
-//
|
|
|
-//// sceneProEdit.setShareLogo("images/images" + sceneNum + "/QRShareLogo.png");//旧系统代码，先保留
|
|
|
-// sceneProEdit.setShareLogo(imageViewPath + "QRShareLogo.png");
|
|
|
- // TODO: 2022/7/25 目前v4版本不需要生成带logo的二维码，这里先注释掉 dsx-------------------------------end
|
|
|
-
|
|
|
//生成新的分享的二维码-中文版本
|
|
|
MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneNum, ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+sceneNum+".png",
|
|
|
false, ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png");
|
|
|
@@ -684,22 +663,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
false, ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png");
|
|
|
}
|
|
|
|
|
|
- // TODO: 2022/7/25 目前v4版本还没开发地面点位log功能，这里先注释掉 dsx-------------------------------start
|
|
|
-// if(StrUtil.isNotEmpty(company.getMarkerLogo())){
|
|
|
-// FileUtils.copyFile(ConstantFilePath.BASE_PATH + File.separator + company.getMarkerLogo(),
|
|
|
-// ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/marker.png", true);
|
|
|
-// uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/marker.png",
|
|
|
-// imageViewPath + "marker.png");
|
|
|
-//
|
|
|
-// // TODO: 2022/1/24 暂时保留旧版本，系统稳定后删除
|
|
|
-// uploadToOssUtil.upload(ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/marker.png",
|
|
|
-// "images/images" + sceneNum + "/marker.png");
|
|
|
-//
|
|
|
-// sceneProEdit.setMarkerLogo("user");
|
|
|
-// jsonMap.put("markerLogo", "user");
|
|
|
-// }
|
|
|
- // TODO: 2022/7/25 目前v4版本还没开发地面点位log功能，这里先注释掉 dsx-------------------------------end
|
|
|
-
|
|
|
sceneEditInfoService.updateById(sceneEditInfo);
|
|
|
}
|
|
|
|
