You've already forked FrameTour-BE
refactor(basic): 移除景区缓存相关代码
- 删除了 ScenicRepository 中的缓存键常量 - 移除了 getScenicBasic 和 getScenic 方法中的缓存逻辑 - 删除了 clearCache 方法 - 移除了与缓存相关的工具方法
This commit is contained in:
@@ -41,23 +41,17 @@ public class ScenicRepository {
|
|||||||
@Autowired
|
@Autowired
|
||||||
private ScenicConfigIntegrationService scenicConfigIntegrationService;
|
private ScenicConfigIntegrationService scenicConfigIntegrationService;
|
||||||
|
|
||||||
public static final String SCENIC_CACHE_KEY = "scenic:%s";
|
|
||||||
public static final String SCENIC_BASIC_CACHE_KEY = "scenic:basic:%s";
|
|
||||||
public static final String SCENIC_FULL_CACHE_KEY = "scenic:f%s";
|
|
||||||
public static final String SCENIC_CONFIG_CACHE_KEY = "scenic:%s:config";
|
|
||||||
public static final String SCENIC_MP_CACHE_KEY = "scenic:%s:mp";
|
public static final String SCENIC_MP_CACHE_KEY = "scenic:%s:mp";
|
||||||
public static final String SCENIC_MP_NOTIFY_CACHE_KEY = "scenic:%s:mpNotify";
|
public static final String SCENIC_MP_NOTIFY_CACHE_KEY = "scenic:%s:mpNotify";
|
||||||
@Autowired
|
@Autowired
|
||||||
private MpNotifyConfigMapper mpNotifyConfigMapper;
|
private MpNotifyConfigMapper mpNotifyConfigMapper;
|
||||||
|
|
||||||
public ScenicV2DTO getScenicBasic(Long id) {
|
public ScenicV2DTO getScenicBasic(Long id) {
|
||||||
String key = String.format(SCENIC_BASIC_CACHE_KEY, id);
|
|
||||||
ScenicV2DTO scenicDTO = scenicIntegrationService.getScenic(id);
|
ScenicV2DTO scenicDTO = scenicIntegrationService.getScenic(id);
|
||||||
return scenicDTO;
|
return scenicDTO;
|
||||||
}
|
}
|
||||||
|
|
||||||
public ScenicEntity getScenic(Long id) {
|
public ScenicEntity getScenic(Long id) {
|
||||||
String key = String.format(SCENIC_CACHE_KEY, id);
|
|
||||||
ScenicV2WithConfigDTO scenicDTO = scenicIntegrationService.getScenicWithConfig(id);
|
ScenicV2WithConfigDTO scenicDTO = scenicIntegrationService.getScenicWithConfig(id);
|
||||||
ScenicEntity scenicEntity = convertToScenicEntity(scenicDTO);
|
ScenicEntity scenicEntity = convertToScenicEntity(scenicDTO);
|
||||||
return scenicEntity;
|
return scenicEntity;
|
||||||
@@ -226,27 +220,6 @@ public class ScenicRepository {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public void clearCache(Long scenicId) {
|
|
||||||
redisTemplate.delete(String.format(SCENIC_CACHE_KEY, scenicId));
|
|
||||||
redisTemplate.delete(String.format(SCENIC_BASIC_CACHE_KEY, scenicId));
|
|
||||||
redisTemplate.delete(String.format(SCENIC_FULL_CACHE_KEY, scenicId));
|
|
||||||
redisTemplate.delete(String.format(SCENIC_CONFIG_CACHE_KEY, scenicId));
|
|
||||||
redisTemplate.delete(String.format(SCENIC_MP_CACHE_KEY, scenicId));
|
|
||||||
redisTemplate.delete(String.format(SCENIC_MP_NOTIFY_CACHE_KEY, scenicId));
|
|
||||||
}
|
|
||||||
|
|
||||||
private ScenicEntity convertToScenicEntity(ScenicV2DTO dto) {
|
|
||||||
if (dto == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
ScenicEntity entity = new ScenicEntity();
|
|
||||||
entity.setId(Long.parseLong(dto.getId()));
|
|
||||||
entity.setName(dto.getName());
|
|
||||||
entity.setMpId(dto.getMpId());
|
|
||||||
entity.setStatus(dto.getStatus().toString());
|
|
||||||
return entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
private ScenicEntity convertToScenicEntity(ScenicV2WithConfigDTO dto) {
|
private ScenicEntity convertToScenicEntity(ScenicV2WithConfigDTO dto) {
|
||||||
if (dto == null) {
|
if (dto == null) {
|
||||||
return null;
|
return null;
|
||||||
@@ -272,61 +245,6 @@ public class ScenicRepository {
|
|||||||
return entity;
|
return entity;
|
||||||
}
|
}
|
||||||
|
|
||||||
private ScenicConfigEntity convertToScenicConfigEntity(ScenicV2WithConfigDTO dto, Long scenicId) {
|
|
||||||
if (dto == null || dto.getConfig() == null) {
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
ScenicConfigEntity entity = new ScenicConfigEntity();
|
|
||||||
entity.setScenicId(scenicId);
|
|
||||||
|
|
||||||
java.util.Map<String, Object> config = dto.getConfig();
|
|
||||||
|
|
||||||
entity.setBookRoutine(ConfigValueUtil.getIntValue(config, "bookRoutine"));
|
|
||||||
entity.setForceFinishTime(ConfigValueUtil.getIntValue(config, "forceFinishTime"));
|
|
||||||
entity.setTourTime(ConfigValueUtil.getIntValue(config, "tourTime"));
|
|
||||||
entity.setSampleStoreDay(ConfigValueUtil.getIntValue(config, "sampleStoreDay"));
|
|
||||||
entity.setFaceStoreDay(ConfigValueUtil.getIntValue(config, "faceStoreDay"));
|
|
||||||
entity.setVideoStoreDay(ConfigValueUtil.getIntValue(config, "videoStoreDay"));
|
|
||||||
entity.setAllFree(ConfigValueUtil.getBooleanValue(config, "allFree"));
|
|
||||||
entity.setDisableSourceVideo(ConfigValueUtil.getBooleanValue(config, "disableSourceVideo"));
|
|
||||||
entity.setDisableSourceImage(ConfigValueUtil.getBooleanValue(config, "disableSourceImage"));
|
|
||||||
entity.setTemplateNewVideoType(ConfigValueUtil.getIntValue(config, "templateNewVideoType"));
|
|
||||||
entity.setAntiScreenRecordType(ConfigValueUtil.getIntValue(config, "antiScreenRecordType"));
|
|
||||||
entity.setVideoSourceStoreDay(ConfigValueUtil.getIntValue(config, "videoSourceStoreDay"));
|
|
||||||
entity.setImageSourceStoreDay(ConfigValueUtil.getIntValue(config, "imageSourceStoreDay"));
|
|
||||||
entity.setUserSourceExpireDay(ConfigValueUtil.getIntValue(config, "userSourceExpireDay"));
|
|
||||||
entity.setFaceDetectHelperThreshold(ConfigValueUtil.getIntValue(config, "faceDetectHelperThreshold"));
|
|
||||||
entity.setPhotoFreeNum(ConfigValueUtil.getIntValue(config, "photoFreeNum"));
|
|
||||||
entity.setVideoFreeNum(ConfigValueUtil.getIntValue(config, "videoFreeNum"));
|
|
||||||
entity.setVoucherEnable(ConfigValueUtil.getBooleanValue(config, "voucherEnable"));
|
|
||||||
|
|
||||||
entity.setFaceScoreThreshold(ConfigValueUtil.getFloatValue(config, "faceScoreThreshold"));
|
|
||||||
entity.setBrokerDirectRate(ConfigValueUtil.getBigDecimalValue(config, "brokerDirectRate"));
|
|
||||||
|
|
||||||
entity.setWatermarkType(ConfigValueUtil.getStringValue(config, "watermarkType"));
|
|
||||||
entity.setWatermarkScenicText(ConfigValueUtil.getStringValue(config, "watermarkScenicText"));
|
|
||||||
entity.setWatermarkDtFormat(ConfigValueUtil.getStringValue(config, "watermarkDtFormat"));
|
|
||||||
entity.setImageSourcePackHint(ConfigValueUtil.getStringValue(config, "imageSourcePackHint"));
|
|
||||||
entity.setVideoSourcePackHint(ConfigValueUtil.getStringValue(config, "videoSourcePackHint"));
|
|
||||||
entity.setExtraNotificationTime(ConfigValueUtil.getStringValue(config, "extraNotificationTime"));
|
|
||||||
|
|
||||||
entity.setStoreType(ConfigValueUtil.getEnumValue(config, "storeType", StorageType.class));
|
|
||||||
entity.setStoreConfigJson(ConfigValueUtil.getStringValue(config, "storeConfigJson"));
|
|
||||||
entity.setTmpStoreType(ConfigValueUtil.getEnumValue(config, "tmpStoreType", StorageType.class));
|
|
||||||
entity.setTmpStoreConfigJson(ConfigValueUtil.getStringValue(config, "tmpStoreConfigJson"));
|
|
||||||
entity.setLocalStoreType(ConfigValueUtil.getEnumValue(config, "localStoreType", StorageType.class));
|
|
||||||
entity.setLocalStoreConfigJson(ConfigValueUtil.getStringValue(config, "localStoreConfigJson"));
|
|
||||||
|
|
||||||
entity.setFaceType(ConfigValueUtil.getEnumValue(config, "faceType", FaceBodyAdapterType.class));
|
|
||||||
entity.setFaceConfigJson(ConfigValueUtil.getStringValue(config, "faceConfigJson"));
|
|
||||||
|
|
||||||
entity.setPayType(ConfigValueUtil.getEnumValue(config, "payType", PayAdapterType.class));
|
|
||||||
entity.setPayConfigJson(ConfigValueUtil.getStringValue(config, "payConfigJson"));
|
|
||||||
|
|
||||||
return entity;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 获取景区配置管理器
|
* 获取景区配置管理器
|
||||||
*
|
*
|
||||||
@@ -342,24 +260,6 @@ public class ScenicRepository {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* 获取景区配置管理器，带缓存支持
|
|
||||||
*
|
|
||||||
* @param scenicId 景区ID
|
|
||||||
* @return ScenicConfigManager实例，如果获取失败返回null
|
|
||||||
*/
|
|
||||||
public ScenicConfigManager getScenicConfigManagerWithCache(Long scenicId) {
|
|
||||||
String key = String.format(SCENIC_CONFIG_CACHE_KEY + ":manager", scenicId);
|
|
||||||
|
|
||||||
List<com.ycwl.basic.integration.scenic.dto.config.ScenicConfigV2DTO> configList =
|
|
||||||
scenicConfigIntegrationService.listConfigs(scenicId);
|
|
||||||
if (configList != null) {
|
|
||||||
ScenicConfigManager manager = new ScenicConfigManager(configList);
|
|
||||||
return manager;
|
|
||||||
}
|
|
||||||
return null;
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* 批量获取景区名称
|
* 批量获取景区名称
|
||||||
* @param scenicIds 景区ID列表
|
* @param scenicIds 景区ID列表
|
||||||
|
|||||||
Reference in New Issue
Block a user