Forráskód Böngészése

场景下载语言并更 需要重新下载

dengsixing 1 éve
szülő
commit
d94c9f535a

+ 2 - 2
src/main/java/com/fdkankan/scene/controller/SceneDownloadLogController.java

@@ -36,8 +36,8 @@ public class SceneDownloadLogController {
         return sceneDownloadLogService.downOfflineScene(num, lang);
     }
     @GetMapping("/downOfflineSceneCheck")
-    public ResultData downOfflineSceneCheck(@RequestParam("sceneCode")String num){
-        return sceneDownloadLogService.downOfflineSceneCheck(num);
+    public ResultData downOfflineSceneCheck(@RequestParam("sceneCode")String num, @RequestParam(name = "lang", defaultValue = "zh")String lang){
+        return sceneDownloadLogService.downOfflineSceneCheck(num, lang);
     }
     @GetMapping("/downloadProcess")
     public ResultData downloadProcess (@RequestParam("sceneCode")String num){

+ 8 - 2
src/main/java/com/fdkankan/scene/entity/SceneDownloadLog.java

@@ -12,10 +12,10 @@ import lombok.Setter;
 
 /**
  * <p>
- * 
+ *
  * </p>
  *
- * @author 
+ * @author
  * @since 2023-03-06
  */
 @Getter
@@ -64,6 +64,12 @@ public class SceneDownloadLog implements Serializable {
     @TableField("sys_version")
     private String sysVersion;
 
+    /**
+     * 语言
+     */
+    @TableField("lang")
+    private String lang;
+
     @TableField("rec_status")
     @TableLogic(value = "A", delval = "I")
     private String recStatus;

+ 1 - 1
src/main/java/com/fdkankan/scene/service/ISceneDownloadLogService.java

@@ -21,6 +21,6 @@ public interface ISceneDownloadLogService extends IService<SceneDownloadLog> {
 
     ResultData downloadUpDateStatus(String num);
 
-    ResultData downOfflineSceneCheck(String num);
+    ResultData downOfflineSceneCheck(String num, String lang);
 
 }

+ 9 - 7
src/main/java/com/fdkankan/scene/service/impl/SceneDownloadLogServiceImpl.java

@@ -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);