场景列表

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

@@ -76,7 +76,8 @@ public class LaserService {
             }
             vo.setSceneName(obj.getString("title"));
             vo.setUserName(obj.getString("phone"));
-            vo.setThumb(newBasePath +"/index.html?m="+vo.getNum() );
+            vo.setWebSite(newBasePath +"/index.html?m="+vo.getNum() );
+            vo.setChildName(obj.getString("snCode"));
             vo.setPayStatus(1);
             sceneVoList.add(vo);
         }

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

@@ -30,4 +30,6 @@ public interface ICompanyService extends IService<Company> {
     JSONObject selectCompanyByType(RequestCompany param);
 
     void saveSubUsers(RequestCompany bo);
+
+    Company getByUserName(String userName);
 }

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

@@ -309,4 +309,13 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
 
         });
     }
+
+    @Override
+    public Company getByUserName(String userName) {
+        User user = userService.getByUserName(userName);
+        if(user != null && user.getCompanyId() != null){
+            return this.getById(user.getCompanyId());
+        }
+        return null;
+    }
 }

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

@@ -6,12 +6,14 @@ import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fdkankan.manage_jp.common.PageInfo;
 import com.fdkankan.manage_jp.common.ResultCode;
+import com.fdkankan.manage_jp.entity.Company;
 import com.fdkankan.manage_jp.entity.ScenePlus;
 import com.fdkankan.manage_jp.entity.ScenePro;
 import com.fdkankan.manage_jp.entity.SceneProEdit;
 import com.fdkankan.manage_jp.exception.BusinessException;
 import com.fdkankan.manage_jp.httpClient.service.LaserService;
 import com.fdkankan.manage_jp.mapper.ISceneProMapper;
+import com.fdkankan.manage_jp.service.ICompanyService;
 import com.fdkankan.manage_jp.service.IScenePlusService;
 import com.fdkankan.manage_jp.service.ISceneProEditService;
 import com.fdkankan.manage_jp.service.ISceneProService;
@@ -43,6 +45,8 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
     LaserService laserService;
     @Autowired
     ISceneProEditService sceneProEditService;
+    @Autowired
+    ICompanyService companyService;
 
 
     @Override
@@ -77,6 +81,13 @@ public class SceneProServiceImpl extends ServiceImpl<ISceneProMapper, ScenePro>
             return laserService.pageList(param);
         }
         Page<SceneVo> page = this.getBaseMapper().pageList(new Page<>(param.getPage(),param.getLimit()),param);
+        for (SceneVo record : page.getRecords()) {
+            String userName = record.getUserName();
+            Company company = companyService.getByUserName(userName);
+            if(company != null){
+                record.setCompanyName(company.getCompanyName());
+            }
+        }
         return PageInfo.PageInfo(page);
     }
 

src/main/java/com/fdkankan/manage_jp/vo/response/SceneVo.java

@@ -22,4 +22,10 @@ public class SceneVo {
 
     private String algorithmTime;  //v4场景计算完成时间
 
+    private String companyName;     //企业名称
+
+    private String webSite;
+
+    private String childName;
+
 }

src/main/resources/mapper/manage_jp/SceneProMapper.xml

@@ -6,8 +6,8 @@
     <select id="pageList" resultType="com.fdkankan.manage_jp.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
-        ,null as algorithmTime
+        ,u.user_name,s.view_count,s.status,s.pay_status,'v3' as scene_version ,s.web_site as webSite,thumb
+        ,null as algorithmTime,c.child_name
         from t_scene_pro s
         <include refid="commonWhere"></include>
         <if test="param.sceneName != null and param.sceneName!='' ">
@@ -16,8 +16,8 @@
         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
-        ,algorithm_time
+        ,u.user_name,e.view_count,s.scene_status as status,s.pay_status,'v4' as scene_version,e.web_site as webSite,thumb
+        ,algorithm_time,c.child_name
         from t_scene_plus s
         left join t_scene_plus_ext e on s.id = e.plus_id
         <include refid="commonWhere"></include>