|
|
@@ -31,7 +31,6 @@ import org.apache.commons.lang3.StringUtils;
|
|
|
import org.joda.time.DateTime;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.beans.factory.annotation.Value;
|
|
|
-import org.springframework.data.redis.core.RedisTemplate;
|
|
|
import org.springframework.scheduling.annotation.Async;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
import org.springframework.util.ObjectUtils;
|
|
|
@@ -111,8 +110,6 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
MqSendMessage mqSendMessage;
|
|
|
@Autowired
|
|
|
RedisUtil redisUtil;
|
|
|
- @Autowired
|
|
|
- RedisTemplate redisTemplate;
|
|
|
|
|
|
@Override
|
|
|
public SceneFileBuild findByFileId(String fileId) {
|
|
|
@@ -274,7 +271,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
ResponseSceneFile responseSceneFile = new ResponseSceneFile();
|
|
|
responseSceneFile.setFileId(fileId);
|
|
|
//可以重复上传,文件id保存50年(因为该redis工具无法设置永久保存)
|
|
|
- redisTemplate.opsForValue().set(fileId, folderName, 1537920000);
|
|
|
+ // TODO: 2022/1/5
|
|
|
+ redisUtil.set(fileId, folderName, 1537920000);
|
|
|
return responseSceneFile;
|
|
|
}
|
|
|
|
|
|
@@ -286,7 +284,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
ResponseSceneFile responseSceneFile = new ResponseSceneFile();
|
|
|
responseSceneFile.setFileId(fileId);
|
|
|
//可以重复上传,文件id保存50年(因为该redis工具无法设置永久保存)
|
|
|
- redisTemplate.opsForValue().set(fileId, folderName, 1537920000);
|
|
|
+ redisUtil.set(fileId, folderName, 1537920000);
|
|
|
return responseSceneFile;
|
|
|
}
|
|
|
}
|
|
|
@@ -308,7 +306,7 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
ResponseSceneFile responseSceneFile = new ResponseSceneFile();
|
|
|
responseSceneFile.setFileId(String.valueOf(fileId));
|
|
|
//可以重复上传,文件id保存50年(因为该redis工具无法设置永久保存)
|
|
|
- redisTemplate.opsForValue().set(String.valueOf(fileId), folderName, 1537920000);
|
|
|
+ redisUtil.set(String.valueOf(fileId), folderName, 1537920000);
|
|
|
return responseSceneFile;
|
|
|
}
|
|
|
|
|
|
@@ -390,7 +388,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
// 获取文件的后缀名
|
|
|
String suffixName = fileName.substring(fileName.lastIndexOf("."));
|
|
|
log.info("上传的后缀名为:" + suffixName);
|
|
|
- String folderName = (String) redisTemplate.opsForValue().get(fileId);
|
|
|
+ Object folderNameObject = redisUtil.get(fileId);
|
|
|
+ String folderName = folderNameObject == null ? null : (String)folderNameObject;
|
|
|
if(StringUtils.isEmpty(folderName)){
|
|
|
SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
|
|
|
if(scenePro != null){
|
|
|
@@ -505,7 +504,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
String mac = strArr[0];
|
|
|
String fileId = strArr[1];
|
|
|
- String folderName = (String) redisTemplate.opsForValue().get(fileId);
|
|
|
+ Object folderNameObject = redisUtil.get(fileId);
|
|
|
+ String folderName = folderNameObject == null ? null : (String)folderNameObject;
|
|
|
if(StringUtils.isEmpty(folderName)){
|
|
|
SceneProPO scenePro = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
|
|
|
if(scenePro != null){
|
|
|
@@ -550,7 +550,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
String mac = strArr[0];
|
|
|
String fileId = strArr[1];
|
|
|
- String folderName = (String)redisTemplate.opsForValue().get(fileId);
|
|
|
+ Object folderNameObject = redisUtil.get(fileId);
|
|
|
+ String folderName = folderNameObject == null ? null : (String)folderNameObject;
|
|
|
if(StringUtils.isEmpty(folderName)){
|
|
|
SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
|
|
|
if(sceneProPO != null){
|
|
|
@@ -604,7 +605,8 @@ public class SceneFileBuildServiceImpl extends ServiceImpl<ISceneFileBuildMapper
|
|
|
}
|
|
|
String mac = strArr[0];
|
|
|
String fileId = strArr[1];
|
|
|
- String folderName = (String)redisTemplate.opsForValue().get(fileId);
|
|
|
+ Object folderNameObject = redisUtil.get(fileId);
|
|
|
+ String folderName = folderNameObject == null ? null : (String)folderNameObject;
|
|
|
if(StringUtils.isEmpty(folderName)){
|
|
|
SceneProPO sceneProPO = sceneProService.getSceneStatusByUnicode("/" + fileId + "/", "A");
|
|
|
if(sceneProPO != null){
|