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

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

@@ -0,0 +1,77 @@
+package com.fjhx.xmhjc.controller.about;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureSelectDto;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.xmhjc.service.about.AboutUsCultureService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 关于我们-企业文化 前端控制器
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@RestController
+@RequestMapping("/aboutUsCulture")
+public class AboutUsCultureController {
+
+    @Autowired
+    private AboutUsCultureService aboutUsCultureService;
+
+    /**
+     * 关于我们-企业文化列表
+     */
+    @PostMapping("/list")
+    public List<AboutUsCultureVo> list(@RequestBody AboutUsCultureSelectDto dto) {
+        return aboutUsCultureService.getList(dto);
+    }
+
+    /**
+     * 关于我们-企业文化分页
+     */
+    @PostMapping("/page")
+    public Page<AboutUsCultureVo> page(@RequestBody AboutUsCultureSelectDto dto) {
+        return aboutUsCultureService.getPage(dto);
+    }
+
+    /**
+     * 关于我们-企业文化明细
+     */
+    @PostMapping("/detail")
+    public AboutUsCultureVo detail(@RequestBody BaseSelectDto dto) {
+        return aboutUsCultureService.detail(dto.getId());
+    }
+
+    /**
+     * 关于我们-企业文化新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody AboutUsCultureDto aboutUsCultureDto) {
+        aboutUsCultureService.add(aboutUsCultureDto);
+    }
+
+    /**
+     * 关于我们-企业文化编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody AboutUsCultureDto aboutUsCultureDto) {
+        aboutUsCultureService.edit(aboutUsCultureDto);
+    }
+
+    /**
+     * 关于我们-企业文化删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        aboutUsCultureService.delete(dto.getId());
+    }
+
+}

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

@@ -0,0 +1,39 @@
+package com.fjhx.xmhjc.controller.open;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureDto;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureSelectDto;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.fjhx.xmhjc.service.about.AboutUsCultureService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 关于我们-企业文化 前端控制器
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@RestController
+@RequestMapping("/open/aboutUsCulture")
+public class OpenAboutUsCultureController {
+
+    @Autowired
+    private AboutUsCultureService aboutUsCultureService;
+
+    /**
+     * 关于我们-企业文化列表
+     */
+    @PostMapping("/listByOpen")
+    public List<AboutUsCultureVo> listByOpen() {
+        return aboutUsCultureService.getListByOpen();
+    }
+
+}

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

@@ -0,0 +1,38 @@
+package com.fjhx.xmhjc.controller.open;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsHonorDto;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsHonorSelectDto;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsHonorVo;
+import com.fjhx.xmhjc.service.about.AboutUsHonorService;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+/**
+ * 关于我们-荣誉资质 前端控制器
+ *
+ * @author lqh
+ * @since 2023-11-13
+ */
+@RestController
+@RequestMapping("/open/aboutUsHonor")
+public class OpenAboutUsHonorController {
+
+    @Autowired
+    private AboutUsHonorService aboutUsHonorService;
+
+    /**
+     * 关于我们-荣誉资质列表
+     */
+    @PostMapping("/listByOpen")
+    public List<AboutUsHonorVo> listByOpen() {
+        return aboutUsHonorService.getListByOpen();
+    }
+
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/about/dto/AboutUsCultureDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.xmhjc.entity.about.dto;
+
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 关于我们-企业文化新增编辑入参实体
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@Getter
+@Setter
+public class AboutUsCultureDto extends AboutUsCulture {
+
+    List<String> subTitleListReslut;
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/about/dto/AboutUsCultureSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.xmhjc.entity.about.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 关于我们-企业文化列表查询入参实体
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@Getter
+@Setter
+public class AboutUsCultureSelectDto extends BaseSelectDto {
+
+}

hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/about/po/AboutUsCulture.java

@@ -0,0 +1,59 @@
+package com.fjhx.xmhjc.entity.about.po;
+
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 关于我们-企业文化
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@Getter
+@Setter
+@TableName("about_us_culture")
+public class AboutUsCulture extends BasePo {
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 子标题
+     */
+    private String subtitleJson;
+
+    /**
+     * 1-无跳转地址 2-跳转第三方地址 3-跳转详情页面（通过id获取详情）
+     */
+    private String type;
+
+    /**
+     * 第三方地址
+     */
+    private String toUrl;
+
+    /**
+     * 详情页内容
+     */
+    private String detailsContent;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 状态
+     */
+    private String status;
+
+}

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

@@ -0,0 +1,24 @@
+package com.fjhx.xmhjc.entity.about.vo;
+
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 关于我们-企业文化列表查询返回值实体
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@Getter
+@Setter
+public class AboutUsCultureVo extends AboutUsCulture {
+
+    /**
+     * 子标题
+     */
+    List<String> subTitleListReslut;
+
+}

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

@@ -1,9 +1,12 @@
 package com.fjhx.xmhjc.entity.about.vo;
 
+import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.xmhjc.entity.about.po.AboutUsHonor;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.util.List;
+
 /**
  * 关于我们-荣誉资质列表查询返回值实体
  *
@@ -14,4 +17,8 @@ import lombok.Setter;
 @Setter
 public class AboutUsHonorVo extends AboutUsHonor {
 
+    /**
+     * 荣誉资质图片
+     */
+    List<FileInfoVo> honorCoverList;
 }

hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/about/AboutUsCultureMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.xmhjc.mapper.about;
+
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 关于我们-企业文化 Mapper 接口
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+public interface AboutUsCultureMapper extends BaseMapper<AboutUsCulture> {
+
+    /**
+     * 关于我们-企业文化列表
+     */
+    List<AboutUsCultureVo> getList(@Param("ew") IWrapper<AboutUsCulture> wrapper);
+
+    /**
+     * 关于我们-企业文化分页
+     */
+    Page<AboutUsCultureVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<AboutUsCulture> wrapper);
+
+}

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

