获取用户场景记录

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformGoodsClient.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(value = "4dkankan-center-platform",contextId = "platformGoodsClient")
 @RequestMapping("/platform/feign/goods")
 public interface PlatformGoodsClient {
@@ -54,4 +56,7 @@ public interface PlatformGoodsClient {
      */
     @PostMapping("/getCameraById")
     ResultData<Camera> getCameraById(@RequestParam(value = "cameraId") Long cameraId);
+
+    @PostMapping("/getCameraLikeSnCode")
+    ResultData<List<Camera>> getCameraLikeSnCode(@RequestParam(value = "searchKey")String searchKey);
 }

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/feign/PlatformUserClient.java

@@ -8,6 +8,8 @@ import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
+import java.util.List;
+
 @FeignClient(value = "4dkankan-center-platform",contextId = "platformUserClient")
 @RequestMapping("/platform/feign/user")
 public interface PlatformUserClient {
@@ -38,8 +40,14 @@ public interface PlatformUserClient {
     ResultData<UserIncrement> getUserIncrementByCameraId(@RequestParam(value = "cameraId", required = false) Long cameraId);
     /**
      *
-     * @return UserIncrement
+     * @return User
+     */
+    @PostMapping("/getUserByUserId")
+    ResultData<User> getUserByUserId(@RequestParam(value = "userId") Long userId);
+
+    /**
+     * @param searchKey 模糊查询
      */
-    @PostMapping("/getNickNameByUserId")
-    ResultData<String> getNickNameByUserId(@RequestParam(value = "userId") Long userId);
+    @PostMapping("/getUserLikeUserName")
+    ResultData<List<User>> getUserLikeUserName(@RequestParam(value = "searchKey") String searchKey);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/feign/GoodsFeign.java

@@ -1,6 +1,5 @@
 package com.fdkankan.platform.feign;
 
-import com.fdkankan.common.response.ResultData;
 import com.fdkankan.platform.goods.entity.Camera;
 import com.fdkankan.platform.goods.entity.CameraDetail;
 import com.fdkankan.platform.goods.service.ICameraDetailService;
@@ -13,6 +12,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 提供场景调用
  */
@@ -86,5 +87,13 @@ public class GoodsFeign {
         return camera;
     }
 
+    @PostMapping("/getCameraLikeSnCode")
+    List<Camera> getCameraLikeSnCode(@RequestParam(value = "searchKey")String searchKey){
+        log.info("scene服务调用:getCameraLikeSnCode,参数：searchKey:{}" ,searchKey);
+        List<Camera> cameraList = cameraService.getCameraLikeSnCode(searchKey);
+        log.info("scene服务调用:getCameraLikeSnCode,返回:{}",cameraList);
+        return cameraList;
+    }
+
 }
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/feign/UserFeign.java

@@ -15,6 +15,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.List;
+
 /**
  * 提供计算调用
  */
@@ -60,13 +62,19 @@ public class UserFeign {
         return entity;
     }
 
-    @PostMapping("/getNickNameByUserId")
+    @PostMapping("/getUserByUserId")
     public String getNickNameByUserId(@RequestParam(value = "userId")  Long userId) {
-        log.info("feign调用: getNickNameByUserId,参数：userId:{},",userId);
-        String nickName = userService.getNickNameByUserId(userId);
-        log.info("feign调用: getNickNameByUserId,返回：{},",nickName);
+        log.info("feign调用: getUserByUserId,参数：userId:{},",userId);
+        String nickName = userService.getUserByUserId(userId);
+        log.info("feign调用: getUserByUserId,返回：{},",nickName);
         return nickName;
     }
-
+    @PostMapping("/getUserLikeUserName")
+    List<User> getUserLikeUserName(@RequestParam(value = "searchKey") String searchKey){
+        log.info("feign调用: getUserLikeUserName,参数：searchKey:{},",searchKey);
+        List<User> userList = userService.getUserLikeUserName(searchKey);
+        log.info("feign调用: getUserLikeUserName,返回：{},",userList);
+        return userList;
+    }
 }
 

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/ICameraService.java

@@ -37,7 +37,7 @@ public interface ICameraService extends IService<Camera> {
 
     HSSFWorkbook export(String token, HttpServletResponse response) throws Exception;
 
-    List<Camera> findLikeChildName(String trim);
+    List<Camera> getCameraLikeSnCode(String trim);
 
     Camera getBySnCode(String snCode);
 
@@ -52,4 +52,5 @@ public interface ICameraService extends IService<Camera> {
     String deleteCamera(RequestCamera param);
 
     String deleteCameraNew(RequestCamera param);
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/goods/service/impl/CameraServiceImpl.java

@@ -301,7 +301,7 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
     }
 
     @Override
-    public List<Camera> findLikeChildName(String trim) {
+    public List<Camera> getCameraLikeSnCode(String trim) {
         QueryWrapper<Camera> queryWrapper = new QueryWrapper<>();
         queryWrapper.lambda().eq(Camera::getRecStatus,"A");
         queryWrapper.lambda().like(Camera::getSnCode,trim);
@@ -547,4 +547,5 @@ public class CameraServiceImpl extends ServiceImpl<ICameraMapper, Camera> implem
         }
         return ServerCode.SUCCESS.message();
     }
+
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/IUserService.java

@@ -84,9 +84,11 @@ public interface IUserService extends IService<User> {
 
     SSOUser getByNickName(String nickName);
 
-    String getNickNameByUserId(Long userId);
+    User getUserByUserId(Long userId);
 
     Page<ResponseUser> getPageByParam(RequestUser param);
 
     String updateStatus(Long userId, int status);
+
+    List<User> getUserLikeUserName(String searchKey);
 }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserIncrementServiceImpl.java

@@ -169,7 +169,7 @@ public class UserIncrementServiceImpl extends ServiceImpl<IUserIncrementMapper,
 
         List<Long> cameraIdList = null;
         if(StringUtils.isNotEmpty(param.getSnCode().trim())){
-            List<Camera> cameraEntityList = cameraService.findLikeChildName(param.getSnCode().trim());
+            List<Camera> cameraEntityList = cameraService.getCameraLikeSnCode(param.getSnCode().trim());
             if(cameraEntityList == null || cameraEntityList.size()<=0){
                 return pageVo;
             }

4dkankan-center-platform/src/main/java/com/fdkankan/platform/user/service/impl/UserServiceImpl.java

@@ -1,6 +1,7 @@
 package com.fdkankan.platform.user.service.impl;
 
 import cn.hutool.core.util.StrUtil;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
@@ -488,25 +489,22 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
     }
 
     @Override
-    public String getNickNameByUserId(Long userId) {
-        String key = SsoUtil.PREFIX_CACHE_NICKNAME + userId;
+    public User getUserByUserId(Long userId) {
+        String key = SsoUtil.PREFIX_CACHE_USERINFO + userId;
         String nickName = redisUtil.get(key);
         if(StrUtil.isNotEmpty(nickName)){
-            return nickName;
+            return JSONObject.parseObject(nickName,User.class);
         }
         User user = this.getOne(
                 new LambdaQueryWrapper<User>()
                 .select(User::getNickName)
                 .eq(User::getRecStatus, RecStatus.VALID.code())
                 .eq(User::getId, userId));
-
         if(Objects.isNull(user)){
             return null;
         }
-
-        nickName = user.getNickName();
-        redisUtil.set(key, nickName);
-        return nickName;
+        redisUtil.set(key, JSONObject.toJSONString(user));
+        return user;
     }
 
     @Override
@@ -534,4 +532,14 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         }
         return ServerCode.SUCCESS.message();
     }
+
+    @Override
+    public List<User> getUserLikeUserName(String searchKey) {
+        LambdaQueryWrapper<User> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.eq(User::getRecStatus,"A")
+                .like(User::getUserName,searchKey);
+        return this.list(queryWrapper);
+    }
 }
