1

src/main/java/com/fdkankan/ucenter/controller/inner/InnerController.java

@@ -16,6 +16,7 @@ import com.fdkankan.ucenter.service.IAppSecretService;
 import com.fdkankan.ucenter.service.IInnerService;
 import com.fdkankan.ucenter.service.IUserService;
 import com.fdkankan.ucenter.service.impl.LoginService;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import org.apache.commons.lang3.ObjectUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -137,6 +138,15 @@ public class InnerController extends BaseController {
         return Result.success(innerService.getSceneBySnCode(param));
     }
 
+    @PostMapping(value = "/getSceneByToken")
+    @VerifySign
+    public Result getSceneByToken( @RequestBody LaserSceneParam param) {
+        if(StringUtils.isBlank(getToken())){
+            throw new BusinessException(ErrorCode.MISSING_REQUIRED_PARAMETERS);
+        }
+        return Result.success(innerService.getSceneByToken(param,getToken()));
+    }
+
     @Autowired
     RedisUtil redisUtil;
     @GetMapping(value = "/pdsfsdfsrvateddsfeky/{appId}")

src/main/java/com/fdkankan/ucenter/mapper/IScenePlusMapper.java

@@ -3,7 +3,9 @@ package com.fdkankan.ucenter.mapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO;
 import com.fdkankan.ucenter.vo.request.AppSceneParam;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.response.AppSceneVo;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import org.apache.ibatis.annotations.Mapper;
@@ -32,4 +34,6 @@ public interface IScenePlusMapper extends BaseMapper<ScenePlus> {
     List<SceneNumVo> getGroupBySceneSouceV3(@Param("userId")Long userId);
 
     List<ScenePlus> getCountByUserIdAndSceneSource(@Param("userId")Long userId,@Param("sceneSourceList") List<Integer> sceneSourceList, @Param("isObj")Integer isObj);
+
+    Page<RelicsSceneInitQueueDTO> pageLaserScene(Page<RelicsSceneInitQueueDTO> page, LaserSceneParam param);
 }

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

@@ -1,6 +1,7 @@
 package com.fdkankan.ucenter.service;
 
 import com.fdkankan.ucenter.common.Result;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 
@@ -30,4 +31,5 @@ public interface IInnerService {
 
     Object getSceneBySnCode(SceneParam param);
 
+    Object getSceneByToken(LaserSceneParam param, String token);
 }

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

@@ -1,12 +1,15 @@
 package com.fdkankan.ucenter.service;
 
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.ucenter.common.PageInfo;
 import com.fdkankan.ucenter.common.Result;
 import com.fdkankan.ucenter.entity.CameraDetail;
 import com.fdkankan.ucenter.entity.CameraType;
 import com.fdkankan.ucenter.entity.ScenePlus;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO;
 import com.fdkankan.ucenter.vo.ResponseScene;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -59,4 +62,6 @@ public interface IScenePlusService extends IService<ScenePlus> {
     List<SceneNumVo> getGroupBySceneSouceV3(Long userId);
 
     List<ScenePlus> getCountByUserIdAndSceneSource(Long userId, List<Integer> sceneSourceList, Integer isObj);
+
+    Page<RelicsSceneInitQueueDTO> pageLaserScene(Page<RelicsSceneInitQueueDTO> objectPage, LaserSceneParam param);
 }

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

@@ -3,18 +3,21 @@ package com.fdkankan.ucenter.service.impl;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.fyun.face.FYunFileServiceInterface;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.util.RedisUtil;
+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.ResultCodeMsg;
 import com.fdkankan.ucenter.entity.*;
 import com.fdkankan.ucenter.service.*;
 import com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.request.SceneParam;
 import com.fdkankan.ucenter.vo.response.LaserSceneInfoVo;
 import lombok.extern.slf4j.Slf4j;
@@ -290,4 +293,21 @@ public class InnerServiceImpl implements IInnerService {
         dto.setShootCount(scenePlusExt.getShootCount());
         return dto;
     }
+
+    @Override
+    public Object getSceneByToken(LaserSceneParam param, String token) {
+        String username = JwtUtil.getUsername(token);
+        if(StringUtils.isBlank(username)){
+            throw new BusinessException(ErrorCode.USER_NOT_EXIST);
+        }
+        User user = userService.getByUserName(username);
+        if(user == null){
+            throw new BusinessException(ErrorCode.USER_NOT_EXIST);
+        }
+        param.setUserId(user.getId());
+        Page<RelicsSceneInitQueueDTO> page = scenePlusService.pageLaserScene(new Page<>(param.getPageNum(),param.getPageSize()),param);
+
+
+        return PageInfo.PageInfo(page);
+    }
 }

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

