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

refactor(device-config): 重构设备配置获取方式

Browse Source 
- 将 DeviceConfigEntity 替换为 DeviceConfigManager
- 优化设备配置的获取逻辑，使用 getInteger 和 getLong 方法
- 移除未使用的代码块，提高代码可读性
- 统一设备配置的处理方式，提高代码维护性
This commit is contained in:
Jerry Yan
2025-09-02 16:15:35 +08:00
parent 35b2e7c655
commit 3efad90750
4 changed files with 52 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import cn.hutool.core.collection.CollUtil;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import cn.hutool.core.thread.ThreadFactoryBuilder; import cn.hutool.core.thread.ThreadFactoryBuilder;
import cn.hutool.core.util.ObjectUtil; import cn.hutool.core.util.ObjectUtil;
import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
import com.ycwl.basic.utils.JacksonUtil; import com.ycwl.basic.utils.JacksonUtil;
import com.ycwl.basic.annotation.IgnoreLogReq; import com.ycwl.basic.annotation.IgnoreLogReq;
import com.ycwl.basic.annotation.IgnoreToken; import com.ycwl.basic.annotation.IgnoreToken;
@@ -33,7 +34,6 @@ import com.ycwl.basic.model.viid.req.UnRegisterReq;
import com.ycwl.basic.model.viid.resp.SystemTimeResp; import com.ycwl.basic.model.viid.resp.SystemTimeResp;
import com.ycwl.basic.model.viid.resp.VIIDBaseResp; import com.ycwl.basic.model.viid.resp.VIIDBaseResp;
import com.ycwl.basic.repository.DeviceRepository; import com.ycwl.basic.repository.DeviceRepository;
import com.ycwl.basic.repository.ScenicRepository;
import com.ycwl.basic.service.pc.ScenicService; import com.ycwl.basic.service.pc.ScenicService;
import com.ycwl.basic.service.task.TaskFaceService; import com.ycwl.basic.service.task.TaskFaceService;
import com.ycwl.basic.storage.StorageFactory; import com.ycwl.basic.storage.StorageFactory;
@@ -87,8 +87,6 @@ public class ViidController {
@Autowired @Autowired
private DeviceRepository deviceRepository; private DeviceRepository deviceRepository;
@Autowired @Autowired
private ScenicRepository scenicRepository;
@Autowired
private TaskFaceService taskFaceService; private TaskFaceService taskFaceService;
private final Map<Long, ThreadPoolExecutor> executors = new ConcurrentHashMap<>(); private final Map<Long, ThreadPoolExecutor> executors = new ConcurrentHashMap<>();
@Autowired @Autowired
@@ -245,17 +243,14 @@ public class ViidController {
if (device == null) { if (device == null) {
continue; continue;
} }
DeviceConfigEntity deviceConfig = deviceRepository.getDeviceConfig(device.getId()); DeviceConfigManager deviceConfig = deviceRepository.getDeviceConfigManager(device.getId());
if (deviceConfig == null) { if (deviceConfig == null) {
log.warn("设备配置不存在：" + deviceID); log.warn("设备配置不存在：" + deviceID);
return new VIIDBaseResp( return new VIIDBaseResp(
new ResponseStatusObject(faceId, "/VIID/Faces", "0", "OK", sdfTime.format(new Date())) new ResponseStatusObject(faceId, "/VIID/Faces", "0", "OK", sdfTime.format(new Date()))
); );
} }
int viidMode = 0; Integer viidMode = deviceConfig.getInteger("viid_mode", 0);
if (deviceConfig.getViidType() != null) {
viidMode = deviceConfig.getViidType();
}
Date shotTime = null; Date shotTime = null;
if (StringUtils.isNotBlank(face.getShotTime())) { if (StringUtils.isNotBlank(face.getShotTime())) {
try { try {
@@ -333,7 +328,7 @@ public class ViidController {
faceSampleMapper.updateScore(faceSample.getId(), addFaceResp.getScore()); faceSampleMapper.updateScore(faceSample.getId(), addFaceResp.getScore());
} }
} }
if (Integer.valueOf(1).equals(deviceConfig.getEnablePreBook())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("enable_pre_book"))) {
DynamicTaskGenerator.addTask(faceSample.getId()); DynamicTaskGenerator.addTask(faceSample.getId());
} }
}); });
@@ -352,40 +347,40 @@ public class ViidController {
MultipartFile _file = ImageUtils.base64ToMultipartFile(_subImage.getData()); MultipartFile _file = ImageUtils.base64ToMultipartFile(_subImage.getData());
ThreadPoolExecutor executor = getExecutor(scenicId); ThreadPoolExecutor executor = getExecutor(scenicId);
executor.execute(() -> { executor.execute(() -> {
List<DeviceCropConfig> cropConfigs = deviceConfig._getCropConfig(); // List<DeviceCropConfig> cropConfigs = deviceConfig._getCropConfig();
for (DeviceCropConfig cropConfig : cropConfigs) { // for (DeviceCropConfig cropConfig : cropConfigs) {
source.setId(SnowFlakeUtil.getLongId()); // source.setId(SnowFlakeUtil.getLongId());
String filename = StorageUtil.joinPath(PHOTO_PATH, UUID.randomUUID() + "." + ext); // String filename = StorageUtil.joinPath(PHOTO_PATH, UUID.randomUUID() + "." + ext);
MultipartFile _finalFile = _file; // 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 e) { // } catch (IOException e) {
log.error("裁切图片失败！", e); // log.error("裁切图片失败！", e);
} catch (RasterFormatException e) { // } catch (RasterFormatException e) {
log.error("裁切图片出错！", e); // log.error("裁切图片出错！", e);
} // }
} else if (cropConfig.getCropType() == 2) { // } else if (cropConfig.getCropType() == 2) {
// 按人脸位置 // // 按人脸位置
try { // try {
int targetX = facePosition.getLtX() - (cropConfig.getTargetWidth() - facePosition.getWidth())/2; // int targetX = facePosition.getLtX() - (cropConfig.getTargetWidth() - facePosition.getWidth())/2;
int targetY = facePosition.getLtY() - (cropConfig.getTargetHeight() - facePosition.getHeight())/2; // 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 e) { // } catch (IOException e) {
log.error("裁切图片失败！", e); // log.error("裁切图片失败！", e);
} catch (RasterFormatException e) { // } catch (RasterFormatException e) {
log.error("裁切图片出错！", 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); // String _sourceUrl = scenicStorageAdapter.uploadFile(_finalFile, filename);
scenicStorageAdapter.setAcl(StorageAcl.PUBLIC_READ, filename); // scenicStorageAdapter.setAcl(StorageAcl.PUBLIC_READ, filename);
source.setUrl(_sourceUrl); // source.setUrl(_sourceUrl);
source.setPosJson(JacksonUtil.toJSONString(facePosition)); // source.setPosJson(JacksonUtil.toJSONString(facePosition));
sourceMapper.add(source); // sourceMapper.add(source);
} // }
}); });
} }
log.info("人脸信息及原图{}张入库成功！设备ID：{}", type14ImageList.size(), deviceID); log.info("人脸信息及原图{}张入库成功！设备ID：{}", type14ImageList.size(), deviceID);
@@ -425,7 +420,7 @@ public class ViidController {
faceSampleMapper.updateScore(faceSample.getId(), addFaceResp.getScore()); faceSampleMapper.updateScore(faceSample.getId(), addFaceResp.getScore());
} }
} }
if (Integer.valueOf(1).equals(deviceConfig.getEnablePreBook())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("enable_pre_book"))) {
DynamicTaskGenerator.addTask(faceSample.getId()); DynamicTaskGenerator.addTask(faceSample.getId());
} }
}); });