@@ -0,0 +1,53 @@
+package com.fjhx.xmhjc.service.about;
+
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureSelectDto;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 关于我们-企业文化 服务类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+public interface AboutUsCultureService extends BaseService<AboutUsCulture> {
+
+    /**
+     * 关于我们-企业文化列表
+     */
+    List<AboutUsCultureVo> getList(AboutUsCultureSelectDto dto);
+
+    /**
+     * 关于我们-企业文化分页
+     */
+    Page<AboutUsCultureVo> getPage(AboutUsCultureSelectDto dto);
+
+    /**
+     * 关于我们-企业文化明细
+     */
+    AboutUsCultureVo detail(Long id);
+
+    /**
+     * 关于我们-企业文化新增
+     */
+    void add(AboutUsCultureDto aboutUsCultureDto);
+
+    /**
+     * 关于我们-企业文化编辑
+     */
+    void edit(AboutUsCultureDto aboutUsCultureDto);
+
+    /**
+     * 关于我们-企业文化删除
+     */
+    void delete(Long id);
+
+    List<AboutUsCultureVo> getListByOpen();
+}

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

@@ -49,4 +49,5 @@ public interface AboutUsHonorService extends BaseService<AboutUsHonor> {
      */
     void delete(Long id);
 
+    List<AboutUsHonorVo> getListByOpen();
 }

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

