|
|
@@ -215,6 +215,7 @@ public class SceneDrawServiceImpl implements ISceneDrawService {
|
|
|
List<TagBean> shapeList = shapesReps.stream().map(v -> {
|
|
|
TagBean tagBean = new TagBean();
|
|
|
tagBean.setCreateTime(v.getDate("updateTime").getTime());
|
|
|
+ v.remove("createTime");
|
|
|
tagBean.setTag(v);
|
|
|
return tagBean;
|
|
|
}).collect(Collectors.toList());
|
|
|
@@ -257,15 +258,13 @@ public class SceneDrawServiceImpl implements ISceneDrawService {
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public void publicSceneDraw(String sceneNum, String bucket) throws IOException {
|
|
|
- String Key = String.format(RedisKey.SCENE_DRAW, sceneNum);
|
|
|
+ public void publicSceneDraw(String sceneNum, String bucket) throws Exception {
|
|
|
String userEditPath = String.format(UploadFilePath.USER_EDIT_PATH, sceneNum) + SCENE_DRAW_JSON_NAME;
|
|
|
- List<String> list = redisUtil.hgetValues(Key);
|
|
|
+ List<JSONObject> list = this.listSceneDraw(sceneNum);
|
|
|
if(CollUtil.isEmpty(list)){
|
|
|
fYunFileService.deleteFile(bucket, userEditPath);
|
|
|
return;
|
|
|
}
|
|
|
- List<JSONObject> collect = list.stream().map(str -> JSON.parseObject(str)).collect(Collectors.toList());
|
|
|
- fYunFileService.uploadFile(bucket, JSON.toJSONString(collect).getBytes(), userEditPath);
|
|
|
+ fYunFileService.uploadFile(bucket, JSON.toJSONString(list).getBytes(), userEditPath);
|
|
|
}
|
|
|
}
|