添加四维看看重算场景是，修改激光场景状态为不可以状态

laser/src/main/java/com/fdkankan/indoor/core/controller/SceneController.java

@@ -4,6 +4,7 @@ import com.fdkankan.indoor.base.aop.WebControllerLog;
 import com.fdkankan.indoor.base.util.Result;
 import com.fdkankan.indoor.core.entity.dto.PageDto;
 import com.fdkankan.indoor.core.entity.dto.SceneAgePageDto;
+import com.fdkankan.indoor.core.service.InitService;
 import com.fdkankan.indoor.core.service.SceneService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -23,22 +24,31 @@ public class SceneController {
     @Autowired
     SceneService sceneService;
 
+    @Autowired
+    InitService initService;
+
 
-    @WebControllerLog(description = "场景接口-列表")
+    @WebControllerLog(description = "场景接口-列表（过滤计算中场景、数据集）")
     @ApiOperation(value = "列表")
     @PostMapping("indoor/scene/list")
     public Result list(@RequestBody PageDto param){
         return sceneService.list(param);
     }
 
-//    @WebControllerLog(description = "场景接口-创建30万个场景码")
-//    @ApiOperation(value = "创建30万个场景码")
-//    @GetMapping("batchSceneCod")
-//    public Object batchSceneCod(){
-//        Result search = sceneService.batchSceneCod();
-//        return search.getData();
-//    }
+    @WebControllerLog(description = "场景接口-修改场景为计算中(四维看看调用), status:0(场景计算中)")
+    @ApiOperation(value = "修改场景为计算中")
+    @GetMapping("indoor/{sceneCode}/scene/useStatus/{useStatus}")
+    public Result updateByUseStatus(@PathVariable String sceneCode, @PathVariable Integer useStatus){
+        return sceneService.updateByUseStatus(sceneCode, useStatus);
+    }
 
 
+    @WebControllerLog(description = "场景接口-查询场景详情")
+    @ApiOperation(value = "查询场景详情")
+    @GetMapping("indoor/{sceneCode}/scene/getInfo")
+    public Result getInfo(@PathVariable String sceneCode){
+        return Result.success(initService.findById(sceneCode));
+    }
+
 
 }

laser/src/main/java/com/fdkankan/indoor/core/controller/TiledMapController.java

