1

pom.xml

@@ -21,12 +21,6 @@
 
         <dependency>
             <groupId>com.fdkankan</groupId>
-            <artifactId>4dkankan-utils-model</artifactId>
-            <version>3.0.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>com.fdkankan</groupId>
             <artifactId>4dkankan-utils-fyun-oss</artifactId>
             <version>3.0.0-SNAPSHOT</version>
         </dependency>

src/main/java/com/fdkankan/ucenter/common/constants/UploadFilePath.java

@@ -16,8 +16,6 @@ public class UploadFilePath {
 
     public static final String DOWNLOADS_QRCODE = "downloads/scene/%s/QRcode/";
 
-    public static final String IMG_VIEW_PATH =  "scene_view_data/%s/images/";
-
 
 
 }

src/main/java/com/fdkankan/ucenter/controller/SceneController.java

@@ -50,8 +50,6 @@ public class SceneController extends BaseController {
     ISceneCooperationService sceneCooperationService;
     @Autowired
     ISceneService sceneService;
-    @Autowired
-    IScenePlusService scenePlusService;
 
     @PostMapping("/findSceneNumber")
     public Result findSceneNumber(){
@@ -165,15 +163,6 @@ public class SceneController extends BaseController {
         return sceneUpgradeToV4Service.getUpgradeToV4Progress(num);
     }
 
-    /**
-     *
-     * 分页查询存在houseType文件的场景
-     */
-    @PostMapping("/pageSceneWithHouseType")
-    public Result pageSceneWithHouseType(@RequestBody RequestScene param){
-        return scenePlusService.pageSceneWithHouseType(param);
-    }
-
 
 
 }

src/main/java/com/fdkankan/ucenter/entity/ScenePlus.java

@@ -92,12 +92,6 @@ public class ScenePlus implements Serializable {
     private Integer recommend;
 
     /**
-     * 是否有housetype文件（0-否，1-是）
-     */
-    @TableField("house_type")
-    private Integer houseType;
-
-    /**
      * 创建时间
      */
     @TableField("create_time")

src/main/java/com/fdkankan/ucenter/service/IScenePlusService.java

@@ -1,7 +1,6 @@
 package com.fdkankan.ucenter.service;
 
 import com.fdkankan.ucenter.common.PageInfo;
-import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.CameraDetail;
 import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
@@ -41,6 +40,4 @@ public interface IScenePlusService extends IService<ScenePlus> {
     Long copyV4Scene(ScenePlus scenePlus,String newNum, CameraDetail cameraDetail,String time) throws IOException, Exception;
 
     List<ScenePlus> getByIds(List<Long> plusIds);
-
-    Result pageSceneWithHouseType(RequestScene param);
 }

src/main/java/com/fdkankan/ucenter/service/impl/ScenePlusServiceImpl.java

@@ -5,16 +5,12 @@ import cn.hutool.core.util.StrUtil;
 import com.alibaba.fastjson.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.common.constant.CommonStatus;
 import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.image.MatrixToImageWriterUtil;
-import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.ucenter.common.OssPath;
 import com.fdkankan.ucenter.common.PageInfo;
-import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.common.constants.ConstantFilePath;
 import com.fdkankan.ucenter.common.constants.UploadFilePath;
 import com.fdkankan.redis.constant.RedisKey;
@@ -26,16 +22,12 @@ import com.fdkankan.ucenter.mapper.IScenePlusMapper;
 import com.fdkankan.ucenter.service.*;
 
 import java.io.File;
-import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
-import java.util.stream.Collectors;
 
-import com.fdkankan.ucenter.util.RoamingPointUtil;
 import com.fdkankan.ucenter.vo.ResponseScene;
 import com.fdkankan.ucenter.vo.SceneEditControlsVO;
 import com.fdkankan.ucenter.vo.request.RequestScene;
-import com.fdkankan.ucenter.vo.response.SceneVo;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
@@ -55,9 +47,6 @@ import javax.annotation.Resource;
 @Slf4j
 public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlus> implements IScenePlusService {
 
-    @Value("${fyun.host}")
-    private String fyunHost;
-
     @Autowired
     private IScenePlusExtService scenePlusExtService;
     @Autowired
@@ -311,48 +300,4 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
         });
         return scenePlus.getId();
     }