+
+

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/SceneController.java

@@ -1,31 +1,19 @@
 package com.fdkankan.scene.controller;
 
 
-import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.fdkankan.common.constant.ConstantFilePath;
 import com.fdkankan.common.response.ResultData;
-import com.fdkankan.common.util.ComputerUtil;
-import com.fdkankan.common.util.CreateObjUtil;
-import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.scene.service.*;
-import com.fdkankan.scene.service.impl.SceneFileBuildServiceImpl;
 import com.fdkankan.scene.vo.RebuildVedioSceneParamVO;
 import com.fdkankan.scene.vo.SceneParamVO;
 import com.fdkankan.scene.vo.SceneVO;
-import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.util.ObjectUtils;
 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 javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.io.File;
-
 /**
  * <p>
  * 场景表 前端控制器
@@ -193,7 +181,6 @@ public class SceneController {
 
     /**
      * 获取一键换装场景状态
-     * @param request
      */
     @PostMapping(value = "/getStatusByScene")
     public ResultData getStatusByScene(SceneParamVO param) throws Exception{

4dkankan-center-scene/src/main/java/com/fdkankan/scene/controller/UserSceneController.java

@@ -0,0 +1,37 @@
+package com.fdkankan.scene.controller;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.controller.BaseController;
+import com.fdkankan.scene.service.UserSceneService;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+import lombok.extern.log4j.Log4j2;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 个人中心-我的场景
+ */
+@Log4j2
+@RestController
+@RequestMapping("/api/user/scene")
+public class UserSceneController extends BaseController {
+
+    @Autowired
+    private UserSceneService userSceneService;
+    /**
+     * 获取用户场景记录
+     * pageNum          分页
+     * searchKey        搜索条件
+     * pageSize         每页大小
+     */
+    @RequestMapping(value = "/list", method = RequestMethod.POST)
+    public Page<SceneVO> getScenes(@RequestBody SceneParamVO param) throws Exception {
+        return userSceneService.getScenes(getToken(), param);
+
+    }
+
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/ISceneCooperationService.java

@@ -1,10 +1,11 @@
 package com.fdkankan.scene.service;
 
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.scene.entity.SceneCooperation;
-import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
-import org.springframework.web.bind.annotation.RequestBody;
+
+import java.util.List;
 
 /**
  * <p>
@@ -24,4 +25,5 @@ public interface ISceneCooperationService extends IService<SceneCooperation> {
 
     ResultData sceneResourceBySceneNum(SceneCooperationParamVO param) throws Exception;
 
+    List<SceneCooperation> getListByUserId(List<Long> userIds);
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/UserSceneService.java

@@ -0,0 +1,92 @@
+package com.fdkankan.scene.service;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fdkankan.common.user.SSOLoginHelper;
+import com.fdkankan.common.user.SSOUser;
+import com.fdkankan.platform.api.feign.PlatformGoodsClient;
+import com.fdkankan.platform.api.feign.PlatformUserClient;
+import com.fdkankan.platform.api.vo.Camera;
+import com.fdkankan.platform.api.vo.User;
+import com.fdkankan.scene.entity.SceneCooperation;
+import com.fdkankan.scene.entity.SceneProPO;
+import com.fdkankan.scene.vo.SceneParamVO;
+import com.fdkankan.scene.vo.SceneVO;
+import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@Slf4j
+public class UserSceneService {
+
+    @Autowired
+    private SSOLoginHelper ssoLoginHelper;
+    @Autowired
+    private PlatformGoodsClient platformGoodsClient;
+    @Autowired
+    private PlatformUserClient platformUserClient;
+    @Autowired
+    private ISceneCooperationService sceneCooperationService;
+    @Autowired
+    private ISceneService sceneService;
+
+    public Page<SceneVO> getScenes(String token, SceneParamVO param) {
+        SSOUser ssoUser = ssoLoginHelper.loginCheck(token);
+        Long userId = ssoUser.getId();
+        String cameraId = null;
+        String nums = null;
+        log.info("搜索条件是："+ param.getSearchKey());
+        //type为12表示一键换装的请求，不查询相机数据
+        if(StringUtils.isNotEmpty(param.getSearchKey()) && !"11".equals(param.getType())){
+            List<Camera> cameraEntityList = platformGoodsClient.getCameraLikeSnCode(param.getSearchKey()).getData();
+            cameraId = cameraEntityList.parallelStream().map(entity->"'"+entity.getId()+"'").collect(Collectors.joining(","));
+
+            List<User> userList  = platformUserClient.getUserLikeUserName(param.getSearchKey()).getData();
+            List<Long> userIds =  userList.parallelStream().map(User::getId).collect(Collectors.toList());
+
+            if(userIds.size() > 0){
+                List<SceneCooperation> cooperationList = sceneCooperationService.getListByUserId(userIds);
+                nums = cooperationList.parallelStream().map(entity->"'"+entity.getSceneCode()+"'").collect(Collectors.joining(","));
+                param.setNums(nums);
+            }
+        }
+
+        Page<SceneProPO> proPOPage = sceneService.findAllScene( param);
+
+        Page<SceneVO> pageInfo = new Page<>(proPOPage.getCurrent(),proPOPage.getSize());
+        pageInfo.setTotal(proPOPage.getTotal());
+        pageInfo.setRecords(proPOPage.getRecords().stream().map(sceneProPO -> {
+            SceneVO sceneVO = new SceneVO();
+            BeanUtils.copyProperties(sceneProPO,sceneVO);
+            return sceneVO;
+        }).collect(Collectors.toList()));
+
+        List<SceneVO> list = pageInfo.getRecords();
+        list.parallelStream().forEach(responseScene->{
+            if(responseScene.getCameraId() != null){
+                Camera cameraEntity = platformGoodsClient.getCameraById(responseScene.getCameraId()).getData();
+                if(cameraEntity != null){
+                    responseScene.setChildName(cameraEntity.getChildName());
+                    responseScene.setSnCode(cameraEntity.getSnCode());
+                }
+            }
+
+            if(responseScene.getUserId()!=null){
+                String username = platformUserClient.getUserByUserId(responseScene.getUserId()).getData().getUserName();
+                responseScene.setUserName(username);
+            }
+
+            SceneCooperation sceneCooperationEntity = sceneCooperationService.findBySceneNum(responseScene.getNum());
+            if(sceneCooperationEntity != null){
+                responseScene.setCooperationUserId(String.valueOf(sceneCooperationEntity.getUserId()));
+                responseScene.setCooperationUserName(sceneCooperationService.findUserName(responseScene.getNum()));
+            }
+        });
+        return pageInfo;
+    }
+}

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/PicSceneProgressServiceImpl.java

@@ -44,6 +44,9 @@ public class PicSceneProgressServiceImpl extends ServiceImpl<IPicSceneProgressMa
                         .eq(PicSceneProgress::getRecStatus, RecStatus.VALID.code())
                         .eq(PicSceneProgress::getSceneCode, param.getSceneNum()));
         VideoSceneProgressVO videoSceneProgressVO = new VideoSceneProgressVO();
+        if(list == null || list.size()<=0){
+            return videoSceneProgressVO;
+        }
         BeanUtils.copyProperties(list.get(0), videoSceneProgressVO);
         //更新访问量
         this.updatePageView(param.getSceneNum());

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneCooperationServiceImpl.java

@@ -1,31 +1,25 @@
 package com.fdkankan.scene.service.impl;
 
 import cn.hutool.core.collection.CollUtil;
-import cn.hutool.core.util.StrUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
-import com.fdkankan.common.constant.ErrorCode;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.RecStatus;
 import com.fdkankan.common.constant.TbStatus;
-import com.fdkankan.common.exception.BusinessException;
 import com.fdkankan.common.response.ResultData;
 import com.fdkankan.common.user.SSOLoginHelper;
-import com.fdkankan.common.user.SSOUser;
-import com.fdkankan.common.util.JwtUtil;
 import com.fdkankan.platform.api.feign.PlatformGoodsClient;
 import com.fdkankan.platform.api.vo.Camera;
-import com.fdkankan.scene.entity.Scene3dfamily;
 import com.fdkankan.scene.entity.SceneCooperation;
 import com.fdkankan.scene.entity.ScenePro;
 import com.fdkankan.scene.mapper.ISceneCooperationMapper;
 import com.fdkankan.scene.service.ISceneCooperationService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.scene.service.ISceneProService;
 import com.fdkankan.scene.service.ISceneResourceService;
 import com.fdkankan.scene.vo.SceneCooperationParamVO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestBody;
 
 import java.util.Calendar;
 import java.util.List;
@@ -104,4 +98,10 @@ public class SceneCooperationServiceImpl extends ServiceImpl<ISceneCooperationMa
         return ResultData.ok(sceneResourceService.findByCooperationId(sceneCooperation.getId()));
     }
 
+    @Override
+    public List<SceneCooperation> getListByUserId(List<Long> userIds) {
+        LambdaQueryWrapper<SceneCooperation> queryWrapper = new LambdaQueryWrapper<>();
+        queryWrapper.in(SceneCooperation::getUserId,userIds);
+        return this.list(queryWrapper);
+    }
 }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneProServiceImpl.java

@@ -35,10 +35,8 @@ import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.IOException;
@@ -3455,6 +3453,7 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         String sceneNum = param.getSceneNum();
         String fileName = param.getFileName();
         String planId = param.getPlanId();
+        String type = param.getPlanId();
         if(StrUtil.isEmpty(sceneNum) || StrUtil.isEmpty(fileName) || StrUtil.isEmpty(type)|| StrUtil.isEmpty(planId)){
             throw new BusinessException(ErrorCode.FAILURE_CODE_3001);
         }

4dkankan-center-scene/src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -19,6 +19,7 @@ import com.fdkankan.common.util.FileUtils;
 import com.fdkankan.fyun.oss.UploadToOssUtil;
 import com.fdkankan.fyun.qiniu.QiniuUpload;
 import com.fdkankan.platform.api.feign.PlatformUserClient;
+import com.fdkankan.platform.api.vo.User;
 import com.fdkankan.redis.constant.RedisKey;
 import com.fdkankan.redis.constant.RedisLockKey;
 import com.fdkankan.redis.util.RedisLockUtil;
@@ -45,8 +46,6 @@ import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.util.*;
@@ -1096,8 +1095,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
         List<SceneVO> voList = this.convert(scenePOPage.getRecords());
         for (SceneVO vo : voList){
             if (vo.getUserId() != null){
-                ResultData<String> nickNameResult = platformUserClient.getNickNameByUserId(vo.getUserId());
-                String nickName = nickNameResult.getData();
+                ResultData<User> nickNameResult = platformUserClient.getUserByUserId(vo.getUserId());
+                String nickName = nickNameResult.getData().getNickName();
                 vo.setNickName(nickName);
             }
         }
@@ -1126,8 +1125,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
 
         List<SceneVO> voList = this.convertPro(page.getRecords());
         for (SceneVO vo : voList){
-            ResultData<String> nickNameResult = platformUserClient.getNickNameByUserId(vo.getUserId());
-            vo.setNickName(nickNameResult.getData());
+            ResultData<User> nickNameResult = platformUserClient.getUserByUserId(vo.getUserId());
+            vo.setNickName(nickNameResult.getData().getNickName());
         }
 
         Page<SceneVO> result = new Page<>(param.getPageNum(), param.getPageSize());

4dkankan-common/src/main/java/com/fdkankan/common/util/SsoUtil.java

@@ -14,7 +14,7 @@ public class SsoUtil {
     public static final String PREFIX_CACHE_AGENT = "agent:";
     public static final String PREFIX_CACHE_CAMERA = "camera:";
     public static final String SSO_SESSIONID = "token";
-    public static final String PREFIX_CACHE_NICKNAME = "nickname:";
+    public static final String PREFIX_CACHE_USERINFO = "user_info:";
     public static final String PREFIX_MSG_NOT_CODE = "msg:not:code:";//短信重发验证
 
     public static final String USER_TOKEN = "user:token:";