feature-img-1.0:fixBug

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/MinioSysFileServiceImpl.java

@@ -2,22 +2,18 @@ package com.bnyer.file.service;
 
 import com.bnyer.common.core.exception.ServiceException;
 import com.bnyer.file.config.MinioConfig;
+import com.bnyer.file.utils.FileUploadUtils;
 import com.bnyer.file.utils.ImgUtil;
-import io.minio.ObjectStat;
+import io.minio.MinioClient;
+import io.minio.PutObjectArgs;
 import lombok.extern.slf4j.Slf4j;
 import net.coobird.thumbnailator.Thumbnails;
-import org.apache.commons.compress.utils.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.web.multipart.MultipartFile;
-import com.bnyer.file.utils.FileUploadUtils;
-import io.minio.MinioClient;
-import io.minio.PutObjectArgs;
 
-import javax.servlet.http.HttpServletResponse;
 import java.awt.image.BufferedImage;
 import java.io.InputStream;
-import java.net.URLEncoder;
 
 /**
  * Minio 文件存储
@@ -26,8 +22,7 @@ import java.net.URLEncoder;
  */
 @Service
 @Slf4j
-public class MinioSysFileServiceImpl implements MinioService
+public class MinioSysFileServiceImpl implements MinioService {
-{
     @Autowired
     private MinioConfig minioConfig;
 
@@ -42,8 +37,7 @@ public class MinioSysFileServiceImpl implements MinioService
      * @throws Exception
      */
     @Override
-    public String uploadFile(MultipartFile file) throws Exception
+    public String uploadFile(MultipartFile file) throws Exception {
-    {
         String fileName = FileUploadUtils.extractFilename(file);
         PutObjectArgs args = PutObjectArgs.builder()
                 .bucket(minioConfig.getBucketName())
@@ -57,15 +51,24 @@ public class MinioSysFileServiceImpl implements MinioService
 
     @Override
     public String uploadBanner(MultipartFile file) throws Exception {
-        String fileName = FileUploadUtils.extractFilename(file);
+        String fileName = file.getOriginalFilename();
-        PutObjectArgs args = PutObjectArgs.builder()
+        String[] split = fileName.split("\\.");
-                .bucket("tiktok")
+        if (split.length > 1) {
+            fileName = split[0] + "_" + System.currentTimeMillis() + "." + split[1];
+        } else {
+            fileName = fileName + System.currentTimeMillis();
+        }
+        InputStream in = null;
+        in = file.getInputStream();
+        client.putObject(PutObjectArgs.builder()
+                .bucket(minioConfig.getBucketName())
                 .object(fileName)
-                .stream(file.getInputStream(), file.getSize(), -1)
+                .stream(in, in.available(), -1)
                 .contentType(file.getContentType())
-                .build();
+                .build()
-        client.putObject(args);
+        );
         return minioConfig.getUrl()+ "/" + minioConfig.getBucketName() + "/" + fileName;
+
     }
 
     @Override

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/controller/CreatorMiniController.java

@@ -129,6 +129,13 @@ public class CreatorMiniController extends BaseController {
         return getDataTable(tiktokImgService.queryInList(dto.getCreatorId(),dto.getTypeId(),dto.getStatus()));
     }
 
+    //@TokenCheck
+    @ApiOperation(value="查询图片详情")
+    @GetMapping(value = "/detailsTiktokImg/{id}")
+    public AjaxResult detailsTiktokImg(@ApiParam("图片id") @PathVariable Long id){
+        return AjaxResult.success(tiktokImgService.queryCreatorImgDetails(String.valueOf(id)));
+    }
+
     //@TokenCheck
     @ApiOperation(value="批量删除艺术家图片")
     @GetMapping(value = "/deleteTiktokImg/{ids}")

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/mapper/TiktokImgMapper.java

@@ -42,6 +42,13 @@ public interface TiktokImgMapper extends BaseMapper<TiktokImg> {
      */
     TiktokImgVo queryDetails(@Param("imgId") String imgId);
 
+    /**
+     * 查询艺术家端图片详情
+     * @param imgId 图片id
+     * @return -
+     */
+    TiktokImgVo queryCreatorImgDetails(@Param("imgId") String imgId);
+
     /**
      * 查询首页图片分页
      * @return -

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/TiktokImgService.java

@@ -70,6 +70,13 @@ public interface TiktokImgService {
      */
     TiktokImgVo queryImgDetails(String imgId);
 
+    /**
+     * 查询艺术家端图片详情
+     * @param imgId 图片id
+     * @return -
+     */
+    TiktokImgVo queryCreatorImgDetails(String imgId);
+
     /**
      * 变更显示状态
      * @param id 主键id

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/service/impl/TiktokImgServiceImpl.java

@@ -140,6 +140,11 @@ public class TiktokImgServiceImpl implements TiktokImgService {
         return tiktokImgMapper.queryDetails(imgId);
     }
 
+    @Override
+    public TiktokImgVo queryCreatorImgDetails(String imgId) {
+        return tiktokImgMapper.queryCreatorImgDetails(imgId);
+    }
+
     @Override
     @Transactional(rollbackFor = Exception.class)
     public int changeStatus(Long id, String status) {

bnyer-services/bnyer-img/src/main/resources/com/bnyer/img/mapper/TiktokImgMapper.xml

@@ -81,7 +81,7 @@
           and iti.status = #{status}
         </if>
       </where>
-      order by iti.create_time desc
+      order by iti.sort desc
     </select>
 <!--  <select id="queryOutList" resultType="com.bnyer.img.vo.TiktokImgVo">-->
 <!--    select-->
@@ -180,4 +180,13 @@
     </where>
     order by iti.create_time desc
   </select>
+
+  <select id="queryCreatorImgDetails" resultMap="imgList">
+    select
+    iti.id as id,iti.img_url as imgUrl,iti.creator_id as creatorId,
+    iti.type_id as typeId,iti.download_num as downloadNum, iti.great_num as greatNum,
+    iti.collection_num as collectionNum,iti.status as status,iti.is_hot as isHot
+    from img_tiktok_img iti
+    where iti.is_show = '1' and iti.id = #{imgId}
+  </select>
 </mapper>