@@ -76,7 +76,7 @@ public class TiledMapController {
 
 
     @WebControllerLog(description = "平面图-上传平面图")
-    @ApiOperation(value = "上传平面图", notes = "只支持zip, 压缩文件不能包含目录")
+    @ApiOperation(value = "上传平面图")
     @PostMapping("indoor/{sceneCode}/api/tiled_maps/upload")
     public Result upload(@PathVariable String sceneCode, MultipartFile file){
         return entityMap.upload2(sceneCode, file);

laser/src/main/java/com/fdkankan/indoor/core/entity/InitEntity.java

@@ -57,4 +57,8 @@ public class InitEntity {
     @ApiModelProperty(value = "(用户名)手机号")
     private String userName;
 
+    @ApiModelProperty(value = "状态, 1:可用(默认状态)， 0：(计算中)")
+    private Integer useStatus;
+
+
 }

laser/src/main/java/com/fdkankan/indoor/core/entity/MergeInfoEntity.java

@@ -30,8 +30,10 @@ public class MergeInfoEntity extends BaseEntity {
     @ApiModelProperty(value = "合并的场景码title")
     private String title;
 
-    @ApiModelProperty(value = "是否显示：0：不显示， 1：显示")
+    @ApiModelProperty(value = "(平面图)是否显示：0：不显示， 1：显示")
     private Integer display;
 
 
+
+
 }

laser/src/main/java/com/fdkankan/indoor/core/mapper/MergeInfoMapper.java

@@ -28,4 +28,6 @@ public interface MergeInfoMapper extends MongoRepository<MergeInfoEntity, String
     MergeInfoEntity findBySceneCodeAndDataSetId(String sceneCode, Integer dataSetId);
 
     List<MergeInfoEntity> findBySceneCode(String sceneCode);
+
+//    List<MergeInfoEntity> findBySceneCodeAndDisplayAndStatus(String sceneCode, Integer display, Integer status);
 }

laser/src/main/java/com/fdkankan/indoor/core/service/MergeInfoService.java

@@ -26,4 +26,6 @@ public interface MergeInfoService {
     void removeBySceneCode(String sceneCode);
 
     MergeInfoEntity findBySceneCodeAndDataSetId(String sceneCode, Integer dataSetId);
+
+//    List<MergeInfoEntity> findBySceneCodeAndStatus(String sceneCode, Integer display, Integer status);
 }

laser/src/main/java/com/fdkankan/indoor/core/service/SceneService.java

@@ -1,6 +1,7 @@
 package com.fdkankan.indoor.core.service;
 
 import com.fdkankan.indoor.base.util.Result;
+import com.fdkankan.indoor.core.entity.InitEntity;
 import com.fdkankan.indoor.core.entity.dto.PageDto;
 import com.fdkankan.indoor.core.entity.dto.SceneAgePageDto;
 
@@ -12,4 +13,8 @@ public interface SceneService {
 
 
     Result list(PageDto param);
+
+    Result updateByUseStatus(String sceneCode, Integer useStatus);
+
+
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/DataSetServiceImpl.java

@@ -498,6 +498,7 @@ public class DataSetServiceImpl extends IBaseServiceImpl implements DataSetServi
         data = data.stream().filter(p -> dataSetId.equals(p.getId())).collect(Collectors.toList());
         if (data.size() > 0) {
             DataSetPo dataSetPo = data.get(0);
+            // 未分配数据集， modelEntityIds为空
             Integer[] modelEntityIds = dataSetPo.getSite_model_entity_ids();
             List<Integer> asList = Arrays.asList(modelEntityIds);
             // 获取最后一个id值

laser/src/main/java/com/fdkankan/indoor/core/service/impl/IBaseServiceImpl.java

@@ -114,6 +114,9 @@ public class IBaseServiceImpl {
 
     public String getTokenByUserName(){
         String token = request.getHeader("X-Authorization");
+        if (token == null) {
+            return null;
+        }
         return JwtUtil.getUsername(token);
     }
 

laser/src/main/java/com/fdkankan/indoor/core/service/impl/InitServiceImpl.java

@@ -16,14 +16,12 @@ import com.fdkankan.indoor.core.entity.dto.*;
 import com.fdkankan.indoor.core.entity.*;
 import com.fdkankan.indoor.core.entity.merge.MergeDateSetDto;
 import com.fdkankan.indoor.core.entity.po.DataSetPo;
-import com.fdkankan.indoor.core.mapper.ControlPointCalculateMapper;
 import com.fdkankan.indoor.core.mapper.InitMapper;
 import com.fdkankan.indoor.core.service.*;
 import lombok.extern.slf4j.Slf4j;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
 import org.junit.Test;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -126,6 +124,7 @@ public class InitServiceImpl implements InitService {
                 init.setPath(param.getPath());
                 init.setTitle(param.getTitle());
                 init.setUpdateTime(LocalDateTime.now());
+                init.setUseStatus(1);
                 initMapper.save(init);
             }
         } else {
@@ -139,6 +138,7 @@ public class InitServiceImpl implements InitService {
             init.setSnCode(param.getSnCode());
             init.setShootTime(param.getCreateTime());
             init.setStatus(0);
+            init.setUseStatus(1);
             // https://testlaser.4dkankan.com/maxkk/ + 场景码
             init.setWebSite(configConstant.webSitePath + sceneCode);
             init.setUserId(param.getUserId());

laser/src/main/java/com/fdkankan/indoor/core/service/impl/MergeInfoServiceImpl.java

@@ -68,4 +68,9 @@ public class MergeInfoServiceImpl extends IBaseServiceImpl implements MergeInfoS
         return entityMapper.findBySceneCodeAndDataSetId(sceneCode,dataSetId);
     }
 
+//    @Override
+//    public List<MergeInfoEntity> findBySceneCodeAndStatus(String sceneCode, Integer display, Integer status) {
+//        return entityMapper.findBySceneCodeAndDisplayAndStatus(sceneCode, display, status);
+//    }
+
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/MergeSceneServiceImpl.java

@@ -168,6 +168,7 @@ public class MergeSceneServiceImpl extends IBaseServiceImpl implements MergeScen
 
         List<MergeInfoEntity> data = mergeInfoService.findBySceneCode(sceneCode, 1);
 
+
         return Result.success(data);
     }
 

laser/src/main/java/com/fdkankan/indoor/core/service/impl/SceneServiceImpl.java

@@ -1,13 +1,9 @@
 package com.fdkankan.indoor.core.service.impl;
 
-import cn.hutool.core.date.DateUtil;
-import cn.hutool.core.util.PageUtil;
 import com.fdkankan.indoor.base.constant.MsgCode;
 import com.fdkankan.indoor.base.util.Result;
 import com.fdkankan.indoor.core.entity.InitEntity;
 import com.fdkankan.indoor.core.entity.dto.PageDto;
-import com.fdkankan.indoor.core.entity.dto.SceneAgePageDto;
-import com.fdkankan.indoor.core.entity.vo.ResponseScene;
 import com.fdkankan.indoor.core.mapper.InitMapper;
 import com.fdkankan.indoor.core.service.InitService;
 import com.fdkankan.indoor.core.service.SceneService;
@@ -17,10 +13,7 @@ import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
 
 import java.time.LocalDateTime;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Function;
-import java.util.stream.Collectors;
+
 
 /**
  * Created by owen on 2021/7/26 0026 9:05
@@ -50,7 +43,8 @@ public class SceneServiceImpl extends IBaseServiceImpl implements SceneService {
         // 重token中获取用户名
         String tokenByUserName = getTokenByUserName();
         if (tokenByUserName == null) {
-            return Result.failure(MsgCode.e3001, "请检查token是否正确");
+            log.error("token为空");
+            return Result.failure(MsgCode.e3001, "请检查token是否正确或者token为空");
         }
 
         // 这里的"recordNo"是实体类的主键，记住一定要是实体类的属性，而不能是数据库的字段
@@ -64,7 +58,9 @@ public class SceneServiceImpl extends IBaseServiceImpl implements SceneService {
         // 必要的查询条件
 //        search.setUserId(param.getUserId());
 //        search.setSnCode(param.getSnCode());
+        log.info("tokenByUserName: {}", tokenByUserName);
         search.setUserName(tokenByUserName);
+        search.setUseStatus(1);
 
         // 模糊查询条件
         // 参考：https://blog.csdn.net/wonder_dog/article/details/82319216
@@ -104,6 +100,14 @@ public class SceneServiceImpl extends IBaseServiceImpl implements SceneService {
         return Result.success(all);
     }
 
+    @Override
+    public Result updateByUseStatus(String sceneCode, Integer useStatus) {
+        InitEntity entity = initService.findById(sceneCode);
+        entity.setUseStatus(useStatus);
+        entity.setUpdateTime(LocalDateTime.now());
+        initMapper.save(entity);
+        return Result.success();
+    }
 
 
 }

laser/src/main/java/com/fdkankan/indoor/core/service/impl/TiledMapServiceImpl.java

@@ -233,6 +233,14 @@ public class TiledMapServiceImpl extends IBaseServiceImpl implements TiledMapSer
 
             // 上传平面图到download目录
             uploadOss(tiledBasePath, sceneCode);
+
+            // 2021-12-2 更新状态为自定义平面图
+            TiledMapEntity entity = this.findById(sceneCode);
+            // 0  默认平面图 ，1自定义平面图
+            entity.setStatus(1);
+            entity.setUpdateTime(LocalDateTime.now());
+            this.save(entity);
+
             return Result.success();
         } catch (IOException e) {
             e.printStackTrace();