图稿库改造

sd-business/src/main/java/com/sd/business/entity/artwork/dto/ArtworkLibraryDto.java

@@ -14,8 +14,4 @@ import lombok.Setter;
 @Setter
 public class ArtworkLibraryDto extends ArtworkLibrary {
 
-    /**
-     * 图稿id
-     */
-    private Long artworkId;
 }

sd-business/src/main/java/com/sd/business/service/artwork/impl/ArtworkLibraryServiceImpl.java

@@ -1,21 +1,19 @@
 package com.sd.business.service.artwork.impl;
 
-import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.ruoyi.common.core.domain.BaseIdPo;
+import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
+import com.sd.business.entity.artwork.dto.ArtworkLibrarySelectDto;
 import com.sd.business.entity.artwork.po.ArtworkLibrary;
+import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
 import com.sd.business.mapper.artwork.ArtworkLibraryMapper;
 import com.sd.business.service.artwork.ArtworkLibraryService;
-import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
-import org.springframework.beans.BeanUtils;
+import com.sd.framework.util.Assert;
 import org.springframework.stereotype.Service;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
-import com.sd.business.entity.artwork.dto.ArtworkLibrarySelectDto;
-import com.ruoyi.common.utils.wrapper.IWrapper;
-import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
-import cn.hutool.core.bean.BeanUtil;
 
-import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 
 /**
@@ -59,17 +57,9 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
      */
     @Override
     public void add(ArtworkLibraryDto artworkLibraryDto) {
-
-        String artworkName = artworkLibraryDto.getArtworkName();
-        ArtworkLibrary artworkLibrary = baseMapper.getArtworkName(artworkName);
-        if (artworkLibrary != null) {
-            throw new SecurityException("该图稿已存在!");
-        }
-        ArtworkLibrary newArtworkLibrary = new ArtworkLibrary();
-        BeanUtils.copyProperties(artworkLibraryDto, newArtworkLibrary);
-        newArtworkLibrary.setId(artworkLibraryDto.getArtworkId());
-        this.save(newArtworkLibrary);
-
+        long count = count(q -> q.eq(ArtworkLibrary::getArtworkName, artworkLibraryDto.getArtworkName()).last("limit 1"));
+        Assert.eqZero(count, "图稿名称已存在");
+        this.save(artworkLibraryDto);
     }
 
     /**
@@ -79,11 +69,13 @@ public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper,
      */
     @Override
     public void edit(ArtworkLibraryDto artworkLibraryDto) {
-        ArtworkLibrary artworkLibrary = baseMapper.selectById(artworkLibraryDto.getArtworkId());
-        artworkLibrary.setArtworkName(artworkLibraryDto.getArtworkName());
-        artworkLibrary.setArtworkUploadImgUrl(artworkLibraryDto.getArtworkUploadImgUrl());
-        artworkLibrary.setArtworkUploadFileUrl(artworkLibraryDto.getArtworkUploadFileUrl());
-        this.updateById(artworkLibrary);
+        long count = count(q -> q
+                .eq(ArtworkLibrary::getArtworkName, artworkLibraryDto.getArtworkName())
+                .ne(BaseIdPo::getId, artworkLibraryDto.getId())
+                .last("limit 1"));
+
+        Assert.eqZero(count, "图稿名称已存在");
+        this.updateById(artworkLibraryDto);
     }
 
     /**