Merge branch 'release-个人中心2.0.1' into test

# Conflicts:
#	src/main/java/com/fdkankan/contro/generate/AutoGenerate.java

src/main/java/com/fdkankan/contro/entity/SceneUploadUserLog.java

@@ -0,0 +1,43 @@
+package com.fdkankan.contro.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 场景上传用户记录表
+ * </p>
+ *
+ * @author 
+ * @since 2026-01-05
+ */
+@Getter
+@Setter
+@TableName("t_scene_upload_user_log")
+public class SceneUploadUserLog implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    @TableField("num")
+    private String num;
+
+    @TableField("user_id")
+    private Long userId;
+
+    @TableField("user_name")
+    private String userName;
+
+    @TableField("create_time")
+    private Date createTime;
+
+
+}

src/main/java/com/fdkankan/contro/generate/AutoGenerate.java

@@ -17,7 +17,7 @@ public class AutoGenerate {
         String path =System.getProperty("user.dir");
 
         generate(path,"contro", getTables(new String[]{
-                "t_relocaltion_bind"
+                "t_relocation_init"
         }));
 
 //        generate(path,"goods", getTables(new String[]{

src/main/java/com/fdkankan/contro/mapper/ISceneUploadUserLogMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.contro.mapper;
+
+import com.fdkankan.contro.entity.SceneUploadUserLog;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 场景上传用户记录表 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2026-01-05
+ */
+@Mapper
+public interface ISceneUploadUserLogMapper extends BaseMapper<SceneUploadUserLog> {
+
+}

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

@@ -0,0 +1,20 @@
+package com.fdkankan.contro.service;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.contro.entity.SceneUploadUserLog;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 场景上传用户记录表 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2026-01-05
+ */
+public interface ISceneUploadUserLogService extends IService<SceneUploadUserLog> {
+
+    void saveLog(JSONObject fdage, String num);
+
+
+}

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

@@ -24,6 +24,7 @@ import com.fdkankan.contro.constant.RedisConstants;
 import com.fdkankan.contro.entity.*;
 import com.fdkankan.contro.enums.CameraTypeEnum;
 import com.fdkankan.contro.mapper.ISceneFileBuildMapper;
+import com.fdkankan.contro.mapper.ISceneUploadUserLogMapper;
 import com.fdkankan.contro.service.ICommonService;
 import com.fdkankan.contro.service.*;
 import com.fdkankan.contro.vo.ResponseSceneFile;
@@ -449,6 +450,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
         return buildScenePost(dataSource, jsonObject, buildType, cameraType, sceneNum, cameraDetail, rebuild, icon);
     }
 
+    @Autowired
+    private ISceneUploadUserLogService sceneUploadUserLogService;
+
     private ScenePlusVO buildScenePost(String dataSource, JSONObject jsonObject, String buildType, long cameraType,
                                        String sceneNum, CameraDetail cameraDetail, int rebuild, String icon) throws Exception {
         String imgViewPath = String.format(UploadFilePath.IMG_VIEW_PATH, sceneNum);
@@ -487,6 +491,9 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
                 jsonObject.getInteger("scenetype"), jsonObject.getString("gps"), rebuild,
                 jsonObject.getInteger("resolution"), firmwareVersion.toString(), sceneUrl, buildType, cameraDetail.getCooperationUser());
 
+        //记录场景每次上传所使用的账号
+        sceneUploadUserLogService.saveLog(jsonObject, sceneNum);
+
         try {
             //上传app状态文件
             commonService.uploadStatusJson(sceneNum, scenePlusVO.getSceneStatus(),

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

@@ -0,0 +1,48 @@
+package com.fdkankan.contro.service.impl;
+
+import com.alibaba.fastjson.JSONObject;
+import com.fdkankan.contro.entity.SceneUploadUserLog;
+import com.fdkankan.contro.entity.User;
+import com.fdkankan.contro.mapper.ISceneUploadUserLogMapper;
+import com.fdkankan.contro.service.ISceneUploadUserLogService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fdkankan.contro.service.IUserService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 场景上传用户记录表 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2026-01-05
+ */
+@Slf4j
+@Service
+public class SceneUploadUserLogServiceImpl extends ServiceImpl<ISceneUploadUserLogMapper, SceneUploadUserLog> implements ISceneUploadUserLogService {
+
+    @Autowired
+    private IUserService userService;
+
+
+    @Override
+    public void saveLog(JSONObject fdage, String num) {
+        Long userId = fdage.getLong("account");
+        if(userId == null){
+            log.warn("fdage中的account为空, num:{}", num);
+            return;
+        }
+        SceneUploadUserLog sceneUploadUserLog = new SceneUploadUserLog();
+        sceneUploadUserLog.setUserId(userId);
+        sceneUploadUserLog.setNum(num);
+        User user = userService.getById(userId);
+        if(user != null) {
+            sceneUploadUserLog.setUserName(user.getUserName());
+        }else{
+            log.warn("fdage中的account不存在, account:{}, num:{}", userId, num);
+        }
+        this.save(sceneUploadUserLog);
+    }
+}

src/main/resources/mapper/contro/SceneUploadUserLogMapper.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.fdkankan.contro.mapper.ISceneUploadUserLogMapper">
+
+</mapper>