1、厦门海嘉成-关于我们-荣誉资质

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/about/AboutUsBaseInfoController.java

@@ -50,14 +50,4 @@ public class AboutUsBaseInfoController {
         return aboutUsBaseInfoService.detailDefault();
     }
 
-    /**
-     * 关于我们-基础信息明细
-     * 五公司简介
-     * Not Profile
-     */
-    @PostMapping("/detailDefaultNotProfile")
-    public AboutUsBaseInfoVo detailDefaultNotProfile() {
-        return aboutUsBaseInfoService.detailDefaultNotProfile();
-    }
-
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenAboutUsBaseInfoController.java

@@ -0,0 +1,45 @@
+package com.fjhx.xmhjc.controller.open;
+
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBootInfoVo;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBasicInfoVo;
+import com.fjhx.xmhjc.service.about.AboutUsBaseInfoService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+
+/**
+ * 关于我们-基础信息 开放前端控制器
+ *
+ * @author lqh
+ * @since 2023-11-12
+ */
+@RestController
+@RequestMapping("/open/aboutUsBaseInfo")
+public class OpenAboutUsBaseInfoController {
+
+    @Autowired
+    private AboutUsBaseInfoService aboutUsBaseInfoService;
+
+    /**
+     * 关于我们-公司简介
+     */
+    @PostMapping("/detailDefaultByOpen")
+    public AboutUsBasicInfoVo detailDefault() {
+        return aboutUsBaseInfoService.detailDefaultByOpen();
+    }
+
+    /**
+     * 关于我们-底部信息
+     */
+    @PostMapping("/detailBootInfoByOpen")
+    public AboutUsBootInfoVo detailBootInfoByOpen() {
+        return aboutUsBaseInfoService.detailBootInfoByOpen();
+    }
+
+
+
+
+
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/about/vo/AboutUsBasicInfoVo.java

@@ -0,0 +1,28 @@
+package com.fjhx.xmhjc.entity.about.vo;
+
+import com.fjhx.file.entity.FileInfoVo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 关于我们-基础信息列表查询返回值实体
+ *
+ * @author lqh
+ * @since 2023-11-12
+ */
+@Getter
+@Setter
+public class AboutUsBasicInfoVo {
+
+    /**
+     * 公司简介
+     */
+    private String companyProfile;
+
+    /**
+     * 公司简介图片
+     */
+    List<FileInfoVo> companyCoverList;
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/about/vo/AboutUsBootInfoVo.java

@@ -0,0 +1,49 @@
+package com.fjhx.xmhjc.entity.about.vo;
+
+import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.xmhjc.entity.about.po.AboutUsBaseInfo;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 关于我们-基础信息列表查询返回值实体
+ *
+ * @author lqh
+ * @since 2023-11-12
+ */
+@Getter
+@Setter
+public class AboutUsBootInfoVo {
+
+    /**
+     * 联系方式1
+     */
+    private String mobileOne;
+
+    /**
+     * 联系方式2
+     */
+    private String mobileTwo;
+
+    /**
+     * 公司地址
+     */
+    private String address;
+
+    /**
+     * 电子邮件mail
+     */
+    private String email;
+
+    /**
+     * 备案号
+     */
+    private String filingNumber;
+
+    /**
+     * 公众号图片
+     */
+    List<FileInfoVo> gzhQrCodeList;
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/about/AboutUsBaseInfoService.java

@@ -1,6 +1,8 @@
 package com.fjhx.xmhjc.service.about;
 
 import com.fjhx.xmhjc.entity.about.po.AboutUsBaseInfo;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBootInfoVo;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBasicInfoVo;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.xmhjc.entity.about.vo.AboutUsBaseInfoVo;
@@ -45,5 +47,7 @@ public interface AboutUsBaseInfoService extends BaseService<AboutUsBaseInfo> {
 
     AboutUsBaseInfoVo detailDefault();
 
-    AboutUsBaseInfoVo detailDefaultNotProfile();
+    AboutUsBasicInfoVo detailDefaultByOpen();
+
+    AboutUsBootInfoVo detailBootInfoByOpen();
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/about/impl/AboutUsBaseInfoServiceImpl.java

@@ -1,7 +1,10 @@
 package com.fjhx.xmhjc.service.about.impl;
 
+import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.xmhjc.entity.about.po.AboutUsBaseInfo;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBootInfoVo;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsBasicInfoVo;
 import com.fjhx.xmhjc.mapper.about.AboutUsBaseInfoMapper;
 import com.fjhx.xmhjc.service.about.AboutUsBaseInfoService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -13,7 +16,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.xmhjc.entity.about.dto.AboutUsBaseInfoDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 
 /**
@@ -77,14 +82,40 @@ public class AboutUsBaseInfoServiceImpl extends ServiceImpl<AboutUsBaseInfoMappe
 
 
     @Override
-    public AboutUsBaseInfoVo detailDefaultNotProfile() {
+    public AboutUsBasicInfoVo detailDefaultByOpen() {
+
         AboutUsBaseInfo aboutUsBaseInfo = new AboutUsBaseInfo();
         List<AboutUsBaseInfo> list = lambdaQuery().list();
         if (!list.isEmpty()){
             aboutUsBaseInfo = list.get(0);
-            aboutUsBaseInfo.setCompanyProfile("");
         }
-        AboutUsBaseInfoVo result = BeanUtil.toBean(aboutUsBaseInfo, AboutUsBaseInfoVo.class);
+        AboutUsBasicInfoVo result = BeanUtil.toBean(aboutUsBaseInfo, AboutUsBasicInfoVo.class);
+
+        //获取公司简介图片
+        List<Long> businessIdList = new ArrayList<>();
+        businessIdList.add(aboutUsBaseInfo.getId());
+        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(businessIdList, 1);
+        result.setCompanyCoverList(fileMap.get(aboutUsBaseInfo.getId()));
+
+        return result;
+    }
+
+    @Override
+    public AboutUsBootInfoVo detailBootInfoByOpen() {
+
+        AboutUsBaseInfo aboutUsBaseInfo = new AboutUsBaseInfo();
+        List<AboutUsBaseInfo> list = lambdaQuery().list();
+        if (!list.isEmpty()){
+            aboutUsBaseInfo = list.get(0);
+        }
+        AboutUsBootInfoVo result = BeanUtil.toBean(aboutUsBaseInfo, AboutUsBootInfoVo.class);
+
+        //获取公众号图片
+        List<Long> businessIdList = new ArrayList<>();
+        businessIdList.add(aboutUsBaseInfo.getId());
+        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(businessIdList, 2);
+        result.setGzhQrCodeList(fileMap.get(aboutUsBaseInfo.getId()));
+
         return result;
     }
 }