深时下载添加语言

src/main/java/com/fdkankan/manage_jp/controller/BaseController.java

@@ -62,6 +62,9 @@ public class BaseController {
     protected String getToken(){
         return request.getHeader("token");
     }
+    protected String getLang(){
+        return StringUtils.isBlank(request.getHeader("lang") ) ? "zh" : request.getHeader("lang");
+    }
     protected User getUser(){
         String username = JwtUtil.getUsername(getToken());
         if(StringUtils.isBlank(username)){

src/main/java/com/fdkankan/manage_jp/controller/UserSceneController.java

@@ -50,7 +50,7 @@ public class UserSceneController extends BaseController{
     @GetMapping("/checkDownload")
     public Result checkDownLoad(@RequestParam(required = false) String num,
                                     @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.checkDownLoad(num,isObj));
+        return Result.success(downService.checkDownLoad(num,isObj,getLang()));
     }
 
     /**
@@ -60,7 +60,7 @@ public class UserSceneController extends BaseController{
     @GetMapping("/downloadScene")
     public Result downScene(@RequestParam(required = false) String num,
                                 @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.down(num,isObj));
+        return Result.success(downService.down(num,isObj,getLang()));
     }
 
     /**
@@ -70,7 +70,7 @@ public class UserSceneController extends BaseController{
     @GetMapping("/downloadProcess")
     public Result downloadProcess(@RequestParam(required = false) String num,
                                       @RequestParam(required = false,defaultValue = "0") Integer isObj){
-        return Result.success(downService.downloadProcess(num,isObj));
+        return Result.success(downService.downloadProcess(num,isObj,getLang()));
     }
 
     @PostMapping("/delete")

src/main/java/com/fdkankan/manage_jp/httpClient/param/SSDownSceneParam.java

@@ -5,4 +5,5 @@ import lombok.Data;
 @Data
 public class SSDownSceneParam {
     private String sceneCode;
+    private String lang;
 }

src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -56,11 +56,12 @@ public class LaserService {
     ITmColdStorageService tmColdStorageService;
 
 
-    public SSDownSceneVo downOfflineSceneStatus(String num) {
+    public SSDownSceneVo downOfflineSceneStatus(String num,String lang) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();
             param.setSceneCode(num);
+            param.setLang(lang);
             Result responseEntity = laserClient.downOfflineSceneStatus(param);
             if( responseEntity.getCode() != HttpStatus.OK.value()){
                 log.error("downOfflineSceneStatus-根据场景码获取激光转台下载状态失败:{}",responseEntity);
@@ -75,11 +76,12 @@ public class LaserService {
         return null ;
     }
 
-    public SSDownSceneVo downOfflineScene(String num) {
+    public SSDownSceneVo downOfflineScene(String num,String lang) {
         try {
             SSDownSceneVo vo ;
             SSDownSceneParam param = new SSDownSceneParam();
             param.setSceneCode(num);
+            param.setLang(lang);
             Result responseEntity = laserClient.downOfflineScene(param);
             if( responseEntity.getCode() != HttpStatus.OK.value()){
                 log.error("downOfflineScene-根据场景码获取激光转台下载失败:{}",responseEntity);

src/main/java/com/fdkankan/manage_jp/service/IDownService.java

@@ -5,9 +5,9 @@ import com.fdkankan.manage_jp.vo.response.DownloadProcessVo;
 
 public interface IDownService {
 
-    DownVo checkDownLoad(String sceneNum, Integer isObj);
+    DownVo checkDownLoad(String sceneNum, Integer isObj,String lang);
 
-    DownVo down(String sceneNum,Integer isObj);
+    DownVo down(String sceneNum,Integer isObj,String lang);
 
-    DownloadProcessVo downloadProcess(String num, Integer isObj);
+    DownloadProcessVo downloadProcess(String num, Integer isObj,String lang);
 }

src/main/java/com/fdkankan/manage_jp/service/impl/DownService.java

@@ -43,7 +43,7 @@ public class DownService implements IDownService {
 
 
     @Override
-    public DownVo checkDownLoad(String sceneNum, Integer isObj) {
+    public DownVo checkDownLoad(String sceneNum, Integer isObj,String lang) {
         if(StringUtils.isEmpty(sceneNum)){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
@@ -55,7 +55,7 @@ public class DownService implements IDownService {
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : plus.getSceneSource();
         log.info("checkDownLoad--sceneType:{},isObj:{}",sceneType,isObj);
         if((sceneType == 4 || sceneType == 5 ) && isObj !=1){ //深时场景
-            return SSCheckDownload(sceneNum);
+            return SSCheckDownload(sceneNum,lang);
         }
         SceneDownloadLog sceneDownloadLog;
         int isUp = 0;
@@ -110,7 +110,7 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public DownVo down(String sceneNum,Integer isObj) {
+    public DownVo down(String sceneNum,Integer isObj,String lang) {
         if(StringUtils.isEmpty(sceneNum) ){
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
@@ -124,7 +124,7 @@ public class DownService implements IDownService {
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
         log.info("down--sceneType:{},isObj:{}",sceneType,isObj);
         if((sceneType == 4 || sceneType == 5 )&& isObj !=1){ //深时场景
-            return SSDownload(sceneNum,userId);
+            return SSDownload(sceneNum,userId,lang);
         }
 
         DownVo downVo = new DownVo();
@@ -153,7 +153,7 @@ public class DownService implements IDownService {
     }
 
     @Override
-    public DownloadProcessVo downloadProcess(String sceneNum, Integer isObj) {
+    public DownloadProcessVo downloadProcess(String sceneNum, Integer isObj,String lang) {
         if (StringUtils.isEmpty(sceneNum)) {
             throw new BusinessException(ResultCode.PARAM_ERROR);
         }
@@ -165,7 +165,7 @@ public class DownService implements IDownService {
         Integer sceneType = scenePro !=null ? scenePro.getSceneSource() : scenePlus.getSceneSource();
         log.info("downloadProcess--sceneType:{},isObj:{}",sceneType,isObj);
         if((sceneType == 4 || sceneType == 5 ) && isObj !=1){ //深时场景
-            return SSDownloadProcess(sceneNum);
+            return SSDownloadProcess(sceneNum,lang);
         }
         String redisKey = RedisKey.PREFIX_DOWNLOAD_PROGRESS;
         if(scenePro == null){
@@ -205,9 +205,9 @@ public class DownService implements IDownService {
     /**
      * status ：离线包状态是否需要重新生成  0 未生成：1 不需要  2需要   3 生成中
      */
-    private DownVo SSCheckDownload(String sceneNum) {
+    private DownVo SSCheckDownload(String sceneNum,String lang) {
         DownVo downVo = new DownVo();
-        SSDownSceneVo vo = laserService.downOfflineSceneStatus(sceneNum);
+        SSDownSceneVo vo = laserService.downOfflineSceneStatus(sceneNum,lang);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }
@@ -228,11 +228,11 @@ public class DownService implements IDownService {
     /**
      * downloadStatus -1下载失败  1下载成功
      */
-    private DownVo SSDownload(String sceneNum,Long userId) {
+    private DownVo SSDownload(String sceneNum,Long userId,String lang) {
         DownVo downVo = new DownVo();
 
         //status ：0:正在生成 1，初次生成  2，已经生成直接下载 3，重新生成
-        SSDownSceneVo vo = laserService.downOfflineScene(sceneNum);
+        SSDownSceneVo vo = laserService.downOfflineScene(sceneNum,lang);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }
@@ -250,9 +250,9 @@ public class DownService implements IDownService {
 
     public static HashMap<String,Integer> ssNumProcessNumMap = new HashMap<>();
 
-    private DownloadProcessVo SSDownloadProcess(String sceneNum) {
+    private DownloadProcessVo SSDownloadProcess(String sceneNum,String lang) {
         DownloadProcessVo downVo = new DownloadProcessVo();
-        SSDownSceneVo vo = laserService.downOfflineSceneStatus(sceneNum);
+        SSDownSceneVo vo = laserService.downOfflineSceneStatus(sceneNum,lang);
         if(vo == null){
             throw new BusinessException(ResultCode.SS_SCENE_DOWN_ERROR);
         }