@@ -34,6 +34,8 @@ import java.util.stream.Collectors;
 
 import com.fdkankan.ucenter.util.RoamingPointUtil;
 import com.fdkankan.ucenter.util.SceneResourcePath;
+import com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO;
+import com.fdkankan.ucenter.vo.request.LaserSceneParam;
 import com.fdkankan.ucenter.vo.request.RequestScene;
 import com.fdkankan.ucenter.vo.response.SceneNumVo;
 import com.fdkankan.ucenter.vo.response.SceneVo;
@@ -433,4 +435,9 @@ public class ScenePlusServiceImpl extends ServiceImpl<IScenePlusMapper, ScenePlu
     public List<ScenePlus> getCountByUserIdAndSceneSource(Long userId, List<Integer> sceneSourceList, Integer isObj) {
         return this.getBaseMapper().getCountByUserIdAndSceneSource(userId,sceneSourceList,isObj);
     }
+
+    @Override
+    public Page<RelicsSceneInitQueueDTO> pageLaserScene(Page<RelicsSceneInitQueueDTO> objectPage, LaserSceneParam param) {
+        return this.getBaseMapper().pageLaserScene(objectPage,param);
+    }
 }

src/main/java/com/fdkankan/ucenter/vo/RelicsSceneInitQueueDTO.java

@@ -6,25 +6,12 @@ import lombok.Data;
 public class RelicsSceneInitQueueDTO {
     private String sceneCode;
 
-//    @ApiModelProperty(value = "判断是否为slam场景,深光和深时 以前的场景都是4" +
-//            "typedef enum SceneLocation {\n" +
-//            "    Scene_Location_Slam  = 0, //slam\n" +
-//            "    Scene_Location_SFM 1 ,   //sfm\n" +
-//            "    Scene_Location_SFMAI  2,     //SFM + AI\n" +
-//            "    Scene_Location_MutiFloor 3 ,    //多楼层\n" +
-//            "    Scene_Location_PointCloud 4,    //点云\n" +
-//            "    Scene_Location_SLAMPoint 5,    //slam实时拍\n" +
-//            "    Scene_Location_SLAMPointAndSFMAI  6   //slam实时拍+站点\n" +
-//            "} SceneLocation;")
     private Integer location;
 
-    //@ApiModelProperty(value = "场景来源：相机拍摄10以内表示，1表示八目，2双目，3转台，4 激光 5深光  其他来源10以上，11：一键换装，12：123看房，13文通虚拟场景")
     private Integer sceneSource;
 
-    //@ApiModelProperty(value = "计算完成时间")
     private String algorithmTime;
 
-    //@ApiModelProperty(value = "创建时间")
     private String createTime;
 
     private String phoneNum;
@@ -33,11 +20,11 @@ public class RelicsSceneInitQueueDTO {
 
     private String snCode;
 
-    //0-计算中 1-计算成功  -1-计算失败
     private int status;
 
     private String sceneName;
 
-    //@ApiModelProperty(value = "点位数量")
+    private String title;
+
     private Integer shootCount;
 }

src/main/java/com/fdkankan/ucenter/vo/request/LaserSceneParam.java

@@ -0,0 +1,12 @@
+package com.fdkankan.ucenter.vo.request;
+
+import com.fdkankan.ucenter.common.RequestBase;
+import lombok.Data;
+
+@Data
+public class LaserSceneParam extends RequestBase {
+    private Long userId;
+    private String title;
+    private Integer sceneSource;
+    private Integer location;
+}

src/main/resources/mapper/ucenter/ScenePlusMapper.xml

@@ -123,4 +123,18 @@
             and e.is_obj = 1
         </if>
     </select>
+
+    <select id="pageLaserScene" resultType="com.fdkankan.ucenter.vo.RelicsSceneInitQueueDTO">
+        select s.* from t_scene_plus s LEFT JOIN t_scene_plus_ext e on s.id = e.plus_id
+        WHERE s.rec_status = 'A' and s.user_id = #{param.userId}
+        <if test="param.sceneSource !=null">
+            and s.scene_source = #{param.sceneSource}
+        </if>
+        <if test="param.location !=null">
+            and e.location = #{param.location}
+        </if>
+        <if test="param.title !=null and param.title !=''">
+            and  s.title like CONCAT('%',#{param.title},'%')
+        </if>
+    </select>
 </mapper>