cuizhibin
/
znpt-backend
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

新增缺陷时，标记图片为缺陷图片

This commit is contained in:
cuizhibin 2025-07-22 16:42:41 +08:00
parent 938218016f
commit e645c9fd07
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
core/src/main/java/com/dite/znpt/domain/vo/ImageSimpleReq.java
View File

@ -26,4 +26,7 @@ public class ImageSimpleReq implements Serializable {
@ApiModelProperty(name = "图像路径", required = true) @ApiModelProperty(name = "图像路径", required = true)
private String imagePath; private String imagePath;
@ApiModelProperty("影像类型")
private String imageType;
} }

8
core/src/main/java/com/dite/znpt/service/impl/DefectServiceImpl.java
View File

@ -108,9 +108,12 @@ public class DefectServiceImpl extends ServiceImpl<DefectMapper, DefectEntity> i
@Transactional(rollbackFor = Exception.class) @Transactional(rollbackFor = Exception.class)
@Override @Override
public void save(String imageId, DefectReq req) { 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); throw new ServiceException(Message.IMAGE_ID_IS_NOT_EXIST);
} }
image.setImageType(ImageTypeEnum.DEFECT.getCode());
imageService.save(image);
DefectEntity defectEntity = Converts.INSTANCE.toDefectEntity(req); DefectEntity defectEntity = Converts.INSTANCE.toDefectEntity(req);
defectEntity.setImageId(imageId); defectEntity.setImageId(imageId);
defectEntity.setLabelInfo(JSONUtil.toJsonStr(req.getMarkInfo())); defectEntity.setLabelInfo(JSONUtil.toJsonStr(req.getMarkInfo()));
@ -128,6 +131,7 @@ public class DefectServiceImpl extends ServiceImpl<DefectMapper, DefectEntity> i
@Override @Override
public List<DefectEntity> saveOutWorkDefect(List<OutWorkDefectReq> list) { public List<DefectEntity> saveOutWorkDefect(List<OutWorkDefectReq> list) {
List<ImageSimpleReq> imageSimpleReqList = Converts.INSTANCE.toImageSimpleReq(list); List<ImageSimpleReq> imageSimpleReqList = Converts.INSTANCE.toImageSimpleReq(list);
imageSimpleReqList.forEach(req -> req.setImageType(ImageTypeEnum.DEFECT.getCode()));
List<ImageEntity> imageEntityList = imageService.batchSaveByImageSimpleReq(imageSimpleReqList); List<ImageEntity> imageEntityList = imageService.batchSaveByImageSimpleReq(imageSimpleReqList);
Map<String, ImageEntity> imageMap = imageEntityList.stream().collect(Collectors.toMap(k->k.getPartId().concat(StrUtil.COLON).concat(k.getImagePath()), Function.identity())); Map<String, ImageEntity> imageMap = imageEntityList.stream().collect(Collectors.toMap(k->k.getPartId().concat(StrUtil.COLON).concat(k.getImagePath()), Function.identity()));
List<DefectEntity> defectEntityList = new ArrayList<>(); List<DefectEntity> defectEntityList = new ArrayList<>();
@ -192,6 +196,8 @@ public class DefectServiceImpl extends ServiceImpl<DefectMapper, DefectEntity> i
if (Objects.isNull(image)) { if (Objects.isNull(image)) {
throw new ServiceException(Message.IMAGE_ID_IS_NOT_EXIST); 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; FilePathEnum pathEnum = image.getImagePath().contains("temp") ? FilePathEnum.IMAGE_TEMP : FilePathEnum.IMAGE;
String inputPath = pathEnum.getFileAbsolutePath(image.getImagePath()); String inputPath = pathEnum.getFileAbsolutePath(image.getImagePath());
// 写入attach同层级文件夹下 // 写入attach同层级文件夹下