Merge branch 'release-ajkl' into test

src/main/java/com/fdkankan/scene/controller/CompanyController.java

@@ -0,0 +1,21 @@
+package com.fdkankan.scene.controller;
+
+
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * <p>
+ * 客户企业logo信息 前端控制器
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-13
+ */
+@RestController
+@RequestMapping("/scene/company")
+public class CompanyController {
+
+}
+

src/main/java/com/fdkankan/scene/entity/Company.java

@@ -0,0 +1,135 @@
+package com.fdkankan.scene.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableLogic;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 客户企业logo信息
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-13
+ */
+@Getter
+@Setter
+@TableName("t_company")
+public class Company implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    @TableId(value = "id", type = IdType.AUTO)
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    @TableField("company_name")
+    private String companyName;
+
+    /**
+     * 顶部logo
+     */
+    @TableField("top_logo")
+    private String topLogo;
+
+    /**
+     * 地面logo
+     */
+    @TableField("floor_logo")
+    private String floorLogo;
+
+    /**
+     * 地面点位logo
+     */
+    @TableField("marker_logo")
+    private String markerLogo;
+
+    /**
+     * 二维码logo
+     */
+    @TableField("qr_logo")
+    private String qrLogo;
+
+    /**
+     * 是否显示初始logo，0隐藏，1显示
+     */
+    @TableField("show_logo")
+    private Integer showLogo;
+
+    /**
+     * t_manager表的id
+     */
+    @TableField("sys_user_id")
+    private Long sysUserId;
+
+    /**
+     * 新增的相机是否注册，0否，1删
+     */
+    @TableField("camera_delete")
+    private Integer cameraDelete;
+
+    /**
+     * 创建时间
+     */
+    @TableField("create_time")
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    @TableField("update_time")
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    @TableField("rec_status")
+    @TableLogic(value = "A", delval = "I")
+    private String recStatus;
+
+    @TableField("calculate_flexibility")
+    private Boolean calculateFlexibility;
+
+    /**
+     * 数据同步类型
+     */
+    @TableField("data_sync")
+    private String dataSync;
+
+    @TableField("company_desc")
+    private String companyDesc;
+
+    @TableField("manager_id")
+    private Integer managerId;
+
+    /**
+     * V3:计算为V3场景，V4:计算为V4场景，默认为V4场景
+     */
+    @TableField("scene_version")
+    private String sceneVersion;
+
+    @TableField("call_queue_name")
+    private String callQueueName;
+
+    /**
+     * 是否可以上传官网，0否，1是
+     */
+    @TableField("can_up_website")
+    private Integer canUpWebsite;
+
+    /**
+     * 是否支持安居客数据格式包
+     */
+    @TableField("ajk_data")
+    private Integer ajkData;
+
+
+}

src/main/java/com/fdkankan/scene/mapper/ICompanyMapper.java

@@ -0,0 +1,18 @@
+package com.fdkankan.scene.mapper;
+
+import com.fdkankan.scene.entity.Company;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * <p>
+ * 客户企业logo信息 Mapper 接口
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-13
+ */
+@Mapper
+public interface ICompanyMapper extends BaseMapper<Company> {
+
+}

src/main/java/com/fdkankan/scene/service/ICompanyService.java

@@ -0,0 +1,16 @@
+package com.fdkankan.scene.service;
+
+import com.fdkankan.scene.entity.Company;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务类
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-13
+ */
+public interface ICompanyService extends IService<Company> {
+
+}

src/main/java/com/fdkankan/scene/service/impl/CompanyServiceImpl.java

@@ -0,0 +1,20 @@
+package com.fdkankan.scene.service.impl;
+
+import com.fdkankan.scene.entity.Company;
+import com.fdkankan.scene.mapper.ICompanyMapper;
+import com.fdkankan.scene.service.ICompanyService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.springframework.stereotype.Service;
+
+/**
+ * <p>
+ * 客户企业logo信息 服务实现类
+ * </p>
+ *
+ * @author 
+ * @since 2025-06-13
+ */
+@Service
+public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> implements ICompanyService {
+
+}

