|
|
|
@ -401,6 +401,9 @@ public class SysLocaleResourceController extends CoreBaseController {
|
|
|
|
|
@ApiOperation(value = "增量导入系统资源")
|
|
|
|
|
public ResultBean incrementImportSysLocaleResource(@RequestParam("file") MultipartFile file){
|
|
|
|
|
try {
|
|
|
|
|
// 重新加载资源
|
|
|
|
|
systemInitService.putAndLoadSysLocaleLanguage();
|
|
|
|
|
|
|
|
|
|
Long startTime = System.currentTimeMillis();
|
|
|
|
|
// 提取Excel数据
|
|
|
|
|
LOGGER.info("开始增量导入 {}",file.getOriginalFilename());
|
|
|
|
@ -446,8 +449,6 @@ public class SysLocaleResourceController extends CoreBaseController {
|
|
|
|
|
}.start();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// 重新加载资源
|
|
|
|
|
// systemInitService.putAndLoadSysLocaleLanguage();
|
|
|
|
|
// LOGGER.info("数据缓存更新完毕,总耗时:{}",System.currentTimeMillis()-startTime);
|
|
|
|
|
return ResultBean.success("数据导入中...").setCode(ResourceEnumUtil.MESSAGE.SUCCESS.getCode());
|
|
|
|
|
} catch (ImppBusiException busExcep) {
|
|
|
|
@ -487,7 +488,7 @@ public class SysLocaleResourceController extends CoreBaseController {
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private Long getResourceKey(String resKey, String languageCode) {
|
|
|
|
|
if (redisRes.checkKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + resKey, languageCode)) {
|
|
|
|
|
if (redisRes.checkKey(CommonConstWords.REDIS_PREFIX_CACHE_LANGUAGE + ":" + resKey, languageCode)) {
|
|
|
|
|
LOGGER.info("查询到已存在资源 {}:{}",resKey,languageCode);
|
|
|
|
|
SysLocaleResource sysLocaleResource =sysLocaleResourceService.getSysLocaleResourceByLanguageCodeAndResKey(
|
|
|
|
|
languageCode, resKey
|
|
|
|
|