|
|
@@ -118,12 +118,11 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
@Override
|
|
|
public SceneFileBuild findByFileId(String fileId) {
|
|
|
|
|
|
- List<SceneFileBuild> list = this.list(new LambdaQueryWrapper<SceneFileBuild>()
|
|
|
- .eq(SceneFileBuild::getFileId, fileId)
|
|
|
+ List<SceneFileBuild> list = this.list(new LambdaQueryWrapper<SceneFileBuild>().eq(SceneFileBuild::getFileId, fileId)
|
|
|
.orderByDesc(SceneFileBuild::getId));
|
|
|
- if(CollUtil.isEmpty(list))
|
|
|
+ if(CollUtil.isEmpty(list)){
|
|
|
return null;
|
|
|
-
|
|
|
+ }
|
|
|
return list.get(0);
|
|
|
}
|
|
|
|
|
|
@@ -430,51 +429,13 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
|
|
|
if(StrUtil.isNotEmpty(company.getQrLogo())){
|
|
|
- //复制阿里云主服务器的图片到横琴云副服务器中
|
|
|
- // TODO: 2022/7/25 目前v4版本不需要生成带logo的二维码，这里先注释掉 dsx-------------------------------start
|
|
|
-// if(!new File(ConstantFilePath.BASE_PATH + File.separator + company.getQrLogo()).exists()){
|
|
|
-// log.info("下载qrLogo");
|
|
|
-// FileUtils.downLoadFromUrl(mainUrl + company.getQrLogo() + "?t=" + System.currentTimeMillis(),
|
|
|
-// company.getQrLogo().substring(company.getQrLogo().lastIndexOf("/") + 1),
|
|
|
-// ConstantFilePath.BASE_PATH + company.getQrLogo().substring(0, company.getQrLogo().lastIndexOf("/")));
|
|
|
-// }
|
|
|
-//
|
|
|
-// 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",
|
|
|
-// "images/images" + sceneNum + "/QRShareLogo.png");
|
|
|
-// sceneProEdit.setShareLogo("images/images" + sceneNum + "/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");
|
|
|
MatrixToImageWriterUtil.createQRCode(sceneUrl + sceneNum + "&lang=en", ConstantFilePath.BASE_PATH + File.separator + "sceneQRcode/"+sceneNum+"_en.png",
|
|
|
false, ConstantFilePath.SCENE_PATH + "images/images" + sceneNum + "/QRShareLogo.png");
|
|
|
}
|
|
|
-
|
|
|
- // TODO: 2022/7/25 目前v4版本还没开发地面点位log功能，这里先注释掉 dsx-------------------------------start
|
|
|
-// if(StrUtil.isNotEmpty(company.getMarkerLogo())){
|
|
|
-// //复制阿里云主服务器的图片到横琴云副服务器中
|
|
|
-// if(!new File(ConstantFilePath.BASE_PATH + File.separator + company.getMarkerLogo()).exists()){
|
|
|
-// log.info("下载floorLogo");
|
|
|
-// FileUtils.downLoadFromUrl(mainUrl + company.getMarkerLogo() + "?t=" + System.currentTimeMillis(),
|
|
|
-// company.getMarkerLogo().substring(company.getMarkerLogo().lastIndexOf("/") + 1),
|
|
|
-// ConstantFilePath.BASE_PATH + company.getMarkerLogo().substring(0, company.getMarkerLogo().lastIndexOf("/")));
|
|
|
-// }
|
|
|
-//
|
|
|
-// 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",
|
|
|
-// "images/images" + sceneNum + "/marker.png");
|
|
|
-//
|
|
|
-// sceneProEdit.setMarkerLogo("user");
|
|
|
-// jsonMap.put("markerLogo", "user");
|
|
|
-// }
|
|
|
- // TODO: 2022/7/25 目前v4版本还没开发地面点位log功能，这里先注释掉 dsx-------------------------------end
|
|
|
-
|
|
|
sceneEditInfoService.updateById(sceneEditInfo);
|
|
|
-
|
|
|
}
|
|
|
|
|
|
}
|
