图稿库优化

sd-business/src/main/java/com/sd/business/controller/artwork/ArtworkLibraryController.java

@@ -1,15 +1,17 @@
 package com.sd.business.controller.artwork;
 
-import org.springframework.web.bind.annotation.*;
 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.sd.business.entity.artwork.dto.ArtworkLibraryDto;
 import com.ruoyi.common.core.domain.BaseSelectDto;
+import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
+import com.sd.business.entity.artwork.dto.ArtworkLibrarySelectDto;
+import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
 import com.sd.business.service.artwork.ArtworkLibraryService;
 import org.springframework.beans.factory.annotation.Autowired;
-
-import java.util.List;
+import org.springframework.validation.annotation.Validated;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 /**
  * <p>
@@ -27,14 +29,6 @@ public class ArtworkLibraryController {
     private ArtworkLibraryService artworkLibraryService;
 
     /**
-     * 图稿库列表
-     */
-    @PostMapping("/list")
-    public List<ArtworkLibraryVo> list(@RequestBody ArtworkLibrarySelectDto dto) {
-        return artworkLibraryService.getList(dto);
-    }
-
-    /**
      * 图稿库分页
      */
     @PostMapping("/page")
@@ -54,7 +48,7 @@ public class ArtworkLibraryController {
      * 图稿库新增
      */
     @PostMapping("/add")
-    public void add(@RequestBody ArtworkLibraryDto artworkLibraryDto) {
+    public void add(@Validated @RequestBody ArtworkLibraryDto artworkLibraryDto) {
         artworkLibraryService.add(artworkLibraryDto);
     }
 
@@ -62,7 +56,7 @@ public class ArtworkLibraryController {
      * 图稿库编辑
      */
     @PostMapping("/edit")
-    public void edit(@RequestBody ArtworkLibraryDto artworkLibraryDto) {
+    public void edit(@Validated @RequestBody ArtworkLibraryDto artworkLibraryDto) {
         artworkLibraryService.edit(artworkLibraryDto);
     }
 

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

@@ -14,4 +14,9 @@ import lombok.Setter;
 @Setter
 public class ArtworkLibrarySelectDto extends BaseSelectDto {
 
+    /**
+     * 图稿名称
+     */
+    private String artworkName;
+
 }

sd-business/src/main/java/com/sd/business/entity/artwork/po/ArtworkLibrary.java

@@ -1,13 +1,13 @@
 package com.sd.business.entity.artwork.po;
 
-import com.ruoyi.common.core.domain.BasePo;
 import com.baomidou.mybatisplus.annotation.TableName;
-
-import java.util.Date;
-
+import com.ruoyi.common.core.domain.BasePo;
 import lombok.Getter;
 import lombok.Setter;
 
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.NotNull;
+
 /**
  * <p>
  * 图稿库
@@ -24,36 +24,43 @@ public class ArtworkLibrary extends BasePo {
     /**
      * 图稿名称
      */
+    @NotBlank(message = "图稿名称不能为空")
     private String artworkName;
 
     /**
      * 图片id
      */
+    @NotNull(message = "图片id不能为空")
     private Long imgId;
 
     /**
-     * 文件id
-     */
-    private Long fileId;
-
-    /**
      * 图片名称
      */
+    @NotBlank(message = "图片名称不能为空")
     private String imgName;
 
     /**
      * 图片地址
      */
+    @NotBlank(message = "图片地址不能为空")
     private String imgUrl;
 
     /**
+     * 文件id
+     */
+    @NotNull(message = "文件id不能为空")
+    private Long fileId;
+
+    /**
      * 文件名称
      */
+    @NotBlank(message = "文件名称不能为空")
     private String fileName;
 
     /**
      * 文件地址
      */
+    @NotBlank(message = "文件地址不能为空")
     private String fileUrl;
 
 }

sd-business/src/main/java/com/sd/business/mapper/artwork/ArtworkLibraryMapper.java

@@ -1,14 +1,12 @@
 package com.sd.business.mapper.artwork;
 
-import com.sd.business.entity.artwork.po.ArtworkLibrary;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import com.sd.business.entity.artwork.po.ArtworkLibrary;
+import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
 import org.apache.ibatis.annotations.Param;
 
-import java.util.List;
-
 /**
  * <p>
  * 图稿库 Mapper 接口
@@ -20,11 +18,6 @@ import java.util.List;
 public interface ArtworkLibraryMapper extends BaseMapper<ArtworkLibrary> {
 
     /**
-     * 图稿库列表
-     */
-    List<ArtworkLibraryVo> getList(@Param("ew") IWrapper<ArtworkLibrary> wrapper);
-
-    /**
      * 图稿库分页
      */
     Page<ArtworkLibraryVo> getPage(@Param("page") Page<Object> page, @Param("ew") IWrapper<ArtworkLibrary> wrapper);

sd-business/src/main/java/com/sd/business/service/artwork/ArtworkLibraryService.java

@@ -1,13 +1,11 @@
 package com.sd.business.service.artwork;
 
-import com.sd.business.entity.artwork.po.ArtworkLibrary;
-import com.ruoyi.common.core.service.BaseService;
 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.core.service.BaseService;
 import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
-
-import java.util.List;
+import com.sd.business.entity.artwork.dto.ArtworkLibrarySelectDto;
+import com.sd.business.entity.artwork.po.ArtworkLibrary;
+import com.sd.business.entity.artwork.vo.ArtworkLibraryVo;
 
 /**
  * <p>
@@ -20,11 +18,6 @@ import java.util.List;
 public interface ArtworkLibraryService extends BaseService<ArtworkLibrary> {
 
     /**
-     * 图稿库列表
-     */
-    List<ArtworkLibraryVo> getList(ArtworkLibrarySelectDto dto);
-
-    /**
      * 图稿库分页
      */
     Page<ArtworkLibraryVo> getPage(ArtworkLibrarySelectDto dto);

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

@@ -1,8 +1,11 @@
 package com.sd.business.service.artwork.impl;
 
 import cn.hutool.core.bean.BeanUtil;
+import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.fjhx.file.entity.ObsFile;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.ruoyi.common.core.domain.BaseIdPo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
 import com.sd.business.entity.artwork.dto.ArtworkLibraryDto;
@@ -14,7 +17,7 @@ import com.sd.business.service.artwork.ArtworkLibraryService;
 import com.sd.framework.util.Assert;
 import org.springframework.stereotype.Service;
 
-import java.util.List;
+import java.util.Collections;
 
 /**
  * <p>
@@ -28,83 +31,82 @@ import java.util.List;
 public class ArtworkLibraryServiceImpl extends ServiceImpl<ArtworkLibraryMapper, ArtworkLibrary> implements ArtworkLibraryService {
 
     /**
-     * 获取集合数据
-     *
-     * @param dto
-     * @return
-     */
-    @Override
-    public List<ArtworkLibraryVo> getList(ArtworkLibrarySelectDto dto) {
-        IWrapper<ArtworkLibrary> wrapper = getWrapper();
-        wrapper.orderByDesc("al", ArtworkLibrary::getId);
-        List<ArtworkLibraryVo> list = this.baseMapper.getList(wrapper);
-        return list;
-    }
-
-    /**
      * 分页
-     *
-     * @param dto
-     * @return
      */
     @Override
     public Page<ArtworkLibraryVo> getPage(ArtworkLibrarySelectDto dto) {
         IWrapper<ArtworkLibrary> wrapper = getWrapper();
+        wrapper.like("al", ArtworkLibrary::getArtworkName, dto.getArtworkName());
         wrapper.orderByDesc("al", ArtworkLibrary::getId);
-        Page<ArtworkLibraryVo> page = this.baseMapper.getPage(dto.getPage(), wrapper);
-        return page;
+        return this.baseMapper.getPage(dto.getPage(), wrapper);
     }
 
     /**
      * 数据回显
-     *
-     * @param id
-     * @return
      */
     @Override
     public ArtworkLibraryVo detail(Long id) {
         ArtworkLibrary ArtworkLibrary = this.getById(id);
-        ArtworkLibraryVo result = BeanUtil.toBean(ArtworkLibrary, ArtworkLibraryVo.class);
-        return result;
+        return BeanUtil.toBean(ArtworkLibrary, ArtworkLibraryVo.class);
     }
 
     /**
      * 新增图稿
-     * @param artworkLibraryDto
      */
+    @DSTransactional
     @Override
     public void add(ArtworkLibraryDto artworkLibraryDto) {
-        //判断图稿名称是否存在
+        // 判断图稿名称是否存在
         long count = count(q -> q
                 .eq(ArtworkLibrary::getArtworkName, artworkLibraryDto.getArtworkName())
                 .last("limit 1"));
         Assert.eqZero(count, "图稿名称已存在");
-        this.save(artworkLibraryDto);
+
+        save(artworkLibraryDto);
+
+        ObsFile imgFile = new ObsFile();
+        imgFile.setId(artworkLibraryDto.getImgId());
+
+        ObsFile fileFile = new ObsFile();
+        fileFile.setId(artworkLibraryDto.getFileId());
+
+        ObsFileUtil.saveFile(Collections.singletonList(imgFile), artworkLibraryDto.getId(), 1);
+        ObsFileUtil.saveFile(Collections.singletonList(fileFile), artworkLibraryDto.getId(), 2);
     }
 
     /**
      * 修改图稿
-     * @param artworkLibraryDto
      */
+    @DSTransactional
     @Override
     public void edit(ArtworkLibraryDto artworkLibraryDto) {
-        //判断修改的稿名是否已经存在
+        // 判断修改的稿名是否已经存在
         long count = count(q -> q
                 .eq(ArtworkLibrary::getArtworkName, artworkLibraryDto.getArtworkName())
                 .ne(BaseIdPo::getId, artworkLibraryDto.getId())
                 .last("limit 1"));
         Assert.eqZero(count, "图稿名称已存在");
 
-        this.updateById(artworkLibraryDto);
+        updateById(artworkLibraryDto);
+
+        ObsFile imgFile = new ObsFile();
+        imgFile.setId(artworkLibraryDto.getImgId());
+
+        ObsFile fileFile = new ObsFile();
+        fileFile.setId(artworkLibraryDto.getFileId());
+
+        ObsFileUtil.editFile(Collections.singletonList(imgFile), artworkLibraryDto.getId(), 1);
+        ObsFileUtil.editFile(Collections.singletonList(fileFile), artworkLibraryDto.getId(), 2);
     }
 
     /**
      * 删除图稿
-     * @param id
      */
+    @DSTransactional
     @Override
     public void delete(Long id) {
-        this.removeById(id);
+        removeById(id);
+        ObsFileUtil.removeFile(id);
     }
 
 }

sd-business/src/main/resources/mapper/artwork/ArtworkLibraryMapper.xml

@@ -1,30 +1,20 @@
 <?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.sd.business.mapper.artwork.ArtworkLibraryMapper">
-    <select id="getList" resultType="com.sd.business.entity.artwork.vo.ArtworkLibraryVo">
-        select
-            al.id,
-            al.artwork_name,
-            al.artwork_upload_img_url,
-            al.artwork_upload_file_url,
-            al.create_user,
-            al.create_time,
-            al.update_user,
-            al.update_time
-        from artwork_library al
-            ${ew.customSqlSegment}
-    </select>
 
     <select id="getPage" resultType="com.sd.business.entity.artwork.vo.ArtworkLibraryVo">
-        select
-            al.id,
-            al.artwork_name,
-            al.artwork_upload_img_url,
-            al.artwork_upload_file_url,
-            al.create_user,
-            al.create_time,
-            al.update_user,
-            al.update_time
+        select al.id,
+               al.artwork_name,
+               al.img_id,
+               al.img_name,
+               al.img_url,
+               al.file_id,
+               al.file_name,
+               al.file_url,
+               al.create_user,
+               al.create_time,
+               al.update_user,
+               al.update_time
         from artwork_library al
             ${ew.customSqlSegment}
     </select>