深时场景返回企业名称

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

@@ -7,6 +7,7 @@ import com.fdkankan.manage_jp.common.PageInfo;
 import com.fdkankan.manage_jp.common.Result;
 import com.fdkankan.manage_jp.entity.Camera;
 import com.fdkankan.manage_jp.entity.CameraDetail;
+import com.fdkankan.manage_jp.entity.Company;
 import com.fdkankan.manage_jp.httpClient.client.LaserClient;
 import com.fdkankan.manage_jp.httpClient.param.LaserSceneParam;
 import com.fdkankan.manage_jp.httpClient.param.SSDownSceneParam;
@@ -14,6 +15,7 @@ import com.fdkankan.manage_jp.httpClient.vo.FdkkResponse;
 import com.fdkankan.manage_jp.httpClient.vo.SSDownSceneVo;
 import com.fdkankan.manage_jp.service.ICameraDetailService;
 import com.fdkankan.manage_jp.service.ICameraService;
+import com.fdkankan.manage_jp.service.ICompanyService;
 import com.fdkankan.manage_jp.service.IUserService;
 import com.fdkankan.manage_jp.vo.request.SceneParam;
 import com.fdkankan.manage_jp.vo.response.SceneVo;
@@ -42,6 +44,8 @@ public class LaserService {
     ICameraDetailService cameraDetailService;
     @Autowired
     ICameraService cameraService;
+    @Autowired
+    ICompanyService companyService;
 
 
     public PageInfo pageList(SceneParam param) {
@@ -81,6 +85,12 @@ public class LaserService {
             vo.setPayStatus(1);
             sceneVoList.add(vo);
         }
+        for (SceneVo sceneVo : sceneVoList) {
+            Company company = companyService.getByChildName(sceneVo.getChildName());
+            if(company != null){
+                sceneVo.setCompanyName(company.getCompanyName());
+            }
+        }
 
         Page<SceneVo> voPage = new Page<>(param.getPage(),param.getLimit());
         voPage.setRecords(sceneVoList);

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

@@ -33,5 +33,7 @@ public interface ICameraDetailService extends MPJBaseService<CameraDetail> {
 
     List<CameraDetail> getByUserName(String userName);
 
-    CameraDetail getByCameraId(Integer cameraId);
+    CameraDetail getByCameraId(Long cameraId);
+
+    CameraDetail getByChildName(String childName);
 }

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

@@ -33,5 +33,7 @@ public interface ICompanyService extends IService<Company> {
 
     Company getByUserName(String userName);
 
-    Company getByCameraId(Integer cameraId);
+    Company getByCameraId(Long cameraId);
+
+    Company getByChildName(String childName);
 }

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

@@ -19,6 +19,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;
+import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -112,9 +114,19 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
     }
 
     @Override
-    public CameraDetail getByCameraId(Integer cameraId) {
+    public CameraDetail getByCameraId(Long cameraId) {
         LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CameraDetail::getCameraId,cameraId);
         return this.getOne(wrapper);
     }
+
+    @Override
+    public CameraDetail getByChildName(String childName) {
+        List<Camera> byChildNames = cameraService.getByChildNames(Arrays.asList(childName));
+        if(byChildNames == null || byChildNames.size() <=0){
+            return null;
+        }
+        Camera camera = byChildNames.get(0);
+        return this.getByCameraId(camera.getId());
+    }
 }

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

@@ -324,11 +324,20 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
     }
 
     @Override
-    public Company getByCameraId(Integer cameraId) {
+    public Company getByCameraId(Long cameraId) {
         CameraDetail cameraDetail = cameraDetailService.getByCameraId(cameraId);
         if(cameraDetail == null || cameraDetail.getCameraId() == null){
             return null;
         }
         return this.getById(cameraDetail.getCompanyId());
     }
+
+    @Override
+    public Company getByChildName(String childName) {
+        CameraDetail cameraDetail = cameraDetailService.getByChildName(childName);
+        if(cameraDetail == null || cameraDetail.getCameraId() == null){
+            return null;
+        }
+        return this.getById(cameraDetail.getCompanyId());
+    }
 }

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

@@ -29,6 +29,6 @@ public class SceneVo {
     private String childName;
 
     private Integer isUpgrade = 1;
-    private Integer cameraId ;
+    private Long cameraId ;
 
 }