Merge branch 'master' into feature-1.0-img

bnyer-api/bnyer-api-img/src/main/java/com/bnyer/img/api/dto/TiktokImgMiniDto.java

@@ -8,6 +8,7 @@ import lombok.Getter;
 import lombok.Setter;
 
 import java.io.Serializable;
+import java.util.List;
 
 
 @Getter
@@ -19,7 +20,7 @@ public class TiktokImgMiniDto implements Serializable {
     private Long id;
 
     @ApiModelProperty(value="图片地址")
-    private String imgUrl;
+    private List<String> imgUrl;
 
     @ApiModelProperty(value="艺术家id")
     private Long creatorId;

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/controller/SysFileController.java

@@ -117,33 +117,4 @@ public class SysFileController {
         }
         return R.ok(url);
     }
-    public static final String UPLOAD_PREFIX_PATH = "/opt/uploading";
-    @ApiOperation(value="图片批量检测上传保存")
-    @PostMapping("/checkUploadSave")
-    @ResponseBody
-    public R checkUploadSave(@RequestParam Long creatorId, @RequestParam Long typeId, @RequestParam ArrayList<MultipartFile> files) {
-        try {
-            ArrayList<FileDto> fileDtos = new ArrayList<>();
-            for (MultipartFile file : files) {
-                FileDto fileDto = new FileDto();
-                byte[] bytes = IOUtils.toByteArray(file.getInputStream());
-                fileDto.setBytes(bytes);
-                fileDto.setName(file.getName());
-                fileDto.setOriginalFilename(file.getOriginalFilename());
-                fileDtos.add(fileDto);
-            }
-            // 生成临时文件
-
-            FileUploadDto fileUploadDto = new FileUploadDto();
-            fileUploadDto.setFiles(fileDtos);
-            fileUploadDto.setCreatorId(creatorId);
-            fileUploadDto.setTypeId(typeId);
-            fileService.checkUploadSave(fileUploadDto);
-        } catch (Exception e) {
-            log.error("文件上传失败,原因为:【{}】", e.getMessage());
-            return R.fail("banner上传失败!");
-        }
-        return R.ok();
-    }
-
 }

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

@@ -14,8 +14,6 @@ import java.util.ArrayList;
  */
 public interface IFileService {
     ArrayList<ChekFileVo> checkImg(ArrayList<MultipartFile> multipartFiles);
-    //图片检测+图片上传+图片保存
-    void checkUploadSave(FileUploadDto fileUploadDto) throws IOException;
 
     /**
      * 写入艺术家上传次数

bnyer-services/bnyer-file/src/main/java/com/bnyer/file/service/impl/FileServiceImpl.java

@@ -83,32 +83,6 @@ public class FileServiceImpl implements IFileService {
         return chekFileVos;
     }
 
-    @Override
-    @Async("mySimpleAsync")
-    public void checkUploadSave(FileUploadDto fileUploadDto) throws IOException {
-        //redis累计艺术家当天上传次数，12.00后过期
-        writeUploadTotalNum(fileUploadDto.getCreatorId());
-        ArrayList<MultipartFile> multipartFiles = new ArrayList<>();
-        for (FileDto fileDto : fileUploadDto.getFiles()) {
-            InputStream inputStream = new ByteArrayInputStream(fileDto.getBytes());
-            MultipartFile files = new MockMultipartFile(fileDto.getName(), fileDto.getOriginalFilename(), ContentType.APPLICATION_OCTET_STREAM.toString(), inputStream);
-            //System.out.println(files.getSize());
-            multipartFiles.add(files);
-        }
-
-        //检测图片
-        for (ChekFileVo chekFileVo : checkImg(multipartFiles)) {
-            //图片上传
-            String imgUrl = qiniuService.userUpload(chekFileVo.getFile());
-            TiktokImgMiniDto tiktokImg = new TiktokImgMiniDto();
-            tiktokImg.setImgUrl(imgUrl);
-            tiktokImg.setStatus(chekFileVo.getStatus());
-            tiktokImg.setTypeId(fileUploadDto.getTypeId());
-            tiktokImg.setCreatorId(fileUploadDto.getCreatorId());
-            remoteImgService.insertTiktokImg(tiktokImg);
-        }
-    }
-
     @Override
     public void writeUploadTotalNum(Long creatorId) {
         SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");

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

@@ -142,7 +142,8 @@ public class CreatorMiniController extends BaseController {
     @PostMapping(value = "/insertTiktokImg")
     public AjaxResult insertTiktokImg(@Validated @RequestBody @ApiParam("TiktokImg对象") TiktokImgMiniDto dto){
         log.info("【艺术家小程序】艺术家【{}】新增图片参数为:{}",dto.getCreatorId(),JSON.toJSONString(dto));
-        return AjaxResult.success(tiktokImgService.insert(dto));
+        tiktokImgService.insert(dto);
+        return AjaxResult.success();
     }
 
     //@TokenCheck

bnyer-services/bnyer-img/src/main/java/com/bnyer/img/dto/TiktokImgMiniDto.java

@@ -21,7 +21,7 @@ public class TiktokImgMiniDto implements Serializable {
     private Long id;
 
     @ApiModelProperty(value="图片地址")
-    private String imgUrl;
+    private List<String> imgUrl;
 
     @ApiModelProperty(value="艺术家id")
     private Long creatorId;

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

@@ -15,9 +15,8 @@ public interface TiktokImgService {
     /**
      * 新增图片
      * @param dto 图片
-     * @return -
      */
-    int insert(TiktokImgMiniDto dto);
+    void insert(TiktokImgMiniDto dto);
 
     /**
      * 修改图片

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

@@ -51,20 +51,21 @@ public class TiktokImgServiceImpl implements TiktokImgService {
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public int insert(TiktokImgMiniDto dto) {
+    public void insert(TiktokImgMiniDto dto) {
-        TiktokImg tiktokImg = new TiktokImg();
+        for (String img : dto.getImgUrl()) {
-        tiktokImg.setImgUrl(dto.getImgUrl());
+            TiktokImg tiktokImg = new TiktokImg();
-        tiktokImg.setCreatorId(dto.getCreatorId());
+            tiktokImg.setImgUrl(img);
-        tiktokImg.setTypeId(dto.getTypeId());
+            tiktokImg.setCreatorId(dto.getCreatorId());
-        tiktokImg.setStatus(dto.getStatus());
+            tiktokImg.setTypeId(dto.getTypeId());
-        tiktokImg.setCreateTime(new Date());
+            tiktokImg.setStatus(dto.getStatus());
-        tiktokImg.setUpdateTime(new Date());
+            tiktokImg.setCreateTime(new Date());
-        int insert = tiktokImgMapper.insert(tiktokImg);
+            tiktokImg.setUpdateTime(new Date());
-        //保存标签
+            tiktokImgMapper.insert(tiktokImg);
-        if(CollectionUtils.isNotEmpty(dto.getSignList())){
+            //保存标签
-            imgSignRelationMapper.batctInsert(tiktokImg.getId(),dto.getTypeId(),dto.getSignList());
+            if(CollectionUtils.isNotEmpty(dto.getSignList())){
+                imgSignRelationMapper.batctInsert(tiktokImg.getId(),dto.getTypeId(),dto.getSignList());
+            }
         }
-        return insert;
     }