修改查询逻辑

src/main/java/com/fdkankan/openApi/controller/www/SceneController.java

@@ -2,7 +2,12 @@ package com.fdkankan.openApi.controller.www;
 
 
 import cn.dev33.satoken.annotation.SaIgnore;
+import cn.dev33.satoken.stp.StpUtil;
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.common.constant.ErrorCode;
+import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.openApi.common.PageInfo;
+import com.fdkankan.openApi.entity.system.User;
 import com.fdkankan.openApi.entity.www.ScenePlus;
 import com.fdkankan.openApi.entity.www.ScenePlusExt;
 import com.fdkankan.openApi.entity.www.FdkkUser;
@@ -10,13 +15,13 @@ import com.fdkankan.openApi.service.laser.SceneService;
 import com.fdkankan.openApi.service.www.IFdkkUserService;
 import com.fdkankan.openApi.service.www.IScenePlusExtService;
 import com.fdkankan.openApi.service.www.IScenePlusService;
+import com.fdkankan.openApi.util.TokenUtil;
 import com.fdkankan.openApi.vo.www.SceneVO;
+import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.web.response.ResultData;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.util.ObjectUtils;
+import org.springframework.web.bind.annotation.*;
 
 /**
  * <p>
@@ -35,22 +40,22 @@ public class SceneController {
     private IScenePlusService scenePlusService;
 
     @Autowired
-    private IFdkkUserService userService;
-
-    @Autowired
     private IScenePlusExtService scenePlusExtService;
 
     @Autowired
     private SceneService sceneService;
 
+    @Autowired
+    private RedisUtil redisUtil;
+
     /**
      * 根据用户名获取场景列表
      * @return
      */
     @SaIgnore
     @PostMapping("/getScenesByUsername")
