深时查询

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

@@ -100,16 +100,19 @@ public class LaserService {
 
     private LaserSceneParam getLaserSceneParam(SceneParam param) {
         LaserSceneParam newParam = new LaserSceneParam();
-        if(param.getCompanyId()!= null){ //客户场景
-            List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyId(param.getCompanyId());
+        if(StringUtils.isNotBlank(param.getCompanyName())){ //客户场景
+            List<CameraDetail> cameraDetails = cameraDetailService.getListByCompanyName(param.getCompanyName());
             param.setSnCodes(this.setSnCodes(cameraDetails));
             if(param.getSnCodes() == null || param.getSnCodes().size() <=0){
                 return null;
             }
         }
-        if(StringUtils.isNotBlank(param.getUserName())){
-            List<CameraDetail> cameraDetails = cameraDetailService.getByUserName(param.getUserName());
-            param.setSnCodes(this.setSnCodes(cameraDetails));
+        if(StringUtils.isNotBlank(param.getChildName())){
+            List<Camera> cameraList = cameraService.getLikeChildName(param.getChildName());
+            List<String> snCodes = cameraList.stream().map(Camera::getSnCode).collect(Collectors.toList());
+            if(snCodes.size() >0){
+                param.setSnCodes(snCodes);
+            }
         }
         BeanUtils.copyProperties(param,newParam);
         newParam.setTitle(param.getSceneName());

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

@@ -36,4 +36,6 @@ public interface ICameraDetailService extends MPJBaseService<CameraDetail> {
     CameraDetail getByCameraId(Long cameraId);
 
     CameraDetail getByChildName(String childName);
+
+    List<CameraDetail> getListByCompanyName(String companyName);
 }

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

@@ -31,4 +31,6 @@ public interface ICameraService extends MPJBaseService<Camera> {
     void bind(CameraAddParam param);
 
     List<Camera> getByChildNames(List<String> childNames);
+
+    List<Camera> getLikeChildName(String childName);
 }

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

@@ -7,6 +7,8 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.fdkankan.manage_jp.vo.request.RequestCompany;
 import com.fdkankan.manage_jp.vo.response.ResponseCompany;
 
+import java.util.List;
+
 /**
  * <p>
  * 客户企业logo信息 服务类
@@ -36,4 +38,6 @@ public interface ICompanyService extends IService<Company> {
     Company getByCameraId(Long cameraId);
 
     Company getByChildName(String childName);
+
+    List<Company> getLikeCompanyName(String companyName);
 }

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

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 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.entity.User;
 import com.fdkankan.manage_jp.mapper.ICameraDetailMapper;
 import com.fdkankan.manage_jp.mapper.ICameraMapper;
@@ -22,6 +23,7 @@ import javax.annotation.Resource;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
+import java.util.Set;
 import java.util.stream.Collectors;
 
 /**
@@ -39,6 +41,8 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
     ICameraService cameraService;
     @Autowired
     IUserService userService;
+    @Autowired
+    ICompanyService companyService;
 
     @Override
     public void updateCompanyId(Long id) {
@@ -129,4 +133,16 @@ public class CameraDetailServiceImpl extends MPJBaseServiceImpl<ICameraDetailMap
         Camera camera = byChildNames.get(0);
         return this.getByCameraId(camera.getId());
     }
+
+    @Override
+    public List<CameraDetail> getListByCompanyName(String companyName) {
+        List<Company> companyList = companyService.getLikeCompanyName(companyName);
+        Set<Long> companyIds = companyList.stream().map(Company::getId).collect(Collectors.toSet());
+        if(companyIds.size() <= 0){
+            return null;
+        }
+        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(CameraDetail::getCompanyId,companyIds);
+        return this.list(wrapper);
+    }
 }

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

@@ -151,4 +151,11 @@ public class CameraServiceImpl extends MPJBaseServiceImpl<ICameraMapper, Camera>
         wrapper.in(Camera::getChildName,childNames);
         return this.list(wrapper);
     }
+
+    @Override
+    public List<Camera> getLikeChildName(String childName) {
+        LambdaQueryWrapper<Camera> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(Camera::getChildName,childName);
+        return this.list(wrapper);
+    }
 }

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

@@ -340,4 +340,11 @@ public class CompanyServiceImpl extends ServiceImpl<ICompanyMapper, Company> imp
         }
         return this.getById(cameraDetail.getCompanyId());
     }
+
+    @Override
+    public List<Company> getLikeCompanyName(String companyName) {
+        LambdaQueryWrapper<Company> wrapper = new LambdaQueryWrapper<>();
+        wrapper.like(Company::getCompanyName,companyName);
+        return this.list(wrapper);
+    }
 }