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 31623a0..b58d374 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 @@ -44,7 +44,7 @@ import java.util.Map; public class SysOssController extends BaseController { @Value("${file.BASE_FILE_SAVE_PATH}") - private String filePath; + private String uploadPath; private final ISysOssService iSysOssService; private final ISysImageService iSysImageService; @@ -65,9 +65,9 @@ public class SysOssController extends BaseController { */ @SaCheckPermission("system:oss:list") @GetMapping("/listByIds/{ossIds}") - public R> listByIds(@NotEmpty(message = "主键不能为空") + public R> listByIds(@NotEmpty(message = "主键不能为空") @PathVariable Long[] ossIds) { - List list = iSysOssService.listByIds(Arrays.asList(ossIds)); + List list = iSysOssService.listByIds(Arrays.asList(ossIds)); return R.ok(list); } @@ -101,7 +101,7 @@ public class SysOssController extends BaseController { public R> addPartsUpload(@RequestPart("file") MultipartFile file) { Map map=new HashMap<>(); - String filePath=System.getProperty("user.dir")+"/file/upload/"; + String filePath=uploadPath+"/file/upload/"; try { if (file.isEmpty()) { return R.warn("文件为空"); diff --git a/ruoyi-admin/src/main/resources/application-dev.yml b/ruoyi-admin/src/main/resources/application-dev.yml index 03ee75f..d8b3db2 100644 --- a/ruoyi-admin/src/main/resources/application-dev.yml +++ b/ruoyi-admin/src/main/resources/application-dev.yml @@ -172,4 +172,4 @@ sms: sdkAppId: --- # 文件上传路径 file: - BASE_FILE_SAVE_PATH: ./image + BASE_FILE_SAVE_PATH: /www/wwwroot/guanwang/web/image diff --git a/ruoyi-admin/src/main/resources/application.yml b/ruoyi-admin/src/main/resources/application.yml index 8d74a93..a703c0d 100644 --- a/ruoyi-admin/src/main/resources/application.yml +++ b/ruoyi-admin/src/main/resources/application.yml @@ -129,6 +129,7 @@ security: - /**/*.html - /**/*.css - /**/*.js + - /**/*.jpg - # 配置白名单 - /official/slideshow/** # 公共路径 diff --git a/ruoyi-system/src/main/java/com/ruoyi/official/controller/FileChunkFilelistController.java b/ruoyi-system/src/main/java/com/ruoyi/official/controller/FileChunkFilelistController.java index 31ed0a1..b74c837 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/official/controller/FileChunkFilelistController.java +++ b/ruoyi-system/src/main/java/com/ruoyi/official/controller/FileChunkFilelistController.java @@ -33,7 +33,7 @@ public class FileChunkFilelistController extends BaseController { /** * 查询已上传文件记录列表 */ - @SaCheckPermission("official:chunkFilelist:list") + /*@SaCheckPermission("official:chunkFilelist:list")*/ @GetMapping("/list") public TableDataInfo list(FileChunkFilelistBo bo, PageQuery pageQuery) { return iFileChunkFilelistService.queryPageList(bo, pageQuery); 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 8a0ec8c..8757093 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 @@ -3,6 +3,7 @@ package com.ruoyi.official.service.impl; import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.core.page.TableDataInfo; import com.ruoyi.common.core.domain.PageQuery; @@ -16,6 +17,7 @@ import com.ruoyi.official.domain.vo.GwSlideshowVo; import com.ruoyi.official.domain.GwSlideshow; import com.ruoyi.official.mapper.GwSlideshowMapper; import com.ruoyi.official.service.IGwSlideshowService; +import org.springframework.transaction.annotation.Transactional; import java.util.*; import java.util.concurrent.atomic.AtomicReference; @@ -112,6 +114,7 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { * 修改新闻信息 */ @Override + @Transactional(rollbackFor = Exception.class) public Boolean updateByBo(GwSlideshowBo bo) { GwSlideshow update = BeanUtil.toBean(bo, GwSlideshow.class); validEntityBeforeSave(update); @@ -124,15 +127,26 @@ public class GwSlideshowServiceImpl implements IGwSlideshowService { private void validEntityBeforeSave(GwSlideshow entity) { //TODO 做一些数据校验,如唯一约束 //存在已置顶的数据不允许添加、编辑 - if (ObjectUtil.isNotEmpty(entity.getId())) { + /* if (ObjectUtil.isNotEmpty(entity.getId())) { //编辑 - boolean exists = baseMapper.exists(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); - if (exists && entity.getIsTop().equals("1")) throw new RuntimeException("已存在置顶的图片信息!"); + GwSlideshowVo slideshowVo = baseMapper.selectVoOne(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); + if (!(ObjectUtil.equal(slideshowVo.getId(),entity.getId()))) throw new RuntimeException("已存在置顶的图片信息!"); } else { //新增 boolean exists = baseMapper.exists(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); if (exists && entity.getIsTop().equals("1")) throw new RuntimeException("已存在置顶的图片信息!"); - } + }*/ + if (!ObjectUtil.equal(entity.getIsTop(),"1"))return; + //存在想置顶得数据,将原来得数据修改为非置顶 + List vos = baseMapper.selectVoList(Wrappers.lambdaQuery().eq(GwSlideshow::getIsTop, "1")); + if ( CollUtil.isEmpty(vos)) return; + UpdateWrapper updateWrapper = new UpdateWrapper<>(); + + vos.stream().forEach(ixt->{ + // updateWrapper.("id", list).set("is_top", "0"); + updateWrapper.eq("id",ixt.getId()).set("is_top", "0"); + baseMapper.update(BeanUtil.toBean(ixt,GwSlideshow.class),updateWrapper); + }); } diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java index 8d54ad3..47279ca 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/ISysOssService.java @@ -21,7 +21,7 @@ public interface ISysOssService { TableDataInfo queryPageList(SysOssBo sysOss, PageQuery pageQuery); - List listByIds(Collection ossIds); + List listByIds(Collection ossIds); SysOssVo getById(Long ossId); 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 3033f85..1434632 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 @@ -17,6 +17,9 @@ import com.ruoyi.common.utils.BeanCopyUtils; import com.ruoyi.common.utils.StringUtils; import com.ruoyi.common.utils.file.FileUtils; import com.ruoyi.common.utils.spring.SpringUtils; +import com.ruoyi.official.domain.SysImage; +import com.ruoyi.official.domain.vo.SysImageVo; +import com.ruoyi.official.mapper.SysImageMapper; import com.ruoyi.oss.core.OssClient; import com.ruoyi.oss.entity.UploadResult; import com.ruoyi.oss.enumd.AccessPolicyType; @@ -48,6 +51,7 @@ import java.util.stream.Collectors; public class SysOssServiceImpl implements ISysOssService, OssService { private final SysOssMapper baseMapper; + private final SysImageMapper sysImageMapper; @Override public TableDataInfo queryPageList(SysOssBo bo, PageQuery pageQuery) { @@ -59,14 +63,11 @@ public class SysOssServiceImpl implements ISysOssService, OssService { } @Override - public List listByIds(Collection ossIds) { + public List listByIds(Collection ossIds) { List list = new ArrayList<>(); 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; + List sysImageVos = sysImageMapper.selectVoList(Wrappers.lambdaQuery().eq(SysImage::getId, first.get())); + return CollUtil.isNotEmpty(sysImageVos)?sysImageVos.stream().filter(ObjectUtil::isNotEmpty).map(SysImageVo::getUrl).collect(Collectors.toList()):null; } @Override