更改小程序首页轮播图存储位置

src/main/java/com/lyy/admin/VO/HomePageVO.java

 package com.lyy.admin.VO;
 
 import com.lyy.admin.domain.system.SysCarouselInfo;
+import com.lyy.admin.moudle.entity.SysCommonFile;
+import com.lyy.admin.moudle.vo.SysCommonFileVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
@@ -20,10 +22,12 @@ public class HomePageVO {
     private String megalopolisInfoName = "";
     @ApiModelProperty(value = "都市圈id")
     private Integer megalopolisInfoId = null;
-//    @ApiModelProperty(value = "城市覆盖总数")
-//    private Long coverCityCount;
+
     @ApiModelProperty(value = "轮播图列表")
-    private List<SysCarouselInfo> sysCarouselInfolist = new ArrayList<>();
+//    private List<SysCarouselInfo> sysCarouselInfolist = new ArrayList<>();
+    private List<SysCommonFileVo> sysCarouselInfolist = new ArrayList<>();
+
+
     @ApiModelProperty(value = "热点园区")
     private List<ParkInfoListVO> parkInfoListVO =new ArrayList<>();
 

src/main/java/com/lyy/admin/controller/homepage/HomePageController.java

 package com.lyy.admin.controller.homepage;
 
+import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.date.DateUtil;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.lyy.admin.VO.HomePageVO;
 import com.lyy.admin.VO.ParkInfoListVO;
@@ -17,8 +19,10 @@ import com.lyy.admin.domain.parkinfo.ParkInfoParam;
 import com.lyy.admin.domain.system.SysAreaCode;
 import com.lyy.admin.domain.system.SysCarouselInfo;
 import com.lyy.admin.VO.SysCarouselInfoVO;
-import com.lyy.admin.enumerate.DevelopmentStatusEnum;
-import com.lyy.admin.enumerate.ParkInfoEnum;
+import com.lyy.admin.enumerate.*;
+import com.lyy.admin.moudle.entity.SysCommonFile;
+import com.lyy.admin.moudle.service.SysCommonFileService;
+import com.lyy.admin.moudle.vo.SysCommonFileVo;
 import com.lyy.admin.service.HotRegionService;
 import com.lyy.admin.service.MegalopolisCoreCityInfoService;
 import com.lyy.admin.service.RegionTargetInfoService;
@@ -67,7 +71,7 @@ public class HomePageController extends BaseController {
     HotRegionService hotRegionService;
 
     @Autowired
-    SysCarouselInfoService sysCarouselInfoService;
+    SysCommonFileService sysCommonFileService;
 
     @Autowired
     SysAreaCodeService sysAreaCodeService;
@@ -144,10 +148,15 @@ public class HomePageController extends BaseController {
             }
         }
 
-        QueryWrapper<SysCarouselInfo> sysCarouselInfoQW = new QueryWrapper<>();
-        sysCarouselInfoQW.eq("`status`", 1);
-        sysCarouselInfoQW.eq("`type`", 3);
-        List<SysCarouselInfo> list = sysCarouselInfoService.list(sysCarouselInfoQW);
+//        QueryWrapper<SysCarouselInfo> sysCarouselInfoQW = new QueryWrapper<>();
+//        sysCarouselInfoQW.eq("`status`", 1);
+//        sysCarouselInfoQW.eq("`type`", 3);
+//        List<SysCarouselInfo> list = sysCarouselInfoService.list(sysCarouselInfoQW);
+        LambdaQueryWrapper<SysCommonFile> sysCommonFileLambdaQueryWrapper = new LambdaQueryWrapper<>();
+        sysCommonFileLambdaQueryWrapper.eq(SysCommonFile::getStatus, StatusEnum.ENABLE.getCode());
+        sysCommonFileLambdaQueryWrapper.eq(SysCommonFile::getType, CommonFileTypeEnum.YQZDSYLBT.getType());
+        List<SysCommonFile> list = sysCommonFileService.list(sysCommonFileLambdaQueryWrapper);
+        List<SysCommonFileVo> collect = list.stream().map(data -> BeanUtil.copyProperties(data, SysCommonFileVo.class)).collect(Collectors.toList());
 
 
         List<ParkInfo> lists = parkInfoService.selectHotParkInfoListVO();
@@ -162,7 +171,7 @@ public class HomePageController extends BaseController {
         homePageVO.setMegalopolisInfoCount(megalopolisInfoCount);
         homePageVO.setMegalopolisInfoId(megalopoisId);
         homePageVO.setMegalopolisInfoName(megalopolisInfoName);
-        homePageVO.setSysCarouselInfolist(list);
+        homePageVO.setSysCarouselInfolist(collect);
         homePageVO.setParkInfoListVO(parkInfoListVOs);
 
         return homePageVO;
@@ -186,24 +195,4 @@ public class HomePageController extends BaseController {
     }
 
 
-    @PostMapping("/homePageList")
-    @ResponseBody
-//    @ApiOperation(value = "首页轮播图",notes = "")
-    public List<SysCarouselInfo> homePageList() {
-        QueryWrapper<SysCarouselInfo> sysCarouselInfoQW = new QueryWrapper<>();
-        sysCarouselInfoQW.eq("`status`", 1);
-        sysCarouselInfoQW.eq("`type`", 3);
-        return sysCarouselInfoService.list(sysCarouselInfoQW);
-    }
-
-    @PostMapping("/saveCarouselInfo")
-    @ResponseBody
-    @ApiOperation(value = "保存轮播图", notes = "")
-    public boolean saveOrUpdateCarouselInfo(SysCarouselInfoVO sysCarouselInfoVO) {
-        SysCarouselInfo sysCarouselInfo = new SysCarouselInfo();
-        BeanUtils.copyProperties(sysCarouselInfoVO, sysCarouselInfo);
-        return sysCarouselInfoService.save(sysCarouselInfo);
-    }
-
-
 }

src/main/java/com/lyy/admin/enumerate/CarouselTypeEnum.java

@@ -4,10 +4,8 @@ public enum CarouselTypeEnum {
     DUSHIQUAN(0,"都市圈"),
     KAIFAQU(1,"开发区"),
     YUANQU(2,"园区"),
-    LAND(4, "土地轮播图"),
-    CARRIER(5, "载体轮播图"),
-    SHOUYE(3, "园区字典首页"),
-    LYYSHOUYE(6, "立业云首页");
+    LAND(3, "土地轮播图"),
+    CARRIER(4, "载体轮播图");
     private Integer type;
     private String typeName;
 

src/main/java/com/lyy/admin/enumerate/CommonFileTypeEnum.java

+package com.lyy.admin.enumerate;
+
+public enum CommonFileTypeEnum {
+
+    YQZDSYLBT(3, "园区字典首页轮播图");
+    private Integer type;
+    private String typeName;
+
+    CommonFileTypeEnum(Integer typeId, String typeName) {
+        this.type = typeId;
+        this.typeName = typeName;
+    }
+
+    public Integer getType() {
+        return type;
+    }
+}

src/main/java/com/lyy/admin/moudle/entity/SysCommonFile.java

+package com.lyy.admin.moudle.entity;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import java.io.Serializable;
+import java.util.Date;
+import lombok.Data;
+
+/**
+ * 系统级别附件（图片、视频）
+ * @TableName sys_common_file
+ */
+@TableName(value ="sys_common_file")
+@Data
+public class SysCommonFile implements Serializable {
+    /**
+     * 主键id
+     */
+    @TableId(type = IdType.AUTO)
+    private Integer id;
+
+    /**
+     * 附件地址
+     */
+    private String imgUrl;
+
+    /**
+     * 描述信息
+     */
+    private String description;
+
+    /**
+     * 是否启用（0：否 1：是）
+     */
+    private Integer status;
+
+    /**
+     * 类型（附件使用的地方）
+     */
+    private String type;
+
+    /**
+     * 排序
+     */
+    private Integer sort;
+
+    /**
+     * 附件点击连接
+     */
+    private String linkUrl;
+
+    /**
+     * 附件的类型（1：图片 2：视频 3：vr）
+     */
+    private Integer urlType;
+
+    /**
+     * 视频 封面图片url
+     */
+    private String videoCover;
+
+    /**
+     * 备注字段1
+     */
+    private String r1;
+
+    /**
+     * 备注字段2
+     */
+    private String r2;
+
+    /**
+     * 备注字段3
+     */
+    private String r3;
+
+    /**
+     * 乐观锁
+     */
+    private Integer version;
+
+    /**
+     * 创建人
+     */
+    private String createBy;
+
+    /**
+     * 创建时间
+     */
+    private Date createTime;
+
+    /**
+     * 更新人
+     */
+    private String updateBy;
+
+    /**
+     * 更新时间
+     */
+    private Date updateTime;
+
+    @TableField(exist = false)
+    private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

src/main/java/com/lyy/admin/moudle/mapper/SysCommonFileMapper.java

+package com.lyy.admin.moudle.mapper;
+
+import com.lyy.admin.moudle.entity.SysCommonFile;
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+
+/**
+* @author 26996
+* @description 针对表【sys_common_file(系统级别附件（图片、视频）)】的数据库操作Mapper
+* @createDate 2023-12-19 18:23:36
+* @Entity com.lyy.admin.moudle.entity.SysCommonFile
+*/
+public interface SysCommonFileMapper extends BaseMapper<SysCommonFile> {
+
+}
+
+
+
+

src/main/java/com/lyy/admin/moudle/service/SysCommonFileService.java

+package com.lyy.admin.moudle.service;
+
+import com.lyy.admin.moudle.entity.SysCommonFile;
+import com.baomidou.mybatisplus.extension.service.IService;
+
+/**
+* @author 26996
+* @description 针对表【sys_common_file(系统级别附件（图片、视频）)】的数据库操作Service
+* @createDate 2023-12-19 18:23:36
+*/
+public interface SysCommonFileService extends IService<SysCommonFile> {
+
+}

src/main/java/com/lyy/admin/moudle/service/impl/SysCommonFileServiceImpl.java

+package com.lyy.admin.moudle.service.impl;
+
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.lyy.admin.moudle.entity.SysCommonFile;
+import com.lyy.admin.moudle.service.SysCommonFileService;
+import com.lyy.admin.moudle.mapper.SysCommonFileMapper;
+import org.springframework.stereotype.Service;
+
+/**
+* @author 26996
+* @description 针对表【sys_common_file(系统级别附件（图片、视频）)】的数据库操作Service实现
+* @createDate 2023-12-19 18:23:36
+*/
+@Service
+public class SysCommonFileServiceImpl extends ServiceImpl<SysCommonFileMapper, SysCommonFile>
+    implements SysCommonFileService{
+
+}
+
+
+
+

src/main/java/com/lyy/admin/moudle/vo/SysCommonFileVo.java

+package com.lyy.admin.moudle.vo;
+
+import com.baomidou.mybatisplus.annotation.IdType;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.Date;
+
+/**
+ * 系统级别附件（图片、视频）
+ * @TableName sys_common_file
+ */
+@TableName(value ="sys_common_file")
+@Data
+public class SysCommonFileVo implements Serializable {
+  
+    /**
+     * 附件地址
+     */
+    private String imgUrl;
+
+
+}
\ No newline at end of file

src/main/java/com/lyy/admin/service/parkinfo/impl/ParkInfoServiceImpl.java

@@ -584,7 +584,7 @@ public class ParkInfoServiceImpl extends ServiceImpl<ParkInfoMapper, ParkInfo> i
         parkSewageInfos.add(parkSewageInfo);
         parkSewageInfoService.saveBatch(parkSewageInfos);
 
-        //开发区图片
+        //园区图片
         sysCarouselInfoService.saveCarouselInfo(id, parkInfoAllVO.getCarouselUrls(), CarouselTypeEnum.YUANQU);
         //政策文件上传
         fileSourceService.saveFileSource(id, parkInfoAllVO.getPolicyUrls(), FileSourceObjectTypeEnum.PARK);