1018653686@qq.com 1 سال پیش
والد
کامیت
e3e6920312

تفاوت فایلی نمایش داده نمی شود زیرا این فایل بسیار بزرگ است
+ 0 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/a-json/CarouselManagerApi.json


+ 77 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/carousel/CarouselManagerController.java

@@ -0,0 +1,77 @@
+package com.fjhx.xmhjc.controller.carousel;
+
+import org.springframework.web.bind.annotation.*;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerSelectDto;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerDto;
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.fjhx.xmhjc.service.carousel.CarouselManagerService;
+import org.springframework.beans.factory.annotation.Autowired;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 轮播图管理 前端控制器
+ * </p>
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@RestController
+@RequestMapping("/carouselManager")
+public class CarouselManagerController {
+
+    @Autowired
+    private CarouselManagerService carouselManagerService;
+
+    /**
+     * 轮播图管理列表
+     */
+    @PostMapping("/list")
+    public List<CarouselManagerVo> list(@RequestBody CarouselManagerSelectDto dto) {
+        return carouselManagerService.getList(dto);
+    }
+
+    /**
+     * 轮播图管理分页
+     */
+    @PostMapping("/page")
+    public Page<CarouselManagerVo> page(@RequestBody CarouselManagerSelectDto dto) {
+        return carouselManagerService.getPage(dto);
+    }
+
+    /**
+     * 轮播图管理明细
+     */
+    @PostMapping("/detail")
+    public CarouselManagerVo detail(@RequestBody BaseSelectDto dto) {
+        return carouselManagerService.detail(dto.getId());
+    }
+
+    /**
+     * 轮播图管理新增
+     */
+    @PostMapping("/add")
+    public void add(@RequestBody CarouselManagerDto carouselManagerDto) {
+        carouselManagerService.add(carouselManagerDto);
+    }
+
+    /**
+     * 轮播图管理编辑
+     */
+    @PostMapping("/edit")
+    public void edit(@RequestBody CarouselManagerDto carouselManagerDto) {
+        carouselManagerService.edit(carouselManagerDto);
+    }
+
+    /**
+     * 轮播图管理删除
+     */
+    @PostMapping("/delete")
+    public void delete(@RequestBody BaseSelectDto dto) {
+        carouselManagerService.delete(dto.getId());
+    }
+
+}

+ 29 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/controller/open/OpenCarouselController.java

@@ -0,0 +1,29 @@
+package com.fjhx.xmhjc.controller.open;
+
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerSelectDto;
+import com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo;
+import com.fjhx.xmhjc.entity.product.dto.ProductInfoSelectDto;
+import com.fjhx.xmhjc.entity.product.vo.ProductCategoryVo;
+import com.fjhx.xmhjc.entity.product.vo.ProductInfoVo;
+import com.fjhx.xmhjc.service.carousel.CarouselManagerService;
+import com.fjhx.xmhjc.service.product.ProductCategoryService;
+import com.fjhx.xmhjc.service.product.ProductInfoService;
+import org.springframework.web.bind.annotation.*;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@RestController
+@RequestMapping("/open/carousel")
+public class OpenCarouselController {
+    @Resource
+    private CarouselManagerService carouselManagerService;
+
+    @PostMapping("/list")
+    public Page<CarouselManagerVo> categoryList(CarouselManagerSelectDto dto) {
+        Page<CarouselManagerVo> page = carouselManagerService.pageByOpen(dto);
+        return page;
+    }
+
+}

+ 20 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/carousel/dto/CarouselManagerDto.java

@@ -0,0 +1,20 @@
+package com.fjhx.xmhjc.entity.carousel.dto;
+
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 轮播图管理新增编辑入参实体
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@Getter
+@Setter
+public class CarouselManagerDto extends CarouselManager {
+    List<ObsFile> carouselUrlList;
+}

+ 17 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/carousel/dto/CarouselManagerSelectDto.java

@@ -0,0 +1,17 @@
+package com.fjhx.xmhjc.entity.carousel.dto;
+
+import com.ruoyi.common.core.domain.BaseSelectDto;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * 轮播图管理列表查询入参实体
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@Getter
+@Setter
+public class CarouselManagerSelectDto extends BaseSelectDto {
+    String modules;
+}

