Parcourir la source

场景展示链接错乱

lyhzzz il y a 2 ans
Parent
commit
a09a0812ec

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

@@ -67,10 +67,6 @@ public class LaserService {
             long total =jsonObject.getLong("total");
 
             List<SceneVo> sceneVoList = new ArrayList<>();
-            String newBasePath = basePath;
-            newBasePath = newBasePath.contains("dev")? newBasePath + "/dev" : newBasePath;
-            newBasePath = newBasePath.contains("uat")? newBasePath + "/uat" : newBasePath;
-            newBasePath =  newBasePath.replace("/backend","");
             for (Object o : list) {
                 String res = JSONObject.toJSONString(o);
                 SceneVo vo = JSONObject.parseObject(res,SceneVo.class);
@@ -85,7 +81,8 @@ public class LaserService {
                 }
                 vo.setSceneName(obj.getString("title"));
                 vo.setUserName(obj.getString("phone"));
-                vo.setThumb(newBasePath +"/index.html?m="+vo.getNum() );
+                vo.setThumb(obj.getString("thumb"));
+                vo.setWebSite(obj.getString("webSite"));
                 vo.setPayStatus(1);
                 vo.setIsObj(obj.getInteger("buildObjStatus"));
                 if(vo.getStatus() == -1){  //计算失败

+ 5 - 1
src/main/java/com/fdkankan/manage/vo/response/SceneVo.java

@@ -19,7 +19,10 @@ public class SceneVo {
     private Integer payStatus;      //
     private String sceneVersion;   //场景版本
 
-    private String thumb;           //场景链接
+    private String thumb;        //封面图
+
+    private String webSite;     //场景链接
+
 
     private String algorithmTime;  //v4场景计算完成时间
 
@@ -31,4 +34,5 @@ public class SceneVo {
 
     private String dataSource;
 
+
 }

+ 1 - 1
src/main/resources/mapper/manage/SceneMapper.xml

@@ -20,7 +20,7 @@
 
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize,cl.old_num,cl.create_time ,u.user_name,s.view_count,s.status,s.pay_status,
-               s.web_site as thumb ,cl.create_time  as copy_time
+               s.web_site , s.thumb ,cl.create_time  as copy_time
         from t_scene s
         left join t_scene_copy_log cl on s.num = cl.new_num
         left join t_user u on s.user_id = u.id

+ 2 - 2
src/main/resources/mapper/manage/SceneProMapper.xml

@@ -30,7 +30,7 @@
     <select id="pageList" resultType="com.fdkankan.manage.vo.response.SceneVo">
         SELECT * FROM(
         select s.scene_name ,s.num,s.create_time,c.sn_code,s.space as sceneSize
-        ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as thumb
+        ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site , s.thumb
         ,null as algorithmTime,data_source
         from t_scene_pro s
         <include refid="commonWhere"></include>
@@ -40,7 +40,7 @@
         and is_upgrade = 0
         UNION
         select s.title as sceneName ,s.num,s.create_time,c.sn_code,e.space as sceneSize
-        ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as thumb
+        ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site,e.thumb
         ,algorithm_time,data_source
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id