7
src/main/java/com/ycwl/basic/service/pc/impl/FaceServiceImpl.java
View File

@@ -9,6 +9,7 @@ import com.ycwl.basic.constant.BaseContextHandler;
import com.ycwl.basic.enums.StatisticEnum; import com.ycwl.basic.enums.StatisticEnum;
import com.ycwl.basic.exception.BaseException; import com.ycwl.basic.exception.BaseException;
import com.ycwl.basic.facebody.adapter.IFaceBodyAdapter; import com.ycwl.basic.facebody.adapter.IFaceBodyAdapter;
import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
import com.ycwl.basic.mapper.SourceMapper; import com.ycwl.basic.mapper.SourceMapper;
import com.ycwl.basic.mapper.StatisticsMapper; import com.ycwl.basic.mapper.StatisticsMapper;
import com.ycwl.basic.mapper.FaceMapper; import com.ycwl.basic.mapper.FaceMapper;
@@ -290,7 +291,7 @@ public class FaceServiceImpl implements FaceService {
if (sampleListIds != null && !sampleListIds.isEmpty()) {// 匹配原片：照片 if (sampleListIds != null && !sampleListIds.isEmpty()) {// 匹配原片：照片
List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds); List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds);
List<MemberSourceEntity> memberSourceEntityList = sourceEntities.stream().map(sourceEntity -> { List<MemberSourceEntity> memberSourceEntityList = sourceEntities.stream().map(sourceEntity -> {
DeviceConfigEntity deviceConfig = deviceRepository.getDeviceConfig(sourceEntity.getDeviceId()); DeviceConfigManager deviceConfig = deviceRepository.getDeviceConfigManager(sourceEntity.getDeviceId());
MemberSourceEntity memberSourceEntity = new MemberSourceEntity(); MemberSourceEntity memberSourceEntity = new MemberSourceEntity();
memberSourceEntity.setScenicId(face.getScenicId()); memberSourceEntity.setScenicId(face.getScenicId());
memberSourceEntity.setFaceId(face.getId()); memberSourceEntity.setFaceId(face.getId());
@@ -300,11 +301,11 @@ public class FaceServiceImpl implements FaceService {
memberSourceEntity.setIsFree(0); memberSourceEntity.setIsFree(0);
if (deviceConfig != null) { if (deviceConfig != null) {
if (sourceEntity.getType() == 1) { if (sourceEntity.getType() == 1) {
if (Integer.valueOf(1).equals(deviceConfig.getVideoFree())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("video_free"))) {
memberSourceEntity.setIsFree(1); memberSourceEntity.setIsFree(1);
} }
} else if (sourceEntity.getType() == 2) { } else if (sourceEntity.getType() == 2) {
if (Integer.valueOf(1).equals(deviceConfig.getImageFree())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("image_free"))) {
memberSourceEntity.setIsFree(1); memberSourceEntity.setIsFree(1);
} }
} }

7
src/main/java/com/ycwl/basic/service/task/impl/TaskFaceServiceImpl.java
View File

@@ -1,6 +1,7 @@
package com.ycwl.basic.service.task.impl; package com.ycwl.basic.service.task.impl;
import cn.hutool.core.date.DateUtil; import cn.hutool.core.date.DateUtil;
import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
import com.ycwl.basic.utils.JacksonUtil; import com.ycwl.basic.utils.JacksonUtil;
import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest; import com.aliyuncs.facebody.model.v20191230.SearchFaceRequest;
import com.ycwl.basic.biz.OrderBiz; import com.ycwl.basic.biz.OrderBiz;
@@ -115,7 +116,7 @@ public class TaskFaceServiceImpl implements TaskFaceService {
if (sampleListIds != null && !sampleListIds.isEmpty()) {// 匹配原片：照片 if (sampleListIds != null && !sampleListIds.isEmpty()) {// 匹配原片：照片
List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds); List<SourceEntity> sourceEntities = sourceMapper.listBySampleIds(sampleListIds);
List<MemberSourceEntity> memberSourceEntityList = sourceEntities.stream().map(sourceEntity -> { List<MemberSourceEntity> memberSourceEntityList = sourceEntities.stream().map(sourceEntity -> {
DeviceConfigEntity deviceConfig = deviceRepository.getDeviceConfig(sourceEntity.getDeviceId()); DeviceConfigManager deviceConfig = deviceRepository.getDeviceConfigManager(sourceEntity.getDeviceId());
MemberSourceEntity memberSourceEntity = new MemberSourceEntity(); MemberSourceEntity memberSourceEntity = new MemberSourceEntity();
memberSourceEntity.setScenicId(scenicId); memberSourceEntity.setScenicId(scenicId);
memberSourceEntity.setFaceId(faceEntity.getId()); memberSourceEntity.setFaceId(faceEntity.getId());
@@ -125,11 +126,11 @@ public class TaskFaceServiceImpl implements TaskFaceService {
memberSourceEntity.setIsFree(0); memberSourceEntity.setIsFree(0);
if (deviceConfig != null) { if (deviceConfig != null) {
if (sourceEntity.getType() == 1) { if (sourceEntity.getType() == 1) {
if (Integer.valueOf(1).equals(deviceConfig.getVideoFree())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("video_free"))) {
memberSourceEntity.setIsFree(1); memberSourceEntity.setIsFree(1);
} }
} else if (sourceEntity.getType() == 2) { } else if (sourceEntity.getType() == 2) {
if (Integer.valueOf(1).equals(deviceConfig.getImageFree())) { if (Integer.valueOf(1).equals(deviceConfig.getInteger("image_free"))) {
memberSourceEntity.setIsFree(1); memberSourceEntity.setIsFree(1);
} }
} }

8
src/main/java/com/ycwl/basic/task/VideoPieceGetter.java
View File

@@ -7,6 +7,7 @@ import com.ycwl.basic.constant.StorageConstant;
import com.ycwl.basic.device.DeviceFactory; import com.ycwl.basic.device.DeviceFactory;
import com.ycwl.basic.device.entity.common.FileObject; import com.ycwl.basic.device.entity.common.FileObject;
import com.ycwl.basic.device.operator.IDeviceStorageOperator; import com.ycwl.basic.device.operator.IDeviceStorageOperator;
import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
import com.ycwl.basic.model.pc.face.entity.FaceEntity; import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity; import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity; import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
@@ -147,9 +148,10 @@ public class VideoPieceGetter {
List<DeviceEntity> allDeviceByScenicId = deviceRepository.getAllDeviceByScenicId(scenicId); List<DeviceEntity> allDeviceByScenicId = deviceRepository.getAllDeviceByScenicId(scenicId);
allDeviceByScenicId.forEach(device -> { allDeviceByScenicId.forEach(device -> {
Long deviceId = device.getId(); Long deviceId = device.getId();
DeviceConfigEntity deviceConfig = deviceRepository.getDeviceConfig(deviceId); DeviceConfigManager deviceConfig = deviceRepository.getDeviceConfigManager(deviceId);
if (deviceConfig != null && deviceConfig.getPairDevice() != null) { Long pairDevice = deviceConfig.getLong("pair_device");
pairDeviceMap.putIfAbsent(deviceId, deviceConfig.getPairDevice()); if (pairDevice != null) {
pairDeviceMap.putIfAbsent(deviceId, pairDevice);
} }
}); });
} }