src/main/java/com/fdkankan/scene/service/impl/SceneServiceImpl.java

@@ -8,6 +8,8 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fdkankan.model.constants.ConstantFilePath;
 import com.fdkankan.common.constant.ErrorCode;
 import com.fdkankan.common.exception.BusinessException;
+import com.fdkankan.scene.entity.*;
+import com.fdkankan.scene.service.*;
 import com.fdkankan.web.response.ResultData;
 import com.fdkankan.model.utils.CreateObjUtil;
 import com.fdkankan.common.util.DateUtil;
@@ -20,33 +22,7 @@ import com.fdkankan.redis.util.RedisLockUtil;
 import com.fdkankan.redis.util.RedisUtil;
 import com.fdkankan.scene.bean.RequestRebuildVedioScene;
 import com.fdkankan.scene.bean.RequestSceneCooperation;
-import com.fdkankan.scene.entity.Camera;
-import com.fdkankan.scene.entity.CameraDetail;
-import com.fdkankan.scene.entity.PicSceneProgress;
-import com.fdkankan.scene.entity.Scene;
-import com.fdkankan.scene.entity.SceneCooperation;
-import com.fdkankan.scene.entity.ScenePlus;
-import com.fdkankan.scene.entity.ScenePlusExt;
-import com.fdkankan.scene.entity.ScenePro;
-import com.fdkankan.scene.entity.SceneProEdit;
-import com.fdkankan.scene.entity.SceneResource;
-import com.fdkankan.scene.entity.User;
-import com.fdkankan.scene.entity.UserIncrement;
-import com.fdkankan.scene.entity.VideoSceneProgress;
 import com.fdkankan.scene.mapper.ISceneMapper;
-import com.fdkankan.scene.service.ICameraDetailService;
-import com.fdkankan.scene.service.ICameraService;
-import com.fdkankan.scene.service.IPicSceneProgressService;
-import com.fdkankan.scene.service.ISceneCooperationService;
-import com.fdkankan.scene.service.IScenePlusExtService;
-import com.fdkankan.scene.service.IScenePlusService;
-import com.fdkankan.scene.service.ISceneProEditService;
-import com.fdkankan.scene.service.ISceneProService;
-import com.fdkankan.scene.service.ISceneResourceService;
-import com.fdkankan.scene.service.ISceneService;
-import com.fdkankan.scene.service.IUserIncrementService;
-import com.fdkankan.scene.service.IUserService;
-import com.fdkankan.scene.service.IVideoSceneProgressService;
 import com.fdkankan.web.user.SSOUser;
 import java.io.File;
 import java.util.*;
@@ -104,6 +80,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
     private IPicSceneProgressService picSceneProgressService;
     @Autowired
     private RabbitMqProducer rabbitMqProducer;
+    @Autowired
+    private ICompanyService companyService;
 
     @Value("${queue.modeling.queue-video-a}")
     private String queueVideoA;
@@ -209,6 +187,9 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
                 if(cameraDetailEntity.getCompanyId().longValue() == 1 || cameraDetailEntity.getCompanyId().longValue() == 14){
                     jsonObject.put("exclude", new ArrayList<>());
                     jsonObject.put("company", cameraDetailEntity.getCompanyId().longValue());
+                    Company company = companyService.getById(cameraDetailEntity.getCompanyId());
+                    jsonObject.put("ajkData", company);
+
                 }
             }
             return result;
@@ -236,6 +217,8 @@ public class SceneServiceImpl extends ServiceImpl<ISceneMapper, Scene> implement
                     if(cameraDetail.getCompanyId().longValue() == 1 || cameraDetail.getCompanyId().longValue() == 14){
                         jsonObject.put("exclude", new ArrayList<>());
                         jsonObject.put("company", cameraDetail.getCompanyId().longValue());
+                        Company company = companyService.getById(cameraDetail.getCompanyId());
+                        jsonObject.put("ajkData", company);
                     }
                 }
             }

src/main/resources/mapper/scene/CompanyMapper.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.scene.mapper.ICompanyMapper">
+
+</mapper>