舒淇要求场景上传取data.fdage中的用户

src/main/java/com/fdkankan/contro/service/IUserService.java

@@ -9,7 +9,7 @@ import com.fdkankan.contro.entity.User;
  * 用户信息表 服务类
  * </p>
  *
- * @author 
+ * @author
  * @since 2021-12-24
  */
 public interface IUserService extends IService<User> {
@@ -18,4 +18,6 @@ public interface IUserService extends IService<User> {
 
     SSOUser getSSOUserByUserId(Long userId);
 
+    User getByUserName(String userName);
+
 }

src/main/java/com/fdkankan/contro/service/impl/SceneFileBuildServiceImpl.java

@@ -412,10 +412,10 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
 
         String userName = null;
-        if (!ObjectUtils.isEmpty(cameraDetail.getUserId())) {
-            SSOUser user = userService.getSSOUserByUserId(cameraDetail.getUserId());
-            userName = ObjectUtils.isEmpty(user) ? null : user.getUserName();
-        }
+//        if (!ObjectUtils.isEmpty(cameraDetail.getUserId())) {
+//            SSOUser user = userService.getSSOUserByUserId(cameraDetail.getUserId());
+//            userName = ObjectUtils.isEmpty(user) ? null : user.getUserName();
+//        }
 
         JSONObject firmwareVersion = new JSONObject();
         if (!ObjectUtils.isEmpty(jsonObject.getString("camSoftwareVersion"))) {
@@ -438,9 +438,19 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         }
         String algorithm = jsonObject.getString("location") != null && "1".equals(jsonObject.getString("location")) ? "sfm" : "slam";
 
+        //舒淇要求场景上传取data.fdage中的用户
+        Long userId = null;
+        userName = jsonObject.getString("account");
+        if(StrUtil.isNotEmpty(userName)){
+            User user = userService.getByUserName(userName);
+            if(Objects.nonNull(user)){
+                userId = user.getId();
+            }
+        }
+
         ScenePlusVO scenePlusVO = this.createScenePlus(sceneNum, cameraDetail.getCameraId(), jsonObject.getString("creator"),
                 jsonObject.getString("pwd"),cameraType, jsonObject.getJSONObject("cam").getIntValue("type"),
-                dataSource, icon,  cameraDetail.getUserId(), userName,algorithm,jsonObject.getInteger("location"),
+                dataSource, icon,  userId, userName,algorithm,jsonObject.getInteger("location"),
                 jsonObject.getJSONArray("points").size(), jsonObject.getString("name"), jsonObject.getString("info"),
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());

src/main/java/com/fdkankan/contro/service/impl/UserServiceImpl.java

@@ -1,5 +1,6 @@
 package com.fdkankan.contro.service.impl;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
@@ -48,6 +49,11 @@ public class UserServiceImpl extends ServiceImpl<IUserMapper, User> implements I
         return this.getSsoUserByUserName(user,user.getUserName());
     }
 
+    @Override
+    public User getByUserName(String userName) {
+        return this.getOne(new LambdaQueryWrapper<User>().eq(User::getUserName, userName));
+    }
+
 }