@@ -0,0 +1,95 @@
+package com.fjhx.xmhjc.service.about.impl;
+
+import com.alibaba.fastjson.JSON;
+import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
+import com.fjhx.xmhjc.entity.about.po.AboutUsHonor;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsHonorVo;
+import com.fjhx.xmhjc.mapper.about.AboutUsCultureMapper;
+import com.fjhx.xmhjc.service.about.AboutUsCultureService;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.SqlField;
+import org.springframework.stereotype.Service;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.xmhjc.entity.about.dto.AboutUsCultureDto;
+import cn.hutool.core.bean.BeanUtil;
+import org.springframework.transaction.annotation.Transactional;
+
+import java.beans.Transient;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * <p>
+ * 关于我们-企业文化 服务实现类
+ * </p>
+ *
+ * @author lqh
+ * @since 2023-11-14
+ */
+@Service
+public class AboutUsCultureServiceImpl extends ServiceImpl<AboutUsCultureMapper, AboutUsCulture> implements AboutUsCultureService {
+
+    @Override
+    public List<AboutUsCultureVo> getList(AboutUsCultureSelectDto dto) {
+        IWrapper<AboutUsCulture> wrapper = getWrapper();
+        wrapper.orderByDesc("auc", AboutUsCulture::getId);
+        List<AboutUsCultureVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<AboutUsCultureVo> getPage(AboutUsCultureSelectDto dto) {
+        IWrapper<AboutUsCulture> wrapper = getWrapper();
+        wrapper.keyword(dto,new SqlField("auc",AboutUsCulture::getTitle));
+        wrapper.orderByDesc("auc", AboutUsCulture::getId);
+        Page<AboutUsCultureVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public AboutUsCultureVo detail(Long id) {
+        AboutUsCulture AboutUsCulture = this.getById(id);
+        AboutUsCultureVo result = BeanUtil.toBean(AboutUsCulture, AboutUsCultureVo.class);
+        result.setSubTitleListReslut(JSON.parseArray(result.getSubtitleJson(),String.class));
+        return result;
+    }
+
+    @Override
+    @Transactional
+    public void add(AboutUsCultureDto aboutUsCultureDto) {
+        aboutUsCultureDto.setSubtitleJson(JSON.toJSONString(aboutUsCultureDto.getSubTitleListReslut()));
+        this.save(aboutUsCultureDto);
+    }
+
+    @Override
+    public void edit(AboutUsCultureDto aboutUsCultureDto) {
+        aboutUsCultureDto.setSubtitleJson(JSON.toJSONString(aboutUsCultureDto.getSubTitleListReslut()));
+        this.updateById(aboutUsCultureDto);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+
+    @Override
+    public List<AboutUsCultureVo> getListByOpen() {
+        IWrapper<AboutUsCulture> wrapper = getWrapper();
+        wrapper.eq(AboutUsCulture::getStatus,"1");
+        wrapper.orderByAsc("auc", AboutUsCulture::getSort);
+        List<AboutUsCultureVo> list = this.baseMapper.getList(wrapper);
+
+        list.forEach(x->{
+            x.setSubTitleListReslut(JSON.parseArray(x.getSubtitleJson(),String.class));
+        });
+
+        return list;
+    }
+}

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

@@ -1,11 +1,14 @@
 package com.fjhx.xmhjc.service.about.impl;
 
 import cn.hutool.core.util.ObjectUtil;
+import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.xmhjc.entity.about.po.AboutUsCulture;
 import com.fjhx.xmhjc.entity.about.po.AboutUsHonor;
 import com.fjhx.xmhjc.mapper.about.AboutUsHonorMapper;
 import com.fjhx.xmhjc.service.about.AboutUsHonorService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.utils.wrapper.SqlField;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.xmhjc.entity.about.vo.AboutUsHonorVo;
@@ -14,7 +17,9 @@ import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.fjhx.xmhjc.entity.about.dto.AboutUsHonorDto;
 import cn.hutool.core.bean.BeanUtil;
 
+import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 /**
  * <p>
@@ -40,9 +45,7 @@ public class AboutUsHonorServiceImpl extends ServiceImpl<AboutUsHonorMapper, Abo
 
         IWrapper<AboutUsHonor> wrapper = getWrapper();
         wrapper.orderByAsc("auh", AboutUsHonor::getSort);
-        if (ObjectUtil.isNotEmpty(dto.getKeyword())) {
+        wrapper.keyword(dto,new SqlField("auc", AboutUsHonor::getHonorName));
-            wrapper.and(q -> q.like(AboutUsHonor::getHonorName, dto.getKeyword()));
-        }
         Page<AboutUsHonorVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
         return page;
     }
@@ -75,4 +78,22 @@ public class AboutUsHonorServiceImpl extends ServiceImpl<AboutUsHonorMapper, Abo
         this.removeById(id);
     }
 
+
+    @Override
+    public List<AboutUsHonorVo> getListByOpen() {
+        IWrapper<AboutUsHonor> wrapper = getWrapper();
+        wrapper.eq(AboutUsHonor::getStatus,"1");
+        wrapper.orderByAsc("auh", AboutUsHonor::getSort);
+        List<AboutUsHonorVo> list = this.baseMapper.getList(wrapper);
+
+        list.forEach(x->{
+            //获取公众号图片
+            List<Long> businessIdList = new ArrayList<>();
+            businessIdList.add(x.getId());
+            Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(businessIdList, 1);
+            x.setHonorCoverList(fileMap.get(x.getId()));
+        });
+
+        return list;
+    }
 }

hx-xmhjc/src/main/resources/mapper/about/AboutUsCultureMapper.xml

@@ -0,0 +1,40 @@
+<?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.fjhx.xmhjc.mapper.about.AboutUsCultureMapper">
+    <select id="getList" resultType="com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo">
+        select
+            auc.id,
+            auc.title,
+            auc.subtitle_json,
+            auc.type,
+            auc.to_url,
+            auc.details_content,
+            auc.sort,
+            auc.status,
+            auc.create_user,
+            auc.create_time,
+            auc.update_user,
+            auc.update_time
+        from about_us_culture auc
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.xmhjc.entity.about.vo.AboutUsCultureVo">
+        select
+            auc.id,
+            auc.title,
+            auc.subtitle_json,
+            auc.type,
+            auc.to_url,
+            auc.details_content,
+            auc.sort,
+            auc.status,
+            auc.create_user,
+            auc.create_time,
+            auc.update_user,
+            auc.update_time
+        from about_us_culture auc
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>