BUGFIX: design存sketchboard到library;
This commit is contained in:
@@ -59,6 +59,7 @@ public interface CollectionElementService extends IService<CollectionElement> {
|
|||||||
* @return
|
* @return
|
||||||
*/
|
*/
|
||||||
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements,String timeZone);
|
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements,String timeZone);
|
||||||
|
Boolean saveLibraryByCollectionElement(List<CollectionElement> elements,String timeZone, String modelSex);
|
||||||
/**
|
/**
|
||||||
* 校验element
|
* 校验element
|
||||||
*
|
*
|
||||||
|
|||||||
@@ -240,6 +240,38 @@ public class CollectionElementServiceImpl extends ServiceImpl<CollectionElementM
|
|||||||
return Boolean.TRUE;
|
return Boolean.TRUE;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Boolean saveLibraryByCollectionElement(List<CollectionElement> elements,String timeZone, String modelSex){
|
||||||
|
if(CollectionUtils.isEmpty(elements)){
|
||||||
|
return Boolean.TRUE;
|
||||||
|
}
|
||||||
|
//获取已存在相同的library
|
||||||
|
List<String> md5List = elements.stream().map(CollectionElement::getMd5).collect(Collectors.toList());
|
||||||
|
List<Library> existsLibrarys = libraryService.getByMD5List(md5List);
|
||||||
|
if(!CollectionUtils.isEmpty(existsLibrarys)){
|
||||||
|
//去重
|
||||||
|
List<String> existsMd5Lists = existsLibrarys.stream().map(Library::getMd5).collect(Collectors.toList());
|
||||||
|
elements = elements.stream().filter(element ->!existsMd5Lists.contains(element.getMd5())).collect(Collectors.toList());
|
||||||
|
}
|
||||||
|
if(CollectionUtils.isEmpty(elements)){
|
||||||
|
//都是重复的
|
||||||
|
return Boolean.TRUE;
|
||||||
|
}
|
||||||
|
String name = DateUtil.dateToStr(new Date(),DateUtil.YYYY_MM_DD);
|
||||||
|
List<Library> libraryList = CopyUtil.copyList(elements, Library.class,(o,d) ->{
|
||||||
|
if (d.getLevel1Type().equals(LibraryLevel1TypeEnum.SKETCH_BOARD.getRealName())) {
|
||||||
|
d.setLevel3Type(modelSex);
|
||||||
|
}
|
||||||
|
d.setCreateDate(DateUtil.getByTimeZone(timeZone));
|
||||||
|
d.setName(name);
|
||||||
|
d.setId(null);
|
||||||
|
});
|
||||||
|
if (!libraryService.saveBatch(libraryList)) {
|
||||||
|
throw new BusinessException("Batch saving failed !");
|
||||||
|
}
|
||||||
|
return Boolean.TRUE;
|
||||||
|
}
|
||||||
|
|
||||||
private CollectionElement resolveData(String path, String timeZone,AuthPrincipalVo userInfo) {
|
private CollectionElement resolveData(String path, String timeZone,AuthPrincipalVo userInfo) {
|
||||||
File file = new File(path);
|
File file = new File(path);
|
||||||
CollectionElement element = new CollectionElement();
|
CollectionElement element = new CollectionElement();
|
||||||
|
|||||||
@@ -377,7 +377,7 @@ public class DesignServiceImpl extends ServiceImpl<DesignMapper, Design> impleme
|
|||||||
if (!CollectionUtils.isEmpty(elementVO.getMarketingSketchElements())) {
|
if (!CollectionUtils.isEmpty(elementVO.getMarketingSketchElements())) {
|
||||||
elements.addAll(elementVO.getMarketingSketchElements());
|
elements.addAll(elementVO.getMarketingSketchElements());
|
||||||
}
|
}
|
||||||
collectionElementService.saveLibraryByCollectionElement(elements, timeZone);
|
collectionElementService.saveLibraryByCollectionElement(elements, timeZone, elementVO.getModelSex());
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|||||||
Reference in New Issue
Block a user