From 3c7f8a22d7d12f9a3a6bcb5545dd75ea0e4e08cc Mon Sep 17 00:00:00 2001 From: cuizhibin Date: Thu, 24 Jul 2025 09:33:05 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E4=BF=A1=E6=81=AF=E6=97=B6?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=BD=B1=E5=83=8F=E7=B1=BB=E5=9E=8B=E5=8F=8A?= =?UTF-8?q?=E5=BD=B1=E5=83=8F=E7=B1=BB=E5=9E=8B=E6=8F=8F=E8=BF=B0=E5=AD=97?= =?UTF-8?q?=E6=AE=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/dite/znpt/domain/entity/ImageEntity.java | 4 ++++ .../main/java/com/dite/znpt/domain/vo/ImageCollectReq.java | 6 ++++++ core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java | 6 ++++++ .../com/dite/znpt/service/impl/ImageCollectServiceImpl.java | 2 ++ .../java/com/dite/znpt/service/impl/ImageServiceImpl.java | 6 +++++- core/src/main/resources/mapper/ImageMapper.xml | 6 ++++-- 6 files changed, 27 insertions(+), 3 deletions(-) diff --git a/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java b/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java index 3b89da4..39f69a6 100644 --- a/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java +++ b/core/src/main/java/com/dite/znpt/domain/entity/ImageEntity.java @@ -112,6 +112,10 @@ public class ImageEntity extends AuditableEntity implements Serializable { @TableField("image_type") private String imageType; + @ApiModelProperty("影像类型描述") + @TableField("image_type_label") + private String imageTypeLabel; + @ApiModelProperty("图片路径") @TableField("image_path") private String imagePath; diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ImageCollectReq.java b/core/src/main/java/com/dite/znpt/domain/vo/ImageCollectReq.java index ec0dc60..68655bf 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ImageCollectReq.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ImageCollectReq.java @@ -63,6 +63,12 @@ public class ImageCollectReq implements Serializable { @ApiModelProperty("来源") private String imageSource; + @ApiModelProperty("图片类型") + private String imageType; + + @ApiModelProperty("图片类型描述") + private String imageTypeLabel; + @ApiModelProperty("图像信息") private List imageList; } diff --git a/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java b/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java index d203632..9c9b376 100644 --- a/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java +++ b/core/src/main/java/com/dite/znpt/domain/vo/ImageResp.java @@ -46,4 +46,10 @@ public class ImageResp implements Serializable { @ApiModelProperty("是否已审核，0未审核，1已审核") private Boolean reviewState; + @ApiModelProperty("影像类型,枚举ImageTypeEnum") + private String imageType; + + @ApiModelProperty("影像类型描述") + private String imageTypeLabel; + } diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java index d786566..39871f2 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageCollectServiceImpl.java @@ -57,6 +57,8 @@ public class ImageCollectServiceImpl extends ServiceImpl { image.setPartId(partId); image.setCollectId(imageCollect.getCollectId()); + image.setImageType(req.getImageType()); + image.setImageTypeLabel(req.getImageTypeLabel()); String path = permPathPrefix + image.getImageName(); File file = new File(temPathPrefix.concat(image.getImageName())); if (file.exists()) { diff --git a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java index 72fe852..00467e8 100644 --- a/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java +++ b/core/src/main/java/com/dite/znpt/service/impl/ImageServiceImpl.java @@ -77,7 +77,9 @@ public class ImageServiceImpl extends ServiceImpl impl resp.setAudioList(BeanUtil.copyToList(audioMap.get(resp.getImageId()), AudioFileInfoResp.class)); resp.setWeatherLabel(WeatherEnum.getDescByCode(resp.getWeather())); resp.setShootingMethodLabel(ShootingMethodEnum.getDescByCode(resp.getShootingMethod())); - resp.setImageTypeLabel(ImageTypeEnum.getDescByCode(resp.getImageType())); + if (StrUtil.isEmpty(resp.getImageTypeLabel())) { + resp.setImageTypeLabel(ImageTypeEnum.getDescByCode(resp.getImageType())); + } resp.setImageSourceLabel(ImageSourceEnum.getDescByCode(resp.getImageSource())); }); } @@ -167,6 +169,8 @@ public class ImageServiceImpl extends ServiceImpl impl imageEntity.setImagePath(FilePathEnum.IMAGE_TEMP.getFileDownPath(path)); imageEntity.setPartId(partId); imageEntity.setCollectId(imageCollect.getCollectId()); + imageEntity.setImageType(collectReq.getImageType()); + imageEntity.setImageTypeLabel(collectReq.getImageTypeLabel()); imageList.add(imageEntity); } catch (Exception e) { e.printStackTrace(); diff --git a/core/src/main/resources/mapper/ImageMapper.xml b/core/src/main/resources/mapper/ImageMapper.xml index e47e4b9..f90cd53 100644 --- a/core/src/main/resources/mapper/ImageMapper.xml +++ b/core/src/main/resources/mapper/ImageMapper.xml @@ -5,7 +5,7 @@ SELECT i.image_id, i.image_name, i.part_id, p.part_name, i.image_resolution, i.focal_distance, i.shooting_time, i.camera_manufacturer, i.camera_model, i.GPS, ic.weather, ic.humidness, CONCAT(ic.temperature_min, '℃', '~',temperature_max, '℃') AS temperature, ic.wind_level, - ic.shooting_method, ic.shooting_distance,ic.collector_name, i.image_type, i.image_path, ic.image_source, i.review_state + ic.shooting_method, ic.shooting_distance,ic.collector_name, i.image_type, i.image_path, ic.image_source, i.review_state, i.image_type_label FROM image i LEFT JOIN image_collect ic ON i.collect_id = ic.collect_id LEFT JOIN part p ON i.part_id = p.part_id @@ -35,6 +35,8 @@ + + @@ -68,7 +70,7 @@ SELECT i.image_id, i.image_name, i.image_path, i.image_height, i.image_resolution, i.image_width, i.image_height, i.focal_distance, i.focal_distance35, i.x_resolution, i.y_resolution, i.resolution_units, i.shooting_time, i.camera_manufacturer, i.camera_model, i.latitude, i.latitude, i.altitude, ic.collect_id, ic.weather, CONCAT(ic.temperature_min, '℃', '~',temperature_max, '℃') AS temperature, - ic.wind_level, ic.shooting_method, ic.shooting_distance, ic.collector_name, ic.image_source, i.review_state + ic.wind_level, ic.shooting_method, ic.shooting_distance, ic.collector_name, ic.image_source, i.review_state, i.image_type, i.image_type_label FROM image i LEFT JOIN image_collect ic ON i.collect_id = ic.collect_id WHERE i.image_id = #{imageId}