+ 54 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/carousel/po/CarouselManager.java

@@ -0,0 +1,54 @@
+package com.fjhx.xmhjc.entity.carousel.po;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.ruoyi.common.core.domain.BasePo;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.util.Date;
+import lombok.Getter;
+import lombok.Setter;
+
+/**
+ * <p>
+ * 轮播图管理
+ * </p>
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@Getter
+@Setter
+@TableName("carousel_manager")
+public class CarouselManager extends BasePo {
+
+    /**
+     * 标题
+     */
+    private String title;
+
+    /**
+     * 副标题
+     */
+    private String subTitle;
+
+    /**
+     * 跳转方式1=文章;2=外链
+     */
+    private String targetType;
+
+    /**
+     * 外链url
+     */
+    private String url;
+
+    /**
+     * 文章id
+     */
+    private Long articleId;
+
+    private Integer sort;
+
+    private String status;
+
+    @TableField(value = "`modules`")
+    private String modules;
+}

+ 20 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/entity/carousel/vo/CarouselManagerVo.java

@@ -0,0 +1,20 @@
+package com.fjhx.xmhjc.entity.carousel.vo;
+
+import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import lombok.Getter;
+import lombok.Setter;
+
+import java.util.List;
+
+/**
+ * 轮播图管理列表查询返回值实体
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@Getter
+@Setter
+public class CarouselManagerVo extends CarouselManager {
+    List<FileInfoVo> carouselUrlList;
+}

+ 32 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/mapper/carousel/CarouselManagerMapper.java

@@ -0,0 +1,32 @@
+package com.fjhx.xmhjc.mapper.carousel;
+
+import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 轮播图管理 Mapper 接口
+ * </p>
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+public interface CarouselManagerMapper extends BaseMapper<CarouselManager> {
+
+    /**
+     * 轮播图管理列表
+     */
+    List<CarouselManagerVo> getList(@Param("ew") IWrapper<CarouselManager> wrapper);
+
+    /**
+     * 轮播图管理分页
+     */
+    Page<CarouselManagerVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<CarouselManager> wrapper);
+
+}

+ 53 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/carousel/CarouselManagerService.java

@@ -0,0 +1,53 @@
+package com.fjhx.xmhjc.service.carousel;
+
+import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import com.ruoyi.common.core.service.BaseService;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerSelectDto;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerDto;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 轮播图管理 服务类
+ * </p>
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+public interface CarouselManagerService extends BaseService<CarouselManager> {
+
+    /**
+     * 轮播图管理列表
+     */
+    List<CarouselManagerVo> getList(CarouselManagerSelectDto dto);
+
+    /**
+     * 轮播图管理分页
+     */
+    Page<CarouselManagerVo> getPage(CarouselManagerSelectDto dto);
+
+    /**
+     * 轮播图管理明细
+     */
+    CarouselManagerVo detail(Long id);
+
+    /**
+     * 轮播图管理新增
+     */
+    void add(CarouselManagerDto carouselManagerDto);
+
+    /**
+     * 轮播图管理编辑
+     */
+    void edit(CarouselManagerDto carouselManagerDto);
+
+    /**
+     * 轮播图管理删除
+     */
+    void delete(Long id);
+
+    Page<CarouselManagerVo> pageByOpen(CarouselManagerSelectDto dto);
+}

+ 95 - 0
hx-xmhjc/src/main/java/com/fjhx/xmhjc/service/carousel/impl/CarouselManagerServiceImpl.java

