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

refactor(scenic): 替换ScenicConfigEntity为ScenicConfigManager

Browse Source 
- 将所有使用ScenicConfigEntity的地方替换为ScenicConfigManager
- 更新获取景区配置的方法调用
- 修改属性访问方式为通过manager的getter方法
- 移除已废弃的ScenicConfigEntity类及相关方法
- 统一配置读取接口，提高代码一致性与可维护性
This commit is contained in:
Jerry Yan
2025-12-19 19:02:37 +08:00
parent f2ba5ed65b
commit 3f4d3cb7ac
18 changed files with 114 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/ycwl/basic/task/DownloadNotificationTasker.java
View File

@@ -11,7 +11,7 @@ import com.ycwl.basic.model.pc.coupon.req.CouponQueryReq;
import com.ycwl.basic.model.pc.coupon.resp.CouponRespVO;
import com.ycwl.basic.model.pc.member.resp.MemberRespVO;
import com.ycwl.basic.model.pc.mp.MpConfigEntity;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
import com.ycwl.basic.model.pc.scenic.entity.ScenicEntity;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.repository.ScenicRepository;
@@ -146,8 +146,8 @@ public class DownloadNotificationTasker {
sentMemberIds.add(item.getMemberId());
MemberRespVO member = memberMapper.getById(item.getMemberId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(item.getScenicId());
Integer videoStoreDay = scenicConfig.getVideoStoreDay();
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(item.getScenicId());
Integer videoStoreDay = scenicConfig.getInteger("video_store_day");
if (videoStoreDay == null) {
videoStoreDay = 3;
}

12
src/main/java/com/ycwl/basic/task/DynamicTaskGenerator.java
View File

@@ -10,7 +10,7 @@ import com.ycwl.basic.mapper.FaceSampleMapper;
import com.ycwl.basic.mapper.TemplateMapper;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
import com.ycwl.basic.model.task.resp.SearchFaceRespVo;
import com.ycwl.basic.repository.FaceRepository;
import com.ycwl.basic.repository.ScenicRepository;
@@ -100,20 +100,20 @@ public class DynamicTaskGenerator {
log.debug("人脸样本ID{}人脸质量为空", task.getFaceSampleId());
return;
}
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(faceSample.getScenicId());
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(faceSample.getScenicId());
if (scenicConfig == null) {
log.debug("当前景区{}，无配置", faceSample.getScenicId());
return;
}
if (!Integer.valueOf(5).equals(scenicConfig.getBookRoutine())) {
if (!Integer.valueOf(5).equals(scenicConfig.getInteger("book_routine"))) {
log.debug("当前景区{}未启用预约流程，跳过", faceSample.getScenicId());
return;
}
log.info("开始执行任务：{}", task);
IFaceBodyAdapter faceBodyAdapter;
if (scenicConfig.getFaceType() != null) {
faceBodyAdapter = FaceBodyFactory.getAdapter(scenicConfig.getFaceType());
faceBodyAdapter.loadConfig(JacksonUtil.parseObject(scenicConfig.getFaceConfigJson(), Map.class));
if (scenicConfig.getInteger("face_type") != null) {
faceBodyAdapter = FaceBodyFactory.getAdapter(String.valueOf(scenicConfig.getInteger("face_type")));
faceBodyAdapter.loadConfig(JacksonUtil.parseObject(scenicConfig.getString("face_config_json"), Map.class));
} else {
faceBodyAdapter = FaceBodyFactory.use();
}

36
src/main/java/com/ycwl/basic/task/FaceCleaner.java
View File

@@ -14,7 +14,7 @@ import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.faceSample.req.FaceSampleReqQuery;
import com.ycwl.basic.model.pc.faceSample.resp.FaceSampleRespVO;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.source.req.SourceReqQuery;
import com.ycwl.basic.model.pc.source.resp.SourceRespVO;
@@ -67,8 +67,8 @@ public class FaceCleaner {
Long scenicId = Long.parseLong(scenic.getId());
log.info("当前景区{}，开始删除人脸样本", scenicId);
IFaceBodyAdapter adapter = scenicService.getScenicFaceBodyAdapter(scenicId);
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
Integer sampleStoreDay = scenicConfig.getSampleStoreDay();
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
Integer sampleStoreDay = scenicConfig.getInteger("sample_store_day");
if (sampleStoreDay == null) {
log.info("当前景区{}，人脸样本保存天数未设置，默认7天", scenic.getId());
sampleStoreDay = 7;
@@ -99,9 +99,9 @@ public class FaceCleaner {
scenicList.parallelStream().forEach(scenic -> {
Long scenicId = Long.parseLong(scenic.getId());
log.info("当前景区{}，开始删除用户人脸", scenic.getId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
IFaceBodyAdapter adapter = scenicService.getScenicFaceBodyAdapter(scenicId);
Integer faceStoreDay = scenicConfig.getFaceStoreDay();
Integer faceStoreDay = scenicConfig.getInteger("face_store_day");
if (faceStoreDay == null) {
log.info("当前景区{}，人脸样本保存天数未设置，默认3天", scenic.getName());
faceStoreDay = 3;
@@ -135,16 +135,16 @@ public class FaceCleaner {
List<ScenicV2DTO> scenicList = scenicRepository.list(query);
scenicList.parallelStream().forEach(scenic -> {
Long scenicId = Long.valueOf(scenic.getId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
if (scenicConfig == null) {
log.info("当前景区{}，无配置信息", scenic.getName());
return;
}
if (scenicConfig.getUserSourceExpireDay() == null) {
if (scenicConfig.getInteger("user_source_expire_day") == null) {
log.info("当前景区{}，人脸样本过期天数未设置", scenic.getName());
return;
}
int expireDay = scenicConfig.getUserSourceExpireDay();
int expireDay = scenicConfig.getInteger("user_source_expire_day");
Date endDate = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -expireDay);
int deleteCount = sourceMapper.deleteNotBuyRelations(scenicId, endDate);
log.info("当前景区{}，删除关联素材{}个", scenic.getName(), deleteCount);
@@ -158,16 +158,16 @@ public class FaceCleaner {
List<ScenicV2DTO> scenicList = scenicRepository.list(query);
scenicList.parallelStream().forEach(scenic -> {
Long scenicId = Long.valueOf(scenic.getId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
if (scenicConfig == null) {
log.info("当前景区{}，无配置信息", scenic.getName());
return;
}
if (scenicConfig.getVideoStoreDay() == null) {
if (scenicConfig.getInteger("video_store_day") == null) {
log.info("当前景区{}，VLOG过期天数未设置", scenic.getName());
return;
}
int expireDay = scenicConfig.getVideoStoreDay();
int expireDay = scenicConfig.getInteger("video_store_day");
Date endDate = DateUtil.offsetDay(DateUtil.beginOfDay(new Date()), -expireDay);
int deleteCount = videoMapper.deleteNotBuyRelations(scenicId, endDate);
int deleteVideoCount = videoMapper.deleteUselessVideo();
@@ -182,27 +182,27 @@ public class FaceCleaner {
List<ScenicV2DTO> scenicList = scenicRepository.list(query);
scenicList.parallelStream().forEach(scenic -> {
Long scenicId = Long.valueOf(scenic.getId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
if (scenicConfig == null) {
log.info("当前景区{}，无配置信息", scenic.getName());
return;
}
int imageSourceExpireDay = 7;
int videoSourceExpireDay = 7;
if (scenicConfig.getImageSourceStoreDay() != null) {
imageSourceExpireDay = scenicConfig.getImageSourceStoreDay();
if (scenicConfig.getInteger("image_source_store_day") != null) {
imageSourceExpireDay = scenicConfig.getInteger("image_source_store_day");
} else {
log.info("当前景区{}，原始素材保存天数未设置，默认7天", scenic.getName());
}
if (scenicConfig.getVideoSourceStoreDay() != null) {
videoSourceExpireDay = scenicConfig.getVideoSourceStoreDay();
if (scenicConfig.getInteger("video_source_store_day") != null) {
videoSourceExpireDay = scenicConfig.getInteger("video_source_store_day");
} else {
log.info("当前景区{}，原始素材保存天数未设置，默认7天", scenic.getName());
}
if (Boolean.TRUE.equals(scenicConfig.getDisableSourceVideo())) {
if (Boolean.TRUE.equals(scenicConfig.getBoolean("disable_source_video"))) {
return;
}
if (Boolean.TRUE.equals(scenicConfig.getDisableSourceImage())) {
if (Boolean.TRUE.equals(scenicConfig.getBoolean("disable_source_image"))) {
return;
}
log.info("当前景区{}，开始删除原始素材", scenic.getName());

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

@@ -11,7 +11,7 @@ import com.ycwl.basic.enums.FaceCutStatus;
import com.ycwl.basic.integration.common.manager.DeviceConfigManager;
import com.ycwl.basic.model.pc.face.entity.FaceEntity;
import com.ycwl.basic.model.pc.faceSample.entity.FaceSampleEntity;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
import com.ycwl.basic.repository.DeviceRepository;
import com.ycwl.basic.mapper.FaceSampleMapper;
import com.ycwl.basic.mapper.SourceMapper;
@@ -290,17 +290,17 @@ public class VideoPieceGetter {
if (task.getFaceId() != null) {
FaceEntity face = faceRepository.getFace(task.getFaceId());
if (face != null) {
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(face.getScenicId());
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(face.getScenicId());
if (scenicConfig != null) {
// 免费送
List<MemberSourceEntity> sourceEntities = memberRelationRepository.listSourceByFaceRelation(face.getId(), 1);
if (sourceEntities.stream().noneMatch(item -> Integer.valueOf(1).equals(item.getIsFree()))) {
List<Long> freeSourceRelationIds = new ArrayList<>();
if (scenicConfig.getVideoFreeNum() != null && scenicConfig.getVideoFreeNum() > 0) {
if (scenicConfig.getVideoFreeNum() > sourceEntities.size()) {
if (scenicConfig.getInteger("video_free_num") != null && scenicConfig.getInteger("video_free_num") > 0) {
if (scenicConfig.getInteger("video_free_num") > sourceEntities.size()) {
freeSourceRelationIds.addAll(sourceEntities.stream().map(MemberSourceEntity::getId).toList());
} else {
freeSourceRelationIds.addAll(sourceEntities.stream().limit(scenicConfig.getVideoFreeNum()).map(MemberSourceEntity::getId).toList());
freeSourceRelationIds.addAll(sourceEntities.stream().limit(scenicConfig.getInteger("video_free_num")).map(MemberSourceEntity::getId).toList());
}
}
if (!freeSourceRelationIds.isEmpty()) {

10
src/main/java/com/ycwl/basic/task/VideoTaskGenerator.java
View File

@@ -8,7 +8,7 @@ import com.ycwl.basic.mapper.TemplateMapper;
import com.ycwl.basic.model.mobile.scenic.content.ContentPageVO;
import com.ycwl.basic.model.pc.face.req.FaceReqQuery;
import com.ycwl.basic.model.pc.face.resp.FaceRespVO;
import com.ycwl.basic.model.pc.scenic.entity.ScenicConfigEntity;
import com.ycwl.basic.integration.common.manager.ScenicConfigManager;
import com.ycwl.basic.model.pc.scenic.req.ScenicReqQuery;
import com.ycwl.basic.model.pc.template.resp.TemplateRespVO;
import com.ycwl.basic.repository.ScenicRepository;
@@ -61,13 +61,13 @@ public class VideoTaskGenerator {
calendar.clear();
scenicList.parallelStream().forEach(scenic -> {
Long scenicId = Long.valueOf(scenic.getId());
ScenicConfigEntity scenicConfig = scenicRepository.getScenicConfig(scenicId);
ScenicConfigManager scenicConfig = scenicRepository.getScenicConfigManager(scenicId);
if (scenicConfig == null) {
log.info("当前景区{}，无配置信息", scenic.getName());
return;
}
if (Integer.valueOf(1).equals(scenicConfig.getBookRoutine()) || Integer.valueOf(3).equals(scenicConfig.getBookRoutine())) {
Integer hour = scenicConfig.getForceFinishTime();
if (Integer.valueOf(1).equals(scenicConfig.getInteger("book_routine")) || Integer.valueOf(3).equals(scenicConfig.getInteger("book_routine"))) {
Integer hour = scenicConfig.getInteger("force_finish_time");
if (hour != currentHour) {
return;
}
@@ -83,7 +83,7 @@ public class VideoTaskGenerator {
List<FaceRespVO> list = faceMapper.list(faceReqQuery);
list.forEach(face -> {
faceService.matchFaceId(face.getId(), false, null);
if (Integer.valueOf(3).equals(scenicConfig.getBookRoutine())) {
if (Integer.valueOf(3).equals(scenicConfig.getInteger("book_routine"))) {
// 全部生成
templateList.forEach(content -> {
Long templateId = content.getId();