diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java index 3ae1063..31623a0 100644 --- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java +++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/system/SysOssController.java @@ -10,6 +10,7 @@ import com.ruoyi.common.core.domain.R; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.validate.QueryGroup; import com.ruoyi.common.enums.BusinessType; +import com.ruoyi.official.service.ISysImageService; import com.ruoyi.system.domain.bo.SysOssBo; import com.ruoyi.system.domain.vo.SysOssVo; import com.ruoyi.system.service.ISysOssService; @@ -46,6 +47,7 @@ public class SysOssController extends BaseController { private String filePath; private final ISysOssService iSysOssService; + private final ISysImageService iSysImageService; /** * 查询OSS对象存储列表 @@ -94,16 +96,15 @@ public class SysOssController extends BaseController { * @param file 文件数据 * @return 文件上传地址信息 */ - @Log(title = "OSS对象存储", businessType = BusinessType.INSERT) + @Log(title = "本地文件上传", businessType = BusinessType.INSERT) @PostMapping("/addPartsUpload") public R> addPartsUpload(@RequestPart("file") MultipartFile file) { Map map=new HashMap<>(); - log.info("上传的文件名称：{}",file.getOriginalFilename()); - //文件上传的地址从配置文件中获取 - log.info("上传的文件地址：{}",filePath); + + String filePath=System.getProperty("user.dir")+"/file/upload/"; try { if (file.isEmpty()) { - return R.fail("上传文件不能为空"); + return R.warn("文件为空"); } String fileName = System.currentTimeMillis()+"-"+file.getOriginalFilename(); @@ -120,18 +121,15 @@ public class SysOssController extends BaseController { file.transferTo(uploadFile); String pathFan=filePath.replace("\\","/"); //filePath获取到的地址斜杠是“ \ ”的（单斜杠是特殊符号，得用双斜杠代替），得换成“ / ”才能访问到 - - map.put("url",filePath); - map.put("fileName",fileName); - - log.info("替换后的文件名称：{}",pathFan+fileName); - SysOssVo sysOssVo = iSysOssService.uploadLocal(filePath, fileName); - map.put("ossId",sysOssVo.getOssId().toString()); - //修改数据库 + Long image = iSysImageService.uploadImage(fileName,pathFan+fileName); + System.err.println("替换后："+pathFan); + map.put("url",pathFan+fileName); + map.put("fileName",fileName); + map.put("ossId",image.toString()); return R.ok(map); } catch (IOException e) { - return R.fail("文件上传失败: "+e); + return R.warn("文件上传失败: "+e); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/SysImage.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/SysImage.java new file mode 100644 index 0000000..60f224f --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/SysImage.java @@ -0,0 +1,39 @@ +package com.ruoyi.official.domain; + +import com.baomidou.mybatisplus.annotation.*; +import lombok.Data; +import lombok.EqualsAndHashCode; +import java.io.Serializable; +import java.util.Date; +import java.math.BigDecimal; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 本地图片上传信息对象 sys_image + * + * @author liuxiao + * @date 2024-07-09 + */ +@Data +@EqualsAndHashCode(callSuper = true) +@TableName("sys_image") +public class SysImage extends BaseEntity { + + private static final long serialVersionUID=1L; + + /** + * 对象存储主键 + */ + @TableId(value = "id") + private Long id; + /** + * 文件名 + */ + private String fileName; + /** + * URL地址 + */ + private String url; + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java index c3b92f3..3dc4de1 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwLableBo.java @@ -37,7 +37,6 @@ public class GwLableBo extends BaseEntity { /** * 文件类型 0：图片 1：视频 */ - @NotBlank(message = "文件类型 0：图片 1：视频不能为空", groups = { AddGroup.class, EditGroup.class }) private String fileType; /** @@ -49,7 +48,6 @@ public class GwLableBo extends BaseEntity { /** * 父菜单ID */ - @NotNull(message = "父菜单ID不能为空", groups = { AddGroup.class, EditGroup.class }) private Long parentId; /** @@ -67,7 +65,7 @@ public class GwLableBo extends BaseEntity { /** * 菜单类型（M目录 C菜单） */ - @NotBlank(message = "菜单类型（M目录 C菜单）不能为空", groups = { AddGroup.class, EditGroup.class }) + private String menuType; /** @@ -79,13 +77,11 @@ public class GwLableBo extends BaseEntity { /** * 创建者id */ - @NotNull(message = "创建者id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long createUserId; /** * 更新者id */ - @NotNull(message = "更新者id不能为空", groups = { AddGroup.class, EditGroup.class }) private Long updateUserId; diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java index 9546e83..75533e4 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/GwSlideshowBo.java @@ -63,7 +63,6 @@ public class GwSlideshowBo extends BaseEntity { /** * 摘要 */ - @NotBlank(message = "摘要不能为空", groups = { AddGroup.class, EditGroup.class }) private String abstracts; /** diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/SysImageBo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/SysImageBo.java new file mode 100644 index 0000000..83fa480 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/bo/SysImageBo.java @@ -0,0 +1,43 @@ +package com.ruoyi.official.domain.bo; + +import com.ruoyi.common.core.validate.AddGroup; +import com.ruoyi.common.core.validate.EditGroup; +import lombok.Data; +import lombok.EqualsAndHashCode; +import javax.validation.constraints.*; + +import java.util.Date; + +import com.ruoyi.common.core.domain.BaseEntity; + +/** + * 本地图片上传信息业务对象 sys_image + * + * @author liuxiao + * @date 2024-07-09 + */ + +@Data +@EqualsAndHashCode(callSuper = true) +public class SysImageBo extends BaseEntity { + + /** + * 对象存储主键 + */ + @NotNull(message = "对象存储主键不能为空", groups = { EditGroup.class }) + private Long id; + + /** + * 文件名 + */ + @NotBlank(message = "文件名不能为空", groups = { AddGroup.class, EditGroup.class }) + private String fileName; + + /** + * URL地址 + */ + @NotBlank(message = "URL地址不能为空", groups = { AddGroup.class, EditGroup.class }) + private String url; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/SysImageVo.java b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/SysImageVo.java new file mode 100644 index 0000000..0c7ce89 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/domain/vo/SysImageVo.java @@ -0,0 +1,43 @@ +package com.ruoyi.official.domain.vo; + +import com.alibaba.excel.annotation.ExcelIgnoreUnannotated; +import com.alibaba.excel.annotation.ExcelProperty; +import com.ruoyi.common.annotation.ExcelDictFormat; +import com.ruoyi.common.convert.ExcelDictConvert; +import lombok.Data; +import java.util.Date; + + + +/** + * 本地图片上传信息视图对象 sys_image + * + * @author liuxiao + * @date 2024-07-09 + */ +@Data +@ExcelIgnoreUnannotated +public class SysImageVo { + + private static final long serialVersionUID = 1L; + + /** + * 对象存储主键 + */ + @ExcelProperty(value = "对象存储主键") + private Long id; + + /** + * 文件名 + */ + @ExcelProperty(value = "文件名") + private String fileName; + + /** + * URL地址 + */ + @ExcelProperty(value = "URL地址") + private String url; + + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/mapper/SysImageMapper.java b/ruoyi-system/src/main/java/com/ruoyi/official/mapper/SysImageMapper.java new file mode 100644 index 0000000..fd5026e --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/mapper/SysImageMapper.java @@ -0,0 +1,15 @@ +package com.ruoyi.official.mapper; + +import com.ruoyi.official.domain.SysImage; +import com.ruoyi.official.domain.vo.SysImageVo; +import com.ruoyi.common.core.mapper.BaseMapperPlus; + +/** + * 本地图片上传信息Mapper接口 + * + * @author liuxiao + * @date 2024-07-09 + */ +public interface SysImageMapper extends BaseMapperPlus { + +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/ISysImageService.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/ISysImageService.java new file mode 100644 index 0000000..13b68c5 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/ISysImageService.java @@ -0,0 +1,53 @@ +package com.ruoyi.official.service; + +import com.ruoyi.official.domain.SysImage; +import com.ruoyi.official.domain.vo.SysImageVo; +import com.ruoyi.official.domain.bo.SysImageBo; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +/** + * 本地图片上传信息Service接口 + * + * @author liuxiao + * @date 2024-07-09 + */ +public interface ISysImageService { + + /** + * 查询本地图片上传信息 + */ + SysImageVo queryById(Long id); + + /** + * 查询本地图片上传信息列表 + */ + TableDataInfo queryPageList(SysImageBo bo, PageQuery pageQuery); + + /** + * 查询本地图片上传信息列表 + */ + List queryList(SysImageBo bo); + + /** + * 新增本地图片上传信息 + */ + Boolean insertByBo(SysImageBo bo); + + /** + * 修改本地图片上传信息 + */ + Boolean updateByBo(SysImageBo bo); + + + Long uploadImage(String fileName,String url); + + /** + * 校验并批量删除本地图片上传信息信息 + */ + Boolean deleteWithValidByIds(Collection ids, Boolean isValid); +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java index 6a57518..3f692a0 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/GwSlideshowServiceImpl.java @@ -48,12 +48,12 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { List list = baseMapper.selectList(Wrappers.lambdaQuery().orderByDesc(GwSlideshow::getCreateTime)); Map hashMap = new HashMap<>(16); - if(CollUtil.isNotEmpty(list)){ + if(CollUtil.isNotEmpty(list)&&list.size()>1){ List collect = list.stream().map(GwSlideshow::getId).collect(Collectors.toList()); if (collect.contains(id)){ int currentSubscript = collect.indexOf(id); - hashMap.put("previous",list.get(currentSubscript-1)); - hashMap.put("nextArticle",list.get(currentSubscript+1)); + hashMap.put("previous",ObjectUtil.isNotEmpty(list.get(currentSubscript-1))?list.get(currentSubscript-1):null); + hashMap.put("nextArticle",ObjectUtil.isNotEmpty(list.get(currentSubscript-1))?list.get(currentSubscript+1):null); gwSlideshowVo.setSlideshowMap(hashMap); } } diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/SysImageServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/SysImageServiceImpl.java new file mode 100644 index 0000000..8b39a93 --- /dev/null +++ b/ruoyi-system/src/main/java/com/ruoyi/official/service/impl/SysImageServiceImpl.java @@ -0,0 +1,121 @@ +package com.ruoyi.official.service.impl; + +import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.ObjectUtil; +import com.ruoyi.common.utils.StringUtils; +import com.ruoyi.common.core.page.TableDataInfo; +import com.ruoyi.common.core.domain.PageQuery; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.toolkit.Wrappers; +import lombok.RequiredArgsConstructor; +import org.springframework.stereotype.Service; +import com.ruoyi.official.domain.bo.SysImageBo; +import com.ruoyi.official.domain.vo.SysImageVo; +import com.ruoyi.official.domain.SysImage; +import com.ruoyi.official.mapper.SysImageMapper; +import com.ruoyi.official.service.ISysImageService; + +import java.util.List; +import java.util.Map; +import java.util.Collection; + +/** + * 本地图片上传信息Service业务层处理 + * + * @author liuxiao + * @date 2024-07-09 + */ +@RequiredArgsConstructor +@Service +public class SysImageServiceImpl implements ISysImageService { + + private final SysImageMapper baseMapper; + + /** + * 查询本地图片上传信息 + */ + @Override + public SysImageVo queryById(Long id){ + return baseMapper.selectVoById(id); + } + + /** + * 查询本地图片上传信息列表 + */ + @Override + public TableDataInfo queryPageList(SysImageBo bo, PageQuery pageQuery) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + Page result = baseMapper.selectVoPage(pageQuery.build(), lqw); + return TableDataInfo.build(result); + } + + /** + * 查询本地图片上传信息列表 + */ + @Override + public List queryList(SysImageBo bo) { + LambdaQueryWrapper lqw = buildQueryWrapper(bo); + return baseMapper.selectVoList(lqw); + } + + private LambdaQueryWrapper buildQueryWrapper(SysImageBo bo) { + Map params = bo.getParams(); + LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); + lqw.like(StringUtils.isNotBlank(bo.getFileName()), SysImage::getFileName, bo.getFileName()); + lqw.eq(StringUtils.isNotBlank(bo.getUrl()), SysImage::getUrl, bo.getUrl()); + return lqw; + } + + /** + * 新增本地图片上传信息 + */ + @Override + public Boolean insertByBo(SysImageBo bo) { + SysImage add = BeanUtil.toBean(bo, SysImage.class); + validEntityBeforeSave(add); + boolean flag = baseMapper.insert(add) > 0; + if (flag) { + bo.setId(add.getId()); + } + return flag; + } + + /** + * 修改本地图片上传信息 + */ + @Override + public Boolean updateByBo(SysImageBo bo) { + SysImage update = BeanUtil.toBean(bo, SysImage.class); + validEntityBeforeSave(update); + return baseMapper.updateById(update) > 0; + } + + @Override + public Long uploadImage(String fileName,String url) { + SysImageVo sysImageVo = baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(SysImage::getFileName, fileName)); + if (ObjectUtil.isNotEmpty(sysImageVo)) throw new RuntimeException("图片已存在，请勿重复添加！"); + SysImage sysImage = new SysImage(); + sysImage.setFileName(fileName); + sysImage.setUrl(url); + return baseMapper.insert(sysImage) > 0 ? sysImage.getId() : null; + } + + /** + * 保存前的数据校验 + */ + private void validEntityBeforeSave(SysImage entity){ + //TODO 做一些数据校验,如唯一约束 + } + + /** + * 批量删除本地图片上传信息 + */ + @Override + public Boolean deleteWithValidByIds(Collection ids, Boolean isValid) { + if(isValid){ + //TODO 做一些业务上的校验,判断是否需要校验 + } + return baseMapper.deleteBatchIds(ids) > 0; + } +} diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java index 53f5f8d..8cb3cee 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/domain/vo/SysOssVo.java @@ -1,6 +1,7 @@ package com.ruoyi.system.domain.vo; import lombok.Data; +import lombok.experimental.Accessors; import java.util.Date; @@ -10,6 +11,7 @@ import java.util.Date; * @author Lion Li */ @Data +@Accessors(chain = true) //开启链式编程,setter方法返回的是this（也就是对象自己），代替了默认的返回值void public class SysOssVo { private static final long serialVersionUID = 1L; diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java index ee5af8d..3033f85 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysOssServiceImpl.java @@ -1,6 +1,7 @@ package com.ruoyi.system.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.collection.CollUtil; import cn.hutool.core.convert.Convert; import cn.hutool.core.io.IoUtil; import cn.hutool.core.util.ObjectUtil; @@ -60,13 +61,12 @@ public class SysOssServiceImpl implements ISysOssService, OssService { @Override public List listByIds(Collection ossIds) { List list = new ArrayList<>(); - for (Long id : ossIds) { - SysOssVo vo = SpringUtils.getAopProxy(this).getById(id); - if (ObjectUtil.isNotNull(vo)) { - list.add(this.matchingUrl(vo)); - } - } - return list; + Optional first = ossIds.stream().findFirst(); + List sysOssVos = baseMapper.selectVoList(Wrappers.lambdaQuery().eq(SysOss::getOssId, first.get())); + return CollUtil.isNotEmpty(sysOssVos)?sysOssVos.stream().map(itx->{ + System.out.println(itx.getUrl()+"/"+itx.getFileName()); + return itx.setUrl(itx.getUrl()+"/"+itx.getFileName()); + }).collect(Collectors.toList()):null; } @Override @@ -110,7 +110,7 @@ public class SysOssServiceImpl implements ISysOssService, OssService { FileUtils.setAttachmentResponseHeader(response, sysOss.getOriginalName()); response.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE + "; charset=UTF-8"); OssClient storage = OssFactory.instance(); - try(InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { + try (InputStream inputStream = storage.getObjectContent(sysOss.getUrl())) { int available = inputStream.available(); IoUtil.copy(inputStream, response.getOutputStream(), available); response.setContentLength(available); @@ -144,13 +144,13 @@ public class SysOssServiceImpl implements ISysOssService, OssService { } @Override - public SysOssVo uploadLocal(String imageUrl,String fileName) { + public SysOssVo uploadLocal(String imageUrl, String fileName) { // 保存文件信息 SysOss oss = new SysOss(); oss.setUrl(imageUrl); oss.setFileName(fileName); baseMapper.insert(oss); - return BeanUtil.toBean(oss,SysOssVo.class); + return BeanUtil.toBean(oss, SysOssVo.class); } diff --git a/ruoyi-system/src/main/resources/mapper/official/SysImageMapper.xml b/ruoyi-system/src/main/resources/mapper/official/SysImageMapper.xml new file mode 100644 index 0000000..cfdd457 --- /dev/null +++ b/ruoyi-system/src/main/resources/mapper/official/SysImageMapper.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + + + + diff --git a/ruoyi-ui/src/views/official/lable/index.vue b/ruoyi-ui/src/views/official/lable/index.vue index f2d7724..3a204f8 100644 --- a/ruoyi-ui/src/views/official/lable/index.vue +++ b/ruoyi-ui/src/views/official/lable/index.vue @@ -82,7 +82,7 @@ - +