|
@@ -88,6 +88,13 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
|
|
|
return Result.failure("上传文件格式有误, 请重新上传");
|
|
|
}
|
|
|
|
|
|
+ // 文件名不能为空
|
|
|
+ String originalFilename = file.getOriginalFilename();
|
|
|
+ originalFilename = StringUtils.substringBeforeLast(originalFilename,".");
|
|
|
+ if (StringUtils.isAllBlank(originalFilename)) {
|
|
|
+ return Result.failure("文件名不能为空");
|
|
|
+ }
|
|
|
+
|
|
|
if (StringUtils.isBlank(hengdaId) || hengdaId.equals("null")) {
|
|
|
log.error("hengdaId不能为空");
|
|
|
return Result.failure("hengdaId不能为空");
|
|
@@ -120,7 +127,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
|
|
|
return Result.failure(7001, "非图片类型");
|
|
|
}
|
|
|
|
|
|
- // inputStream = file.getInputStream(); 出来后用会拿不到流
|
|
|
if (!FileUtils.checkScale(file.getInputStream())) {
|
|
|
log.error("图片比例非2:1");
|
|
|
return Result.failure(7007, "图片比例非2:1");
|
|
@@ -167,8 +173,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
|
|
|
entity.setType(sceneType);
|
|
|
entity.setHengdaId(hengdaId);
|
|
|
// 出来文件名不要后缀
|
|
|
- String originalFilename = file.getOriginalFilename();
|
|
|
- originalFilename = StringUtils.substringBeforeLast(originalFilename,".");
|
|
|
+
|
|
|
+
|
|
|
entity.setFileName(originalFilename);
|
|
|
entity.setSceneTitle(entity.getFileName());
|
|
|
|
|
@@ -177,27 +183,6 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
|
|
|
log.info("webSite: " + webSite);
|
|
|
entity.setWebSite(webSite);
|
|
|
|
|
|
-// log.info("更新hengdaId到管理后台");
|
|
|
-// // 更新到VR项目
|
|
|
-// HouseSceneIndexDto houseSceneIndexDto = new HouseSceneIndexDto();
|
|
|
-// houseSceneIndexDto.setId(houseId);
|
|
|
-// houseSceneIndexDto.setSceneNum(entity.getSceneCode());
|
|
|
-// houseSceneIndexDto.setUpdateTime(LocalDateTime.now());
|
|
|
-// houseSceneIndexDto.setFcbHouseId(hengdaId);
|
|
|
-// Result result = houseFeign.updateHouseSceneIndex(houseSceneIndexDto);
|
|
|
-//
|
|
|
-//
|
|
|
-// if (result.getCode() == 0) {
|
|
|
-// log.info("新场景码到VR项目完成");
|
|
|
-// } else {
|
|
|
-// log.error("新场景码到VR项目异常");
|
|
|
-// return Result.failure(result.getMsg());
|
|
|
-// }
|
|
|
-// log.info("result: " + result.toString());
|
|
|
-//
|
|
|
-// log.info("更新初始场景到VR项目完成");
|
|
|
-
|
|
|
-
|
|
|
this.save(entity);
|
|
|
|
|
|
//发消息到mq
|
|
@@ -288,8 +273,8 @@ public class SceneServiceImpl extends IBaseServiceImpl<SceneEntity, String> impl
|
|
|
startPage(param);
|
|
|
List<SceneEntity> search = entityMapper.search(param);
|
|
|
PageInfo<SceneEntity> page = new PageInfo<>(search);
|
|
|
- log.info("page size: " + page.getSize());
|
|
|
- log.info("page total: " + page.getTotal());
|
|
|
+// log.info("page size: " + page.getSize());
|
|
|
+// log.info("page total: " + page.getTotal());
|
|
|
|
|
|
JSONObject result = new JSONObject();
|
|
|
result.put("code", 0);
|