yaowang
/
kn-vordm
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/glj' into glj

This commit is contained in:
qqGroup0 2023-04-11 09:32:28 +08:00
parent 6d33feb5d4 36cac4f334
commit 95e05c1c1e
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
kn-service/biz-vordm/src/main/java/com/kening/vordm/service/impl/EntityDataServiceImpl.java
View File

@ -1,5 +1,6 @@
package com.kening.vordm.service.impl; 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.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.mapper.GuestInfoMapper;
import com.kening.vordm.service.EntityDataService; import com.kening.vordm.service.EntityDataService;
import com.kening.vordm.vo.EntityDataUserVo; import com.kening.vordm.vo.EntityDataUserVo;
import com.kening.vordm.vo.FileVo;
import com.kening.vordm.vo.UserTenantVo; import com.kening.vordm.vo.UserTenantVo;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springblade.core.oss.MinioTemplate; import org.springblade.core.oss.MinioTemplate;
import org.springblade.core.oss.model.BladeFile; 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.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import org.springframework.web.multipart.MultipartFile; import org.springframework.web.multipart.MultipartFile;
import java.io.File; import java.util.ArrayList;
import java.io.FileInputStream;
import java.io.IOException;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -66,6 +62,15 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
//创建实体数据 //创建实体数据
EntityData entityData = new EntityData(); EntityData entityData = new EntityData();
//路径拼接
List<String> link = new ArrayList<>();
//文件数据
List<MultipartFile> filesArray = entityDataUserVo.getFilesArray();
filesArray.stream().forEach(files->{
BladeFile bladeFile = minioTemplate.putFile(files);
link.add(bladeFile.getLink());
});
//判断上传用户是否存在 //判断上传用户是否存在
LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>(); LambdaQueryWrapper<GuestInfo> qw = new LambdaQueryWrapper<>();
qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail()); qw.eq(GuestInfo::getEmail, entityDataUserVo.getEmail());
@ -89,7 +94,7 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
//实体数据 //实体数据
entityData.setTitle(entityDataUserVo.getTitle()); entityData.setTitle(entityDataUserVo.getTitle());
entityData.setSize(entityDataUserVo.getSize()); entityData.setSize(entityDataUserVo.getSize());
entityData.setLink(entityDataUserVo.getLink()); entityData.setLink(StringUtils.join(link,","));
entityData.setDisasterId(entityDataUserVo.getDisasterId()); entityData.setDisasterId(entityDataUserVo.getDisasterId());
entityData.setUploadTime(new Date()); entityData.setUploadTime(new Date());
entityData.setRemark(entityDataUserVo.getRemark()); entityData.setRemark(entityDataUserVo.getRemark());
@ -97,16 +102,5 @@ public class EntityDataServiceImpl extends ServiceImpl<EntityDataMapper, EntityD
return this.baseMapper.insert(entityData)>1; return this.baseMapper.insert(entityData)>1;
} }
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;
}
} }