|
@@ -69,6 +69,11 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
|
@Autowired
|
|
|
private FdkkLaserConfig fdkkLaserConfig;
|
|
|
|
|
|
+ public static void main(String[] args) {
|
|
|
+ String lang = null;
|
|
|
+ System.out.println("123123".equals(lang));
|
|
|
+ }
|
|
|
+
|
|
|
|
|
|
@Override
|
|
|
public ResultData downOfflineScene(String num, String lang) {
|
|
@@ -102,11 +107,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
|
result.put("status", 0);
|
|
|
return ResultData.ok(result);
|
|
|
}
|
|
|
- if(sceneDownloadLog.getStatus() == 2){
|
|
|
- result.put("status", 3);
|
|
|
- download = true;
|
|
|
- }
|
|
|
- if(version == sceneDownloadLog.getSceneVersion()){
|
|
|
+ if(version == sceneDownloadLog.getSceneVersion() && lang.equals(sceneDownloadLog.getLang())){
|
|
|
String url=this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
|
|
|
result.put("status", 2);
|
|
|
result.put("url",url);
|
|
@@ -132,6 +133,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
|
sceneDownloadLog.setSceneNum(num);
|
|
|
sceneDownloadLog.setSceneVersion(version);
|
|
|
sceneDownloadLog.setSysVersion("v4");
|
|
|
+ sceneDownloadLog.setLang(lang);
|
|
|
this.save(sceneDownloadLog);
|
|
|
|
|
|
Map<String,String> params = new HashMap<>(2);
|
|
@@ -176,7 +178,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
|
}
|
|
|
|
|
|
@Override
|
|
|
- public ResultData downOfflineSceneCheck(String num) {
|
|
|
+ public ResultData downOfflineSceneCheck(String num, String lang) {
|
|
|
|
|
|
ScenePlus scenePlus = scenePlusService.getScenePlusByNum(num);
|
|
|
if(Objects.isNull(scenePlus)){
|
|
@@ -197,7 +199,7 @@ public class SceneDownloadLogServiceImpl extends ServiceImpl<ISceneDownloadLogMa
|
|
|
SceneJsonBean sceneJsonBean = JSON.parseObject(sceneJson, SceneJsonBean.class);
|
|
|
int version = sceneJsonBean.getVersion();
|
|
|
|
|
|
- if(Objects.nonNull(sceneDownloadLog) && sceneDownloadLog.getStatus() == 1 && version == sceneDownloadLog.getSceneVersion()){
|
|
|
+ if(Objects.nonNull(sceneDownloadLog) && sceneDownloadLog.getStatus() == 1 && version == sceneDownloadLog.getSceneVersion() && lang.equals(sceneDownloadLog.getLang())){
|
|
|
String url=this.publicUrl+":"+fdkkLaserConfig.getLaserPort()+"/" + mapping +sceneDownloadLog.getDownloadUrl();
|
|
|
result.put("status", 2);
|
|
|
result.put("url",url);
|