Merge remote-tracking branch 'origin/master'

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

@@ -43,4 +43,11 @@ public interface PlatformClient {
      */
     @PostMapping("/getSSOUserByUserId")
     ResultData getSSOUserByUserId(@RequestParam(value = "userId", required = false) Long userId) ;
+
+    /**
+     *
+     * @return company
+     */
+    @PostMapping("/getCompanyById")
+    ResultData getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) ;
 }

4dkankan-center-api/4dkankan-center-platform-api/src/main/java/com/fdkankan/platform/api/vo/Company.java

@@ -0,0 +1,86 @@
+package com.fdkankan.platform.api.vo;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * <p>
+ * 客户企业logo信息
+ * </p>
+ *
+ * @author 
+ * @since 2021-12-24
+ */
+@Getter
+@Setter
+public class Company implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    private Long id;
+
+    /**
+     * 公司名称
+     */
+    private String companyName;
+
+    /**
+     * 顶部logo
+     */
+    private String topLogo;
+
+    /**
+     * 地面logo
+     */
+    private String floorLogo;
+
+    /**
+     * 地面点位logo
+     */
+    private String markerLogo;
+
+    /**
+     * 二维码logo
+     */
+    private String qrLogo;
+
+    /**
+     * 是否显示初始logo，0隐藏，1显示
+     */
+    private Integer showLogo;
+
+    /**
+     * t_manager表的id
+     */
+    private Long managerId;
+
+    /**
+     * 新增的相机是否注册，0否，1删
+     */
+    private Integer cameraDelete;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    /**
+     * 记录的状态，A: 生效，I: 禁用
+     */
+    private String recStatus;
+
+    /**
+     * 0正常，1删除
+     */
+    private Integer tbStatus;
+
+
+}

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

@@ -3,8 +3,10 @@ package com.fdkankan.feign;
 import com.fdkankan.common.user.SSOUser;
 import com.fdkankan.goods.entity.Camera;
 import com.fdkankan.goods.entity.CameraDetail;
+import com.fdkankan.goods.entity.Company;
 import com.fdkankan.goods.service.ICameraDetailService;
 import com.fdkankan.goods.service.ICameraService;
+import com.fdkankan.goods.service.ICompanyService;
 import com.fdkankan.user.service.IUserService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -25,6 +27,8 @@ public class platformFeign {
     private ICameraDetailService cameraDetailService;
     @Autowired
     private IUserService userService;
+    @Autowired
+    private ICompanyService companyService;
 
     @PostMapping("/getCameraByChildName")
     public Camera getCameraByChildName(@RequestParam(value = "childName", required = false) String childName) {
@@ -50,5 +54,9 @@ public class platformFeign {
     public SSOUser getSSOUserByUserId(@RequestParam(value = "userId", required = false) Long userId) {
         return userService.getSSOUserByUserId(userId);
     }
+    @PostMapping("/getCompanyById")
+    public Company getCompanyById(@RequestParam(value = "companyId", required = false) Long companyId) {
+        return companyService.getById(companyId);
+    }
 
 }