q792602257/FrameTour-BE
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

设备支持多个配置

Browse Source
This commit is contained in:
Jerry Yan
2025-07-18 14:21:39 +08:00
parent f084b7a21f
commit 52086dbea4
3 changed files with 39 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/java/com/ycwl/basic/controller/viid/ViidController.java
View File

@@ -69,7 +69,6 @@ import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ThreadFactory; import java.util.concurrent.ThreadFactory;
import java.util.concurrent.ThreadPoolExecutor; import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
import java.util.stream.Collectors;
import static com.ycwl.basic.constant.StorageConstant.PHOTO_PATH; import static com.ycwl.basic.constant.StorageConstant.PHOTO_PATH;
import static com.ycwl.basic.constant.StorageConstant.VIID_FACE; import static com.ycwl.basic.constant.StorageConstant.VIID_FACE;
@@ -298,9 +297,11 @@ public class ViidController {
for (SubImageInfoObject subImage : subImageList.getSubImageInfoObject()) { for (SubImageInfoObject subImage : subImageList.getSubImageInfoObject()) {
// base64转换成MultipartFIle // base64转换成MultipartFIle
MultipartFile file = ImageUtils.base64ToMultipartFile(subImage.getData()); MultipartFile file = ImageUtils.base64ToMultipartFile(subImage.getData());
String ext = subImage.getFileFormat(); String ext;
if (ext.equalsIgnoreCase("jpeg")) { if (subImage.getFileFormat().equalsIgnoreCase("jpeg")) {
ext = "jpg"; ext = "jpg";
} else {
ext = subImage.getFileFormat();
} }
IStorageAdapter adapter = StorageFactory.use("faces"); IStorageAdapter adapter = StorageFactory.use("faces");
// Type=11 人脸 // Type=11 人脸
@@ -337,7 +338,6 @@ public class ViidController {
facePosition.setImgHeight(_subImage.getHeight()); facePosition.setImgHeight(_subImage.getHeight());
facePosition.setImgWidth(_subImage.getWidth()); facePosition.setImgWidth(_subImage.getWidth());
SourceEntity source = new SourceEntity(); SourceEntity source = new SourceEntity();
source.setId(SnowFlakeUtil.getLongId());
source.setDeviceId(device.getId()); source.setDeviceId(device.getId());
source.setScenicId(device.getScenicId()); source.setScenicId(device.getScenicId());
source.setFaceSampleId(newFaceSampleId); source.setFaceSampleId(newFaceSampleId);
@@ -345,37 +345,42 @@ public class ViidController {
source.setType(2); source.setType(2);
// 上传oss // 上传oss
MultipartFile _file = ImageUtils.base64ToMultipartFile(_subImage.getData()); MultipartFile _file = ImageUtils.base64ToMultipartFile(_subImage.getData());
String filename = StorageUtil.joinPath(PHOTO_PATH, UUID.randomUUID() + "." + ext);
ThreadPoolExecutor executor = getExecutor(scenicId); ThreadPoolExecutor executor = getExecutor(scenicId);
executor.execute(() -> { executor.execute(() -> {
DeviceCropConfig cropConfig = deviceConfig.getCropConfig(); List<DeviceCropConfig> cropConfigs = deviceConfig._getCropConfig();
MultipartFile _finalFile = _file; for (DeviceCropConfig cropConfig : cropConfigs) {
if (cropConfig != null) { source.setId(SnowFlakeUtil.getLongId());
String filename = StorageUtil.joinPath(PHOTO_PATH, UUID.randomUUID() + "." + ext);
MultipartFile _finalFile = _file;
if (cropConfig.getCropType() == 1) { if (cropConfig.getCropType() == 1) {
// 按固定位置截图 // 按固定位置截图
try { try {
_finalFile = ImageUtils.cropImage(_file, cropConfig.getTargetX(), cropConfig.getTargetY(), cropConfig.getTargetWidth(), cropConfig.getTargetHeight()); _finalFile = ImageUtils.cropImage(_file, cropConfig.getTargetX(), cropConfig.getTargetY(), cropConfig.getTargetWidth(), cropConfig.getTargetHeight());
} catch (IOException ignored) { } catch (IOException e) {
} catch (RasterFormatException ignored) { log.error("裁切图片失败！", e);
} catch (RasterFormatException e) {
log.error("裁切图片出错！", e);
} }
} else if (cropConfig.getCropType() == 2) { } else if (cropConfig.getCropType() == 2) {
// 按人脸位置 // 按人脸位置
try { try {
int targetX = facePosition.getLtX() - (cropConfig.getTargetWidth() - facePosition.getWidth()); int targetX = facePosition.getLtX() - (cropConfig.getTargetWidth() - facePosition.getWidth())/2;
int targetY = facePosition.getLtY() - (cropConfig.getTargetHeight() - facePosition.getHeight()); int targetY = facePosition.getLtY() - (cropConfig.getTargetHeight() - facePosition.getHeight())/2;
_finalFile = ImageUtils.cropImage(_file, targetX, targetY, cropConfig.getTargetWidth(), cropConfig.getTargetHeight()); _finalFile = ImageUtils.cropImage(_file, targetX, targetY, cropConfig.getTargetWidth(), cropConfig.getTargetHeight());
} catch (IOException ignored) { } catch (IOException e) {
} catch (RasterFormatException ignored) { log.error("裁切图片失败！", e);
} catch (RasterFormatException e) {
log.error("裁切图片出错！", e);
} }
facePosition.setImgHeight(cropConfig.getTargetHeight()); facePosition.setImgHeight(cropConfig.getTargetHeight());
facePosition.setImgWidth(cropConfig.getTargetWidth()); facePosition.setImgWidth(cropConfig.getTargetWidth());
} }
String _sourceUrl = scenicStorageAdapter.uploadFile(_finalFile, filename);
scenicStorageAdapter.setAcl(StorageAcl.PUBLIC_READ, filename);
source.setUrl(_sourceUrl);
source.setPosJson(JSON.toJSONString(facePosition));
sourceMapper.add(source);
} }
String _sourceUrl = scenicStorageAdapter.uploadFile(_finalFile, filename);
scenicStorageAdapter.setAcl(StorageAcl.PUBLIC_READ, filename);
source.setUrl(_sourceUrl);
source.setPosJson(JSON.toJSONString(facePosition));
sourceMapper.add(source);
}); });
} }
log.info("人脸信息及原图{}张入库成功！设备ID：{}", type14ImageList.size(), deviceID); log.info("人脸信息及原图{}张入库成功！设备ID：{}", type14ImageList.size(), deviceID);

20
src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceConfigEntity.java
View File

@@ -4,9 +4,12 @@ import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.annotation.TableName; import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat; import com.fasterxml.jackson.annotation.JsonFormat;
import lombok.Data; import lombok.Data;
import org.apache.commons.lang3.StringUtils;
import java.math.BigDecimal; import java.math.BigDecimal;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List;
@Data @Data
@TableName("device_config") @TableName("device_config")
@@ -65,11 +68,16 @@ public class DeviceConfigEntity {
private String videoCrop; private String videoCrop;
private String cropConfig; private String cropConfig;
public void setCropConfig(DeviceCropConfig cropConfig) { public List<DeviceCropConfig> _getCropConfig() {
this.cropConfig = JSON.toJSONString(cropConfig); if (cropConfig == null || cropConfig.isEmpty()) {
} return Collections.singletonList(new DeviceCropConfig());
}
public DeviceCropConfig getCropConfig() { if (StringUtils.startsWith(cropConfig, "{")) {
return JSON.parseObject(cropConfig, DeviceCropConfig.class); return Collections.singletonList(JSON.parseObject(cropConfig, DeviceCropConfig.class));
}
if (StringUtils.startsWith(cropConfig, "[")) {
return JSON.parseArray(cropConfig, DeviceCropConfig.class);
}
return Collections.singletonList(new DeviceCropConfig());
} }
} }

2
src/main/java/com/ycwl/basic/model/pc/device/entity/DeviceCropConfig.java
View File

@@ -5,7 +5,7 @@ import lombok.Data;
@Data @Data
public class DeviceCropConfig { public class DeviceCropConfig {
// 截图类型 0:无截图 1:固定截图 2:按人脸位置截图 // 截图类型 0:无截图 1:固定截图 2:按人脸位置截图
private Integer cropType; private int cropType;
private Integer targetWidth; private Integer targetWidth;
private Integer targetHeight; private Integer targetHeight;
private Integer targetX; private Integer targetX;