|
@@ -12,6 +12,7 @@ import com.fdkankan.contro.factory.UserEditData.UserEditDataHandlerFactory;
|
|
import com.fdkankan.contro.mq.service.ICommonService;
|
|
import com.fdkankan.contro.mq.service.ICommonService;
|
|
import com.fdkankan.contro.service.*;
|
|
import com.fdkankan.contro.service.*;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
import com.fdkankan.fyun.face.FYunFileServiceInterface;
|
|
|
|
+import com.fdkankan.model.constants.ConstantFilePath;
|
|
import com.fdkankan.model.constants.UploadFilePath;
|
|
import com.fdkankan.model.constants.UploadFilePath;
|
|
import com.fdkankan.model.utils.FloorPlanUserUtil;
|
|
import com.fdkankan.model.utils.FloorPlanUserUtil;
|
|
import com.fdkankan.sms.SendMailAcceUtils;
|
|
import com.fdkankan.sms.SendMailAcceUtils;
|
|
@@ -126,11 +127,11 @@ public class CommonServiceImpl implements ICommonService {
|
|
if(FileUtil.exist(localPanoramaJson)){
|
|
if(FileUtil.exist(localPanoramaJson)){
|
|
fYunFileServiceInterface.uploadFile(localPanoramaJson, ossPanoramaJson);
|
|
fYunFileServiceInterface.uploadFile(localPanoramaJson, ossPanoramaJson);
|
|
}
|
|
}
|
|
- String localLaserPly = dataSource + "/results/laserData/laser.ply";
|
|
|
|
- String ossLaserPly = ossResultPath + "results/laserData/laser.ply";
|
|
|
|
- if(FileUtil.exist(localLaserPly)){
|
|
|
|
- fYunFileServiceInterface.uploadFile(localLaserPly, ossLaserPly);
|
|
|
|
- }
|
|
|
|
|
|
+// String localLaserPly = dataSource + "/results/laserData/laser.ply";
|
|
|
|
+// String ossLaserPly = ossResultPath + "results/laserData/laser.ply";
|
|
|
|
+// if(FileUtil.exist(localLaserPly)){
|
|
|
|
+// fYunFileServiceInterface.uploadFile(localLaserPly, ossLaserPly);
|
|
|
|
+// }
|
|
String localFloorGroupFixJson = dataSource + "/caches/floor_group_fix.json";
|
|
String localFloorGroupFixJson = dataSource + "/caches/floor_group_fix.json";
|
|
String ossFloorGroupFixJson = ossResultPath + "caches/floor_group_fix.json";
|
|
String ossFloorGroupFixJson = ossResultPath + "caches/floor_group_fix.json";
|
|
if(FileUtil.exist(localFloorGroupFixJson)){
|
|
if(FileUtil.exist(localFloorGroupFixJson)){
|
|
@@ -225,4 +226,14 @@ public class CommonServiceImpl implements ICommonService {
|
|
log.error("发送邮件失败,num:" + num, e);
|
|
log.error("发送邮件失败,num:" + num, e);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ public String getOssOrignPath(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;
|
|
|
|
+ }
|
|
}
|
|
}
|