lyhzzz 8 달 전
부모
커밋
88e76ffb68

+ 1 - 1
src/main/java/com/fdkankan/manage/config/LaserConfig.java

@@ -10,6 +10,6 @@ import org.springframework.context.annotation.Configuration;
 @Data
 public class LaserConfig {
 
-    @Value("laser.web-site-pre")
+    @Value("${laser.web-site-pre}")
     private String laserWebSite;
 }

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

@@ -221,7 +221,7 @@ public class LaserService {
     public List<JSONObject> getLaserSceneByDb(LaserSceneParam param){
         List<JSONObject> list =  laserMapper.getSceneByDb(param);
         for (JSONObject jsonObject : list) {
-            jsonObject.put("webSite",laserConfig.getLaserWebSite()+jsonObject.getString("scene_code"));
+            jsonObject.put("web_site",laserConfig.getLaserWebSite()+jsonObject.getString("scene_code"));
         }
         return list;
     }
@@ -230,7 +230,7 @@ public class LaserService {
         HashMap<String, JSONObject> map = new HashMap<>();
         List<JSONObject> laserSceneByDb = this.getLaserSceneByDb(newParam);
         for (JSONObject obj : laserSceneByDb) {
-            map.put(obj.getString("num"),obj);
+            map.put(obj.getString("scene_code"),obj);
         }
         return map;
     }

+ 4 - 4
src/main/java/com/fdkankan/manage/service/impl/JyUserShareServiceImpl.java

@@ -140,8 +140,8 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
             //替换深时标题,链接
             JSONObject sceneVo = map.get(record.getNum());
             if(sceneVo != null){
-                record.setWebSite(sceneVo.getString("webSite"));
-                record.setTitle(sceneVo.getString("sceneName"));
+                record.setWebSite(sceneVo.getString("web_site"));
+                record.setTitle(sceneVo.getString("title"));
             }
         }
     }
@@ -164,8 +164,8 @@ public class JyUserShareServiceImpl extends ServiceImpl<IJyUserShareMapper, JyUs
             //替换深时标题,链接
             JSONObject sceneVo = map.get(record.getNum());
             if(sceneVo != null){
-                record.setWebSite(sceneVo.getString("webSite"));
-                record.setTitle(sceneVo.getString("sceneName"));
+                record.setWebSite(sceneVo.getString("web_site"));
+                record.setTitle(sceneVo.getString("title"));
             }
         }
     }

+ 3 - 3
src/main/java/com/fdkankan/manage/service/impl/SceneProServiceImpl.java

@@ -362,10 +362,10 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
                 if(ssObj!=null){
                     record.setSceneName(ssObj.getString("title"));
                     record.setThumb(ssObj.getString("thumb"));
-                    record.setWebSite(ssObj.getString("webSite"));
-                    record.setViewCount(ssObj.getInteger("viewCount"));
+                    record.setWebSite(ssObj.getString("web_site"));
+                    record.setViewCount(ssObj.getInteger("view_count"));
                     record.setStatus(laserService.toFdStatus(ssObj.getInteger("status")));
-                    record.setAlgorithmTime(ssObj.getString("algorithmTime"));
+                    record.setAlgorithmTime(ssObj.getString("algorithm_time"));
                 }else if(record.getStatus() != 0){
                     record.setStatus(-1);
                     record.setWebSite(null);