diff --git a/src/main/java/com/ai/da/controller/LibraryController.java b/src/main/java/com/ai/da/controller/LibraryController.java index 58e0f3dd..61614b4e 100644 --- a/src/main/java/com/ai/da/controller/LibraryController.java +++ b/src/main/java/com/ai/da/controller/LibraryController.java @@ -12,6 +12,7 @@ import com.ai.da.common.utils.*; import com.ai.da.mapper.entity.Library; import com.ai.da.mapper.entity.LibraryModelPoint; import com.ai.da.model.dto.*; +import com.ai.da.model.enums.ModelType; import com.ai.da.model.vo.*; import com.ai.da.service.LibraryModelPointService; import com.ai.da.service.LibraryService; @@ -79,7 +80,7 @@ public class LibraryController { if (StringUtils.isEmpty(modelType)) { throw new BusinessException("modelType can't be null"); } - if (StringUtils.isEmpty(sex)) { + if (modelType.equals(ModelType.SYSTEM.getValue()) && StringUtils.isEmpty(sex)) { throw new BusinessException("sex can't be null"); } FileVO fileVO = FileUtil.getFileSize(file); diff --git a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java index ea8fe484..fe51c272 100644 --- a/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/CollectionElementServiceImpl.java @@ -447,17 +447,18 @@ public class CollectionElementServiceImpl extends ServiceImpl qw = new QueryWrapper<>(); - qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.LIBRARY.getValue()); - qw.lambda().eq(LibraryModelPoint::getRelationId, byId.getId()); - LibraryModelPoint modelPoint = libraryModelPointService.getOne(qw); - if (Objects.isNull(modelPoint)) { - throw new BusinessException("error modelPoint get"); - } - elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); - } +// if (designDTO.getModelType().equals(ModelType.LIBRARY.getValue())) { +// Library byId = libraryService.getById(designDTO.getTemplateId()); +// QueryWrapper qw = new QueryWrapper<>(); +// qw.lambda().eq(LibraryModelPoint::getModelType, ModelType.LIBRARY.getValue()); +// qw.lambda().eq(LibraryModelPoint::getRelationId, byId.getId()); +// LibraryModelPoint modelPoint = libraryModelPointService.getOne(qw); +// if (Objects.isNull(modelPoint)) { +// throw new BusinessException("error modelPoint get"); +// } +// elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(modelPoint,1654,1170,byId.getUrl())); +// } + elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null)); } elementVO.setDesignLibraryModelPoint(calculateTemplatePointTemplate(null,null,null,null)); return elementVO; diff --git a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java index a2a9ccf1..26306761 100644 --- a/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java +++ b/src/main/java/com/ai/da/service/impl/DesignServiceImpl.java @@ -38,6 +38,7 @@ import javax.annotation.Resource; import javax.validation.constraints.NotNull; import java.io.File; import java.math.BigDecimal; +import java.time.LocalDateTime; import java.util.*; import java.util.stream.Collectors; @@ -505,6 +506,7 @@ public class DesignServiceImpl extends ServiceImpl impleme DesignItemDetailPrint print = new DesignItemDetailPrint(); print.setDesignItemDetailId(designItemDetail.getId()); print.setPath(designItemDetail.getPrintPath()); + print.setCreateDate(LocalDateTime.now()); designItemDetailPrintService.save(print); } }