经销商分为三级

src/main/java/com/fdkankan/agent/controller/AgentNewController.java

@@ -34,7 +34,9 @@ public class AgentNewController extends BaseController {
 
     @PostMapping("/list")
     public ResultData list(@RequestBody AgentParam param){
-        param.setAgentId(getAgent().getId());
+        if(param.getAgentId() == null){
+            param.setAgentId(getAgent().getId());
+        }
         return ResultData.ok(agentNewService.pageList(param));
     }
 

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

@@ -88,7 +88,7 @@ public class LaserService {
         if(param.getType() !=2){
             newParam.setSceneSource(5);
         }
-        List<CameraDetail> cameraDetails = cameraDetailService.getByAgentId(param.getAgentId());
+        List<CameraDetail> cameraDetails = cameraDetailService.getListByAgentId(param.getAgentId());
         List<String> snCodeList = this.setSnCodes(cameraDetails);
         param.setSnCodes(snCodeList);
         if(param.getSnCodes() == null || param.getSnCodes().size() <=0){

src/main/java/com/fdkankan/agent/service/IAgentNewService.java

@@ -33,6 +33,7 @@ public interface IAgentNewService extends IService<AgentNew> {
     void addIncrementNum(AgentAddIncrementParam param);
 
     List<AgentNew> getBySubAgent(Integer agentId);
+    List<AgentNew> getBySubAgent(List<Integer> agentIds);
 
     HashMap<Integer, AgentNew> getMapByIds(List<Integer> subAgentIds);
 }

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

@@ -19,12 +19,8 @@ public interface ICameraDetailService extends IService<CameraDetail> {
 
     CameraDetail getByCameraId(Long cameraId);
 
-    List<CameraDetail> getByAgentId(Integer agentId);
-
     Boolean checkSpace(CameraDetail detailEntity, Long needSpace);
 
-    List<CameraDetail> getListByCompanyId(Integer companyId);
-
     List<CameraDetail> getListByAgentId(Integer agentId);
 
     List<CameraDetail> getByCameraIds(List<Long> cameraIds);

src/main/java/com/fdkankan/agent/service/impl/AgentNewLogServiceImpl.java

@@ -83,25 +83,28 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
     public  HashMap<String,LogDataVo> getLogDataM(AgentNew agentNew) {
         HashMap<String,LogDataVo> map = new HashMap<>();
 
-        if(agentNew.getParentId() == null){
-            List<AgentNew> bySubAgent = agentNewService.getBySubAgent(agentNew.getId());
+        LogDataVo logDataVo = getLogDataVo(Arrays.asList(agentNew.getId()));
+        LogDataVo logDataVo2 = null;
+        List<AgentNew> bySubAgent = agentNewService.getBySubAgent(agentNew.getId());
+        if(!bySubAgent.isEmpty()){
             List<Integer> agentIds  = bySubAgent.stream().map(AgentNew::getId).collect(Collectors.toList());
-            LogDataVo logDataVo = getLogDataVo(Arrays.asList(agentNew.getId()));
-            LogDataVo logDataVo2 = getLogDataVo(agentIds);
-            map.put("agentData",logDataVo);
-            map.put("subAgentData",logDataVo2);
-        }else {
-            LogDataVo logDataVo = getLogDataVo(Arrays.asList(agentNew.getId()));
-            map.put("agentData",logDataVo);
-            map.put("subAgentData",null);
+            List<AgentNew> bySubAgent1 = agentNewService.getBySubAgent(agentIds);
+            if(!bySubAgent1.isEmpty()){
+                List<Integer> agentIds2  = bySubAgent1.stream().map(AgentNew::getId).collect(Collectors.toList());
+                agentIds.addAll(agentIds2);
+            }
+            logDataVo2 = getLogDataVo(agentIds);
         }
+
+        map.put("agentData",logDataVo);
+        map.put("subAgentData",logDataVo2);
         return map;
     }
 
     private LogDataVo getLogDataVo(List<Integer> agentIds){
         LogDataVo logDataVo = new LogDataVo();
         if(agentIds.isEmpty()){
-            return logDataVo;
+            return null;
         }
         List<AgentNewLog> logDataM = this.getBaseMapper().getLogDataM(agentIds);
         for (AgentNewLog log : logDataM) {
@@ -121,10 +124,17 @@ public class AgentNewLogServiceImpl extends ServiceImpl<IAgentNewLogMapper, Agen
 
         List<Integer> agentIds  = new ArrayList<>();
         agentIds.add(param.getAgentId());
-        if(param.getAgentNew().getParentId() == null){
-            List<AgentNew> bySubAgent = agentNewService.getBySubAgent(param.getAgentNew().getId());
-            agentIds.addAll( bySubAgent.stream().map(AgentNew::getId).collect(Collectors.toList()));
+        List<AgentNew> bySubAgent = agentNewService.getBySubAgent(param.getAgentNew().getId());
+        if(!bySubAgent.isEmpty()){
+            List<Integer> subAgentIds = bySubAgent.stream().map(AgentNew::getId).collect(Collectors.toList());
+            agentIds.addAll( subAgentIds);
+            List<AgentNew> bySubAgent1 = agentNewService.getBySubAgent(subAgentIds);
+            if(!bySubAgent1.isEmpty()){
+                List<Integer> subAgentIds1 = bySubAgent1.stream().map(AgentNew::getId).collect(Collectors.toList());
+                agentIds.addAll( subAgentIds1);
+            }
         }
+
         if(agentIds.isEmpty()){
             return PageInfo.PageInfo(new Page(param.getPageNum(),param.getPageSize()));
         }

src/main/java/com/fdkankan/agent/service/impl/AgentNewServiceImpl.java

@@ -208,6 +208,15 @@ public class AgentNewServiceImpl extends ServiceImpl<IAgentNewMapper, AgentNew>
         wrapper.eq(AgentNew::getParentId,agentId);
         return this.list(wrapper);
     }
+    @Override
+    public List<AgentNew> getBySubAgent(List<Integer> agentIds) {
+        if(agentIds.isEmpty()){
+            return new ArrayList<>();
+        }
+        LambdaQueryWrapper<AgentNew> wrapper = new LambdaQueryWrapper<>();
+        wrapper.in(AgentNew::getParentId,agentIds);
+        return this.list(wrapper);
+    }
 
     @Override
     public HashMap<Integer, AgentNew> getMapByIds(List<Integer> subAgentIds) {

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

@@ -67,12 +67,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
         return list.get(0);
     }
 
-    @Override
-    public List<CameraDetail> getByAgentId(Integer agentId) {
-        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CameraDetail::getAgentId,agentId);
-        return this.list(wrapper);
-    }
 
     @Value("${spring.profiles.active}")
     private String uploadType;
@@ -111,12 +105,6 @@ public class CameraDetailServiceImpl extends ServiceImpl<ICameraDetailMapper, Ca
     }
 
     @Override
-    public List<CameraDetail> getListByCompanyId(Integer companyId) {
-        LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
-        wrapper.eq(CameraDetail::getCompanyId,companyId);
-        return this.list(wrapper);
-    }
-    @Override
     public List<CameraDetail> getListByAgentId(Integer agentId) {
         LambdaQueryWrapper<CameraDetail> wrapper = new LambdaQueryWrapper<>();
         wrapper.eq(CameraDetail::getAgentId,agentId);