@@ -0,0 +1,95 @@
+package com.fjhx.xmhjc.service.carousel.impl;
+
+import cn.hutool.core.util.StrUtil;
+import com.fjhx.file.entity.FileInfoVo;
+import com.fjhx.file.utils.ObsFileUtil;
+import com.fjhx.xmhjc.entity.carousel.po.CarouselManager;
+import com.fjhx.xmhjc.mapper.carousel.CarouselManagerMapper;
+import com.fjhx.xmhjc.service.carousel.CarouselManagerService;
+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.carousel.vo.CarouselManagerVo;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerSelectDto;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.fjhx.xmhjc.entity.carousel.dto.CarouselManagerDto;
+import cn.hutool.core.bean.BeanUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+/**
+ * <p>
+ * 轮播图管理 服务实现类
+ * </p>
+ *
+ * @author hj
+ * @since 2023-11-19
+ */
+@Service
+public class CarouselManagerServiceImpl extends ServiceImpl<CarouselManagerMapper, CarouselManager> implements CarouselManagerService {
+
+    @Override
+    public List<CarouselManagerVo> getList(CarouselManagerSelectDto dto) {
+        IWrapper<CarouselManager> wrapper = getWrapper();
+        wrapper.orderByDesc("cm", CarouselManager::getId);
+        List<CarouselManagerVo> list = this.baseMapper.getList(wrapper);
+        return list;
+    }
+
+    @Override
+    public Page<CarouselManagerVo> getPage(CarouselManagerSelectDto dto) {
+        IWrapper<CarouselManager> wrapper = getWrapper();
+        wrapper.orderByDesc("cm", CarouselManager::getId);
+        wrapper.keyword(dto, new SqlField("cm", CarouselManager::getTitle));
+
+        Page<CarouselManagerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        return page;
+    }
+
+    @Override
+    public CarouselManagerVo detail(Long id) {
+        CarouselManager CarouselManager = this.getById(id);
+        CarouselManagerVo result = BeanUtil.toBean(CarouselManager, CarouselManagerVo.class);
+        return result;
+    }
+
+    @Override
+    public void add(CarouselManagerDto carouselManagerDto) {
+        this.save(carouselManagerDto);
+        // 保存图片
+        ObsFileUtil.saveFile(carouselManagerDto.getCarouselUrlList(), carouselManagerDto.getId(), 1);
+    }
+
+    @Override
+    public void edit(CarouselManagerDto carouselManagerDto) {
+        this.updateById(carouselManagerDto);
+        // 保存图片
+        ObsFileUtil.saveFile(carouselManagerDto.getCarouselUrlList(), carouselManagerDto.getId(), 1);
+    }
+
+    @Override
+    public void delete(Long id) {
+        this.removeById(id);
+    }
+
+    @Override
+    public Page<CarouselManagerVo> pageByOpen(CarouselManagerSelectDto dto) {
+        IWrapper<CarouselManager> wrapper = getWrapper();
+        wrapper.orderByAsc("cm", CarouselManager::getSort);
+        wrapper.eq("cm", CarouselManager::getStatus, 1);
+        wrapper.eq(StrUtil.isNotBlank(dto.getModules()), "modules", dto.getModules());
+        Page<CarouselManagerVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
+        List<CarouselManagerVo> list = page.getRecords();
+        List<Long> businessIdList = list.stream().map(CarouselManagerVo::getId).collect(Collectors.toList());
+        Map<Long, List<FileInfoVo>> fileMap = ObsFileUtil.getFileMap(businessIdList, 1);
+        list.forEach(item -> {
+            item.setCarouselUrlList(fileMap.get(item.getId()));
+        });
+        page.setRecords(list);
+        return page;
+    }
+}

+ 42 - 0
hx-xmhjc/src/main/resources/mapper/carousel/CarouselManagerMapper.xml

@@ -0,0 +1,42 @@
+<?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.carousel.CarouselManagerMapper">
+    <select id="getList" resultType="com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo">
+        select
+            cm.id,
+            cm.title,
+            cm.sub_title,
+            cm.target_type,
+            cm.url,
+            cm.article_id,
+            cm.sort,
+            cm.status,
+            cm.create_user,
+            cm.create_time,
+            cm.update_user,
+            cm.update_time,
+            cm.modules
+        from carousel_manager cm
+            ${ew.customSqlSegment}
+    </select>
+
+    <select id="getPage" resultType="com.fjhx.xmhjc.entity.carousel.vo.CarouselManagerVo">
+        select
+            cm.id,
+            cm.title,
+            cm.sub_title,
+            cm.target_type,
+            cm.url,
+            cm.article_id,
+            cm.sort,
+            cm.status,
+            cm.create_user,
+            cm.create_time,
+            cm.update_user,
+            cm.update_time,
+            cm.modules
+        from carousel_manager cm
+            ${ew.customSqlSegment}
+    </select>
+
+</mapper>

برخی فایل ها در این مقایسه diff نمایش داده نمی شوند زیرا تعداد فایل ها بسیار زیاد است