Browse Source

Revert "1"

This reverts commit a7ecb3a589401d077d844869ed8e5844c5b50694.
lyhzzz 1 year ago
parent
commit
415c58273d

+ 0 - 2
src/main/java/com/fdkankan/manage_jp/httpClient/param/LaserSceneParam.java

@@ -14,6 +14,4 @@ public class LaserSceneParam {
     private Integer status;
     private Integer sceneSource;
 
-    private String lang = "zh";
-
 }

+ 2 - 4
src/main/java/com/fdkankan/manage_jp/httpClient/service/LaserService.java

@@ -252,23 +252,21 @@ public class LaserService {
         rabbitMqProducer.sendByWorkQueue(cloudPointBuild, params);
     }
 
-    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource,String lang) {
+    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer sceneSource) {
         LaserSceneParam newParam = new LaserSceneParam();
         newParam.setPageNum(1);
         newParam.setPageSize(sceneNumList.size());
         newParam.setSceneCodes(sceneNumList);
         newParam.setSceneSource(sceneSource);
-        newParam.setLang(lang);
         return this.list(newParam);
     }
-    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer status,Integer sceneSource,String lang) {
+    public HashMap<String, JSONObject> list(List<String> sceneNumList,Integer status,Integer sceneSource) {
         LaserSceneParam newParam = new LaserSceneParam();
         newParam.setPageNum(1);
         newParam.setPageSize(sceneNumList.size());
         newParam.setSceneCodes(sceneNumList);
         newParam.setStatus(status);
         newParam.setSceneSource(sceneSource);
-        newParam.setLang(lang);
         return this.list(newParam);
     }
 

+ 2 - 2
src/main/java/com/fdkankan/manage_jp/service/impl/SceneProServiceImpl.java

@@ -153,10 +153,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
         }
         HashMap<String,JSONObject> ssSceneMap = new HashMap<>();
         if(param.getType() == 2 ){
-            ssSceneMap = laserService.list(sceneNumList,4,param.getLang());
+            ssSceneMap = laserService.list(sceneNumList,4);
         }
         if(param.getType() == 5){
-            ssSceneMap = laserService.list(sceneNumList,5,param.getLang());
+            ssSceneMap = laserService.list(sceneNumList,5);
         }
         HashMap<String,Boolean> coldMap = tmColdStorageService.getByNumList(sceneNumList);
 

+ 2 - 2
src/main/java/com/fdkankan/manage_jp/service/impl/TmColdStorageServiceImpl.java

@@ -83,10 +83,10 @@ public class TmColdStorageServiceImpl extends ServiceImpl<ITmColdStorageMapper,
             List<String> numList = page.getRecords().stream().map(TmColdStorage::getSceneNum).collect(Collectors.toList());
             HashMap<String, JSONObject> ssSceneMap = new HashMap<>();
             if(param.getType() == 2){
-                ssSceneMap =laserService.list(numList,3,4,param.getLang());
+                ssSceneMap =laserService.list(numList,3,4);
             }
             if(param.getType() == 5){
-                ssSceneMap = laserService.list(numList,3,5,param.getLang());
+                ssSceneMap = laserService.list(numList,3,5);
             }
             for (TmColdStorage record : page.getRecords()) {
                 JSONObject sceneVo = ssSceneMap.get(record.getSceneNum());

+ 0 - 1
src/main/java/com/fdkankan/manage_jp/vo/request/ColdStorageParam.java

@@ -13,7 +13,6 @@ public class ColdStorageParam extends RequestBase {
     private List<String> shootingTime;
     private String shootingStartTime;
     private String shootingEndTime;
-    private String lang = "zh";
 
     public String getShootingStartTime() {
         if(shootingTime != null && shootingTime.size() >0){

+ 0 - 2
src/main/java/com/fdkankan/manage_jp/vo/request/SceneParam.java

@@ -32,6 +32,4 @@ public class SceneParam extends RequestBase {
     private Boolean isMigrate = true;
 
     private Integer id;
-
-    private String lang = "zh";
 }