diff --git a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java index 28cbca5..35669ff 100644 --- a/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java +++ b/kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java @@ -1,5 +1,6 @@ package com.kening.vordm.service.impl; +import com.alibaba.nacos.common.utils.StringUtils; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; @@ -9,21 +10,16 @@ import com.kening.vordm.mapper.EntityDataMapper; import com.kening.vordm.mapper.GuestInfoMapper; import com.kening.vordm.service.EntityDataService; import com.kening.vordm.vo.EntityDataUserVo; -import com.kening.vordm.vo.FileVo; import com.kening.vordm.vo.UserTenantVo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.model.BladeFile; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.mock.web.MockMultipartFile; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import org.springframework.web.multipart.MultipartFile; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; +import java.util.ArrayList; import java.util.Date; import java.util.List; @@ -66,6 +62,15 @@ public class EntityDataServiceImpl extends ServiceImpl link = new ArrayList<>(); + //文件数据 + List filesArray = entityDataUserVo.getFilesArray(); + filesArray.stream().forEach(files->{ + BladeFile bladeFile = minioTemplate.putFile(files); + link.add(bladeFile.getLink()); + }); + //判断上传用户是否存在 LambdaQueryWrapper qw = new LambdaQueryWrapper<>(); qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail()); @@ -89,7 +94,7 @@ public class EntityDataServiceImpl extends ServiceImpl1; } - public static MultipartFile fileToMultipartFile(File file) { - MultipartFile result = null; - if (null != file) { - try (FileInputStream input = new FileInputStream(file)) { - result = new MockMultipartFile(file.getName().concat("temp"), file.getName(), "text/plain", input); - } catch (IOException e) { - e.printStackTrace(); - } - } - return result; - } }