-    public ResultData getScenesByUsername(@RequestBody SceneVO sceneVO) {
-        FdkkUser user = userService.findByUserName(sceneVO.getUserName());
+    public ResultData getScenesByUsername(@RequestBody SceneVO sceneVO,@RequestHeader("token") String token) {
+        User user = JSONObject.parseObject(redisUtil.get("token#"+ StpUtil.getTokenInfo().tokenValue),User.class);
         PageInfo pageInfo = scenePlusService.getScenesByUserId(user.getId(),sceneVO.getPageNum(),sceneVO.getPageSize());
         return ResultData.ok(pageInfo);
     }
@@ -61,8 +66,16 @@ public class SceneController {
      * @return
      */
     @RequestMapping("/getScenePointInfo")
-    public ResultData getScenePointInfo(@RequestBody SceneVO sceneVO) {
+    public ResultData getScenePointInfo(@RequestBody SceneVO sceneVO, @RequestHeader("token") String token) {
         ScenePlus scenePlus = scenePlusService.getByNum(sceneVO.getSceneCode());
+        if(ObjectUtils.isEmpty(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        User user = JSONObject.parseObject(redisUtil.get("token#"+ StpUtil.getTokenInfo().tokenValue),User.class);
+        if (user.getId() != scenePlus.getUserId().intValue()) {
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5015);
+        }
+
         if(scenePlus.getSceneSource()==4){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             if(scenePlusExt.getIsObj() == 0){
@@ -77,8 +90,15 @@ public class SceneController {
      * @return
      */
     @RequestMapping("/getSceneObjFiles")
-    public ResultData getSceneObjFiles(@RequestBody SceneVO sceneVO) {
+    public ResultData getSceneObjFiles(@RequestBody SceneVO sceneVO,@RequestHeader("token") String token) {
         ScenePlus scenePlus = scenePlusService.getByNum(sceneVO.getSceneCode());
+        if(ObjectUtils.isEmpty(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        User user = JSONObject.parseObject(redisUtil.get("token#"+ StpUtil.getTokenInfo().tokenValue),User.class);
+        if (user.getId() != scenePlus.getUserId().intValue()) {
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5015);
+        }
         if(scenePlus.getSceneSource()==4){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             if(scenePlusExt.getIsObj() == 0){
@@ -93,8 +113,15 @@ public class SceneController {
      * @return
      */
     @RequestMapping("/getScenePanoramicImageFiles")
-    public ResultData getScenePanoramicImageFiles(@RequestBody SceneVO sceneVO) {
+    public ResultData getScenePanoramicImageFiles(@RequestBody SceneVO sceneVO,@RequestHeader("token") String token) {
         ScenePlus scenePlus = scenePlusService.getByNum(sceneVO.getSceneCode());
+        if(ObjectUtils.isEmpty(scenePlus)){
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5005);
+        }
+        User user = JSONObject.parseObject(redisUtil.get("token#"+ StpUtil.getTokenInfo().tokenValue),User.class);
+        if (user.getId() != scenePlus.getUserId().intValue()) {
+            throw new BusinessException(ErrorCode.FAILURE_CODE_5015);
+        }
         if(scenePlus.getSceneSource()==4){
             ScenePlusExt scenePlusExt = scenePlusExtService.getByPlusId(scenePlus.getId());
             if(scenePlusExt.getIsObj() == 0){

src/main/java/com/fdkankan/openApi/entity/www/FdkkUser.java

@@ -1,30 +0,0 @@
-package com.fdkankan.openApi.entity.www;
-
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
-/**
- * @author Xiewj
- * @date 2022/12/19
- */
-@Data
-@TableName("t_user")
-public class FdkkUser{
-   @TableId(value = "id", type = IdType.AUTO)
-   private Integer id;
-
-   /**
-    * 账号
-    */
-   @TableField("user_name")
-   private String userName;
-
-   @TableField("head")
-   private String head;
-
-   @TableField("rec_status")
-   @TableLogic(value = "A",delval = "I")
-   private String recStatus;
-
-
-}

src/main/java/com/fdkankan/openApi/mapper/www/IFdkkUserMapper.java

@@ -1,20 +0,0 @@
-package com.fdkankan.openApi.mapper.www;
-
-import com.baomidou.mybatisplus.core.mapper.BaseMapper;
-import com.fdkankan.openApi.entity.www.FdkkUser;
-import org.apache.ibatis.annotations.Mapper;
-import org.springframework.stereotype.Component;
-
-/**
- * <p>
- *  Mapper 接口
- * </p>
- *
- * @author 
- * @since 2023年2月10日14:38:33
- */
-@Mapper
-@Component("IFdkkUserMapper")
-public interface IFdkkUserMapper extends BaseMapper<FdkkUser> {
-
-}

src/main/java/com/fdkankan/openApi/service/www/IFdkkUserService.java

@@ -1,20 +0,0 @@
-package com.fdkankan.openApi.service.www;
-
-import com.baomidou.mybatisplus.extension.service.IService;
-import com.fdkankan.openApi.entity.www.FdkkUser;
-
-/**
- * <p>
- *  服务类
- * </p>
- *
- * @author 
- * @since  2022年12月19日09:44:17
- */
-public interface IFdkkUserService extends IService<FdkkUser> {
-
-    FdkkUser findByUserName(String userName);
-    FdkkUser findByUserName(String userName, Integer fdkkId, String head);
-    FdkkUser findByTokenCovUserName(String token);
-
-}

src/main/java/com/fdkankan/openApi/service/www/impl/FdkkUserServiceImpl.java

@@ -1,57 +0,0 @@
-package com.fdkankan.openApi.service.www.impl;
-
-import cn.hutool.core.util.ObjectUtil;
-import com.baomidou.dynamic.datasource.annotation.DS;
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import com.fdkankan.openApi.entity.www.FdkkUser;
-import com.fdkankan.openApi.mapper.www.IFdkkUserMapper;
-import com.fdkankan.openApi.service.www.IFdkkUserService;
-import com.fdkankan.openApi.util.JwtUtil;
-import org.springframework.stereotype.Service;
-
-@DS("www")
-@Service
-public class FdkkUserServiceImpl extends ServiceImpl<IFdkkUserMapper, FdkkUser> implements IFdkkUserService {
-
-    @Override
-    public FdkkUser findByUserName(String userName) {
-        LambdaQueryWrapper<FdkkUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(FdkkUser::getUserName, userName);
-        FdkkUser one = this.getOne(wrapper);
-        if (ObjectUtil.isNotNull(one)) {
-            return one;
-        } else {
-            FdkkUser u = new FdkkUser();
-            u.setUserName(userName);
-            boolean save = save(u);
-            return u;
-        }
-    }
-
-    @Override
-    public FdkkUser findByUserName(String userName, Integer fdkkId, String head) {
-        LambdaQueryWrapper<FdkkUser> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(FdkkUser::getUserName, userName);
-        FdkkUser one = this.getOne(wrapper);
-        if (ObjectUtil.isNotNull(one)) {
-            if (ObjectUtil.isNull(one.getHead())) {
-                one.setHead(head);
-                updateById(one);
-            }
-            return one;
-        } else {
-            FdkkUser u = new FdkkUser();
-            u.setUserName(userName);
-            u.setId(fdkkId);
-            boolean save = save(u);
-            return u;
-        }
-    }
-
-    @Override
-    public FdkkUser findByTokenCovUserName(String token) {
-        String userName = JwtUtil.getUserName(token);
-        return findByUserName(userName);
-    }
-}