From e645c9fd07ac3aab26dfbeac027603a908051991 Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Tue, 22 Jul 2025 16:42:41 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BC=BA=E9=99=B7=E6=97=B6?= =?UTF-8?q?=EF=BC=8C=E6=A0=87=E8=AE=B0=E5=9B=BE=E7=89=87=E4=B8=BA=E7=BC=BA?= =?UTF-8?q?=E9=99=B7=E5=9B=BE=E7=89=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java | 3 +++ .../com/dite/znpt/service/impl/DefectServiceImpl.java | 8 +++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java index e0000d0..8f4e8ce 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java @@ -26,4 +26,7 @@ public class ImageSimpleReq implements Serializable { @ApiModelProperty(name = "图像路径", required = true) private String imagePath; + + @ApiModelProperty("影像类型") + private String imageType; } diff --git a/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java index 91dfc47..a3dc96b 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java @@ -108,9 +108,12 @@ public class DefectServiceImpl extends ServiceImpl i @Transactional(rollbackFor = Exception.class) @Override public void save(String imageId, DefectReq req) { - if(null == imageService.getById(imageId)){ + ImageEntity image = imageService.getById(imageId); + if(null == image){ throw new ServiceException(Message.IMAGE_ID_IS_NOT_EXIST); } + image.setImageType(ImageTypeEnum.DEFECT.getCode()); + imageService.save(image); DefectEntity defectEntity = Converts.INSTANCE.toDefectEntity(req); defectEntity.setImageId(imageId); defectEntity.setLabelInfo(JSONUtil.toJsonStr(req.getMarkInfo())); @@ -128,6 +131,7 @@ public class DefectServiceImpl extends ServiceImpl i @Override public List saveOutWorkDefect(List list) { List imageSimpleReqList = Converts.INSTANCE.toImageSimpleReq(list); + imageSimpleReqList.forEach(req -> req.setImageType(ImageTypeEnum.DEFECT.getCode())); List imageEntityList = imageService.batchSaveByImageSimpleReq(imageSimpleReqList); Map imageMap = imageEntityList.stream().collect(Collectors.toMap(k->k.getPartId().concat(StrUtil.COLON).concat(k.getImagePath()), Function.identity())); List defectEntityList = new ArrayList<>(); @@ -192,6 +196,8 @@ public class DefectServiceImpl extends ServiceImpl i if (Objects.isNull(image)) { throw new ServiceException(Message.IMAGE_ID_IS_NOT_EXIST); } + image.setImageType(ImageTypeEnum.DEFECT.getCode()); + imageService.save(image); FilePathEnum pathEnum = image.getImagePath().contains("temp") ? FilePathEnum.IMAGE_TEMP : FilePathEnum.IMAGE; String inputPath = pathEnum.getFileAbsolutePath(image.getImagePath()); // 写入attach同层级文件夹下