-
-    @Override
-    public Result pageSceneWithHouseType(RequestScene param) {
-        Page<ScenePlus> page = this.page(new Page<>(param.getPageNum(), param.getPageSize()),
-                new LambdaQueryWrapper<ScenePlus>().eq(ScenePlus::getHouseType, CommonStatus.YES.code().intValue()));
-        List<SceneVo> records = null;
-        if(page.getRecords().size() > 0){
-            records = page.getRecords().parallelStream().map(plus -> {
-                return SceneVo.builder().createTime(plus.getCreateTime())
-                        .id(plus.getId()).roamingPointUrl(this.createRoamingPoint(plus.getNum())).sceneName(plus.getTitle())
-                        .num(plus.getNum()).updateTime(plus.getUpdateTime()).userId(plus.getUserId()).build();
-            }).collect(Collectors.toList());
-        }
-
-        PageInfo pageInfo = PageInfo.PageInfo(page);
-        pageInfo.setList(records);
-
-        return Result.success(pageInfo);
-    }
-
-    private String createRoamingPoint(String num){
-        String roamingPointOssPath = String.format(UploadFilePath.DATA_VIEW_PATH, num) + "roamingPoint.json";
-        String url = null;
-        try {
-            if(!fYunFileServiceInterface.fileExist(roamingPointOssPath)){
-                String visionModeldataPath = ConstantFilePath.SCENE_V4_PATH + num + File.separator + "vision.modeldata";
-                String visionModeldataOssPath = String.format(UploadFilePath.IMG_VIEW_PATH, num) + "vision.modeldata";
-                fYunFileServiceInterface.downloadFile(visionModeldataOssPath, visionModeldataPath);
-                String visionTxtLocalPath = ConstantFilePath.SCENE_V4_PATH + num + File.separator + "vision.txt";
-                CreateObjUtil.convertVisionmodeldataToTxt(visionModeldataPath, visionTxtLocalPath);
-                String roamingPoint = RoamingPointUtil.createRoamingPoint(num, visionTxtLocalPath);
-                if (StrUtil.isNotEmpty(roamingPoint)) {
-                    fYunFileServiceInterface.uploadFile(roamingPoint.getBytes(StandardCharsets.UTF_8), roamingPointOssPath);
-                    url = fyunHost + roamingPointOssPath;
-                }
-            }else{
-                url = fyunHost + roamingPointOssPath;
-            }
-        }catch (Exception e){
-            log.warn("生成roamingPointJson出错，num:" + num, e);
-        }
-
-        return url;
-    }
 }

src/main/java/com/fdkankan/ucenter/service/impl/SceneProServiceImpl.java

@@ -1158,7 +1158,6 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 || !new File(path + "/caches/images").exists()
                 || !new File(path + "/caches/depthmap").exists()
                 || !new File(path + "/caches/depthmap_csc").exists()
-                || !new File(path + "/caches/floor_group_fix.json").exists()
                 || !new File(path + "/caches/panorama.json").exists()
                 || !new File(path + "/results/laserData/laser.ply").exists()) {
             log.error("生成obj缺少必要文件，生成失败！");

src/main/java/com/fdkankan/ucenter/util/RoamingPointUtil.java

@@ -1,47 +0,0 @@
-package com.fdkankan.ucenter.util;
-
-import cn.hutool.core.io.FileUtil;
-import com.alibaba.fastjson.JSON;
-import com.alibaba.fastjson.JSONArray;
-import com.alibaba.fastjson.JSONObject;
-import com.fdkankan.common.util.FileUtils;
-import com.fdkankan.ucenter.common.constants.ConstantFilePath;
-import lombok.extern.slf4j.Slf4j;
-
-import java.io.File;
-import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-@Slf4j
-public class RoamingPointUtil {
-
-    public static String createRoamingPoint(String num, String visionTxtPath){
-
-        if(!FileUtil.exist(visionTxtPath)){
-            return null;
-        }
-        JSONObject visionJson = JSON.parseObject(FileUtil.readUtf8String(visionTxtPath));
-
-        JSONArray sweepArray = visionJson.getJSONArray("sweepLocations");
-        List<JSONObject> roamingPoint = new ArrayList<>();
-        for (int i = 0; i < sweepArray.size(); i++) {
-            JSONObject objectJson = sweepArray.getJSONObject(i);
-            JSONObject newJson = new JSONObject();
-            newJson.put("uuid", objectJson.getString("uuid"));
-            JSONObject puck = objectJson.getJSONObject("puck");
-            puck.put("y", puck.getDoubleValue("y"));
-            puck.remove("z");
-            newJson.put("puck", puck);
-            newJson.put("subgroup", objectJson.getString("subgroup"));
-            roamingPoint.add(newJson);
-        }
-        Map<String, List<JSONObject>> subgroup = roamingPoint.stream().collect(
-                Collectors.groupingBy(x -> x.getString("subgroup"))).entrySet().stream()
-                .collect(Collectors.toMap(e -> "floor" + e.getKey(), Map.Entry::getValue));
-        return JSON.toJSONString(subgroup);
-    }
-
-}

src/main/java/com/fdkankan/ucenter/vo/response/SceneVo.java

@@ -1,15 +1,9 @@
 package com.fdkankan.ucenter.vo.response;
 
 import com.fdkankan.ucenter.util.DateUserUtil;
-import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
-import lombok.NoArgsConstructor;
 
 @Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
 public class SceneVo {
 
     private Long id;
@@ -50,8 +44,6 @@ public class SceneVo {
     private String shootCount;
     private String space;
     private String recommend;
-    private String roamingPointUrl;
-    private String updateTime;
 
     public String getCreateTime() {
         return DateUserUtil.getDayTime(createTime);