|
@@ -56,6 +56,7 @@ import com.google.common.collect.Lists;
|
|
|
import com.google.common.collect.Sets;
|
|
|
import java.io.File;
|
|
|
import java.io.IOException;
|
|
|
+import java.nio.charset.StandardCharsets;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.Calendar;
|
|
|
import java.util.Comparator;
|
|
@@ -213,11 +214,15 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
if (scenePlus == null)
|
|
|
throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
|
|
|
ScenePlusExt scenePlusExt = scenePlusExtService.getScenePlusExtByPlusId(scenePlus.getId());
|
|
|
+ String bucket = scenePlusExt.getYunFileBucket();
|
|
|
|
|
|
List<String> deleteSidList = param.getSidList();
|
|
|
|
|
|
//处理删除状态数据
|
|
|
- this.deleteHotData(param.getNum(), deleteSidList, scenePlusExt.getYunFileBucket());
|
|
|
+ this.deleteHotData(param.getNum(), deleteSidList, bucket);
|
|
|
+
|
|
|
+ //删除导览中的热点数据
|
|
|
+ this.deleteHotDataFromTourJson(param.getNum(), param.getSidList(), bucket);
|
|
|
|
|
|
//写入本地文件,作为备份
|
|
|
this.writeHotJson(param.getNum());
|
|
@@ -230,6 +235,25 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
|
|
|
return ResultData.ok();
|
|
|
}
|
|
|
|
|
|
+ private void deleteHotDataFromTourJson(String num, List<String> sidList, String bucket){
|
|
|
+ String key = String.format(UploadFilePath.USER_EDIT_PATH, num) + "tour.json";
|
|
|
+ String tourJson = fYunFileService.getFileContent(bucket, key);
|
|
|
+ JSONArray jsonArray = JSON.parseArray(tourJson);
|
|
|
+ jsonArray.stream().forEach(tour->{
|
|
|
+ JSONObject obj = (JSONObject) tour;
|
|
|
+ JSONArray itemArra = obj.getJSONArray("list");
|
|
|
+ itemArra.stream().forEach(item->{
|
|
|
+ JSONObject itemObj = (JSONObject) item;
|
|
|
+ String tagId = itemObj.getString("tagId");
|
|
|
+ if(tagId != null && sidList.contains(tagId)){
|
|
|
+ itemObj.remove("tagId");
|
|
|
+ }
|
|
|
+ });
|
|
|
+ });
|
|
|
+ fYunFileService.uploadFile(bucket, jsonArray.toJSONString().getBytes(StandardCharsets.UTF_8), key);
|
|
|
+
|
|
|
+ }
|
|
|
+
|
|
|
@Override
|
|
|
public ResultData deleteIcons(DeleteHotIconParamVO param) throws Exception {
|
|
|
|