通过URL传参访问车辆和通道信息

liujun001
1 parent 2ad30a03
Showing 5 changed files with 36 additions and 37 deletions
src/main/java/com/bsth/controller/video/VideoController.java
src/main/java/com/bsth/entity/video/VideoTree.java
src/main/java/com/bsth/service/impl/videoimpl/VideoServiceImpl.java
src/main/java/com/bsth/service/video/VideoService.java
src/main/resources/static/other/video/video.js
@@ -59,7 +59,7 @@ public class VideoController {
     @GetMapping("/tree/carNo/{parentId}")
     public List<VideoTree> layTreeNodeCarNo(@PathVariable("parentId") String parentId) {
-        return videoService.combinationTreeOfCar(parentId, false);
+        return videoService.combinationTreeOfCar(parentId, false,false);
     }
     @GetMapping("/tree/search")
@@ -71,7 +71,7 @@ public class VideoController {
         }
         List<VideoTree> groups = null;
         try {
-            groups = videoService.searchTreeDataByCarNo(carNo, Boolean.TRUE);
+            groups = videoService.searchTreeDataByCarNo(carNo, Boolean.TRUE,Boolean.TRUE);
             setAttributeToPage(result);
@@ -151,7 +151,7 @@ public class VideoController {
     public Map<String, Object> queryChannelsTree(@PathVariable String carNo) {
         Map<String, Object> result = new HashMap<>();
         try {
-            List<VideoTree> trees = videoService.queryChannelsTree(carNo, Boolean.TRUE);
+            List<VideoTree> trees = videoService.queryChannelsTree(carNo, Boolean.TRUE,Boolean.FALSE);
             setAttributeToPage(result);
             result.put("data", trees);
             result.put("status", ResponseCode.SUCCESS);
@@ -64,6 +64,10 @@ public class VideoTree implements Serializable {
     @Transient
     private String spread;
+    private boolean initChild=false;
+
+    private String wvpLiveBroadcast;
+
     public String getTitle() {
         return this.getText();
@@ -69,7 +69,7 @@ public class VideoServiceImpl implements VideoService {
     }
     @Override
-    public List<VideoTree> combinationTreeOfCar(String code,boolean spread) {
+    public List<VideoTree> combinationTreeOfCar(String code,boolean spread,boolean asyn) {
         if (Objects.nonNull(code)) {
             List<VideoTree> trees = new ArrayList<>();
             Set<String> carNos = groupCarNosByComputeCode(code);
@@ -77,14 +77,14 @@ public class VideoServiceImpl implements VideoService {
             Set<Line> lineSet = groupLingByCompany(code);
             if (CollectionUtils.isNotEmpty(lineSet)) {
                 for (Line line : lineSet) {
-                    VideoTree videoTree = combinationOfLine(code, line,spread);
+                    VideoTree videoTree = combinationOfLine(code, line,spread,asyn);
                     trees.add(videoTree);
                     Set<String> carNoSets = groupCarNoByLine(line.getId());
                     if (CollectionUtils.isNotEmpty(carNoSets)) {
                         List<VideoTree> children = new ArrayList<>();
                         for (String carNo : carNoSets) {
-                            VideoTree carTree = combnationOfCar(carNo, line.getId().toString(),spread);
+                            VideoTree carTree = combnationOfCar(carNo, line.getId().toString(),spread,asyn);
                             children.add(carTree);
                             if (CollectionUtils.isNotEmpty(carNos)) {
@@ -100,7 +100,7 @@ public class VideoServiceImpl implements VideoService {
             if (CollectionUtils.isNotEmpty(carNos)) {
                 for (String carNo : carNos) {
-                    VideoTree carTree = combnationOfCar(carNo, code,spread);
+                    VideoTree carTree = combnationOfCar(carNo, code,spread,asyn);
                     trees.add(carTree);
                 }
             }
@@ -109,17 +109,19 @@ public class VideoServiceImpl implements VideoService {
         return null;
     }
-    private VideoTree combnationOfCar(String carNo, String line,boolean spread) {
+    private VideoTree combnationOfCar(String carNo, String line,boolean spread,boolean asyn) {
         String name = Objects.isNull(basicData) || MapUtils.isEmpty(basicData.nbbmCompanyPlateMap) ? null : basicData.nbbmCompanyPlateMap.get(carNo);
-        return combinationVideoTree(carNo, carNo, line, carNo, 301, "bus1", carNo,spread);
+        VideoTree tree = combinationVideoTree(carNo, carNo, line, carNo, 301, "bus1", carNo,spread,asyn);
+        tree.setWvpLiveBroadcast(wvpConfig.getWvpLiveBroadcast());
+        return tree;
     }
-    private VideoTree combinationOfLine(String code, Line line,boolean spread) {
-        return combinationVideoTree(line.getId(), line.getName(), code, line.getId(), 201, "line", line.getLineCode(),spread);
+    private VideoTree combinationOfLine(String code, Line line,boolean spread,boolean asyn) {
+        return combinationVideoTree(line.getId(), line.getName(), code, line.getId(), 201, "line", line.getLineCode(),spread,asyn);
     }
     @Override
-    public List<VideoTree> searchTreeDataByCarNo(String carNo,boolean spread) throws Exception {
+    public List<VideoTree> searchTreeDataByCarNo(String carNo,boolean spread,boolean asyn) throws Exception {
         Line line = findLineByCode(carNo);
         Iterable<Business> businessIterable = businessService.list(new HashMap<>());
@@ -131,22 +133,22 @@ public class VideoServiceImpl implements VideoService {
             Set<Business> businesses = new LinkedHashSet<>();
             findBussinessByUpCode(line.getCompany(), businessIterable, businesses);
             if (CollectionUtils.isNotEmpty(businesses)) {
-                List<VideoTree> group = combitionBussiness(businesses,spread);
+                List<VideoTree> group = combitionBussiness(businesses,spread,asyn);
                 VideoTree sourceTree = findVideoTreeByBusinessCode(line.getCompany(), group);
                 if (Objects.isNull(sourceTree.getChildren())) {
                     sourceTree.setChildren(new ArrayList<>());
                 }
-                VideoTree lineOfTreeNode = combinationOfLine(sourceTree.getId().toString(), line,spread);
+                VideoTree lineOfTreeNode = combinationOfLine(sourceTree.getId().toString(), line,spread,asyn);
                 lineOfTreeNode.setSpread(Boolean.TRUE.toString());
                 lineOfTreeNode.setChildren(new ArrayList<>());
                 sourceTree.getChildren().add(lineOfTreeNode);
-                VideoTree carOfTreeNode = combnationOfCar(carNo, line.getLineCode(),spread);
+                VideoTree carOfTreeNode = combnationOfCar(carNo, line.getLineCode(),spread,asyn);
                 lineOfTreeNode.getChildren().add(carOfTreeNode);
                 carOfTreeNode.setSpread(Boolean.TRUE.toString());
-                List<VideoTree> children = queryChannelsTree(carNo,spread);
+                List<VideoTree> children = queryChannelsTree(carNo,spread,asyn);
                 carOfTreeNode.setChildren(children);
@@ -158,17 +160,17 @@ public class VideoServiceImpl implements VideoService {
             if (StringUtils.isNotEmpty(company)) {
                 findBussinessByUpCode(company, businessIterable, businesses);
                 if (CollectionUtils.isNotEmpty(businesses)) {
-                    List<VideoTree> group = combitionBussiness(businesses,spread);
+                    List<VideoTree> group = combitionBussiness(businesses,spread,asyn);
                     VideoTree sourceTree = findVideoTreeByBusinessCode(company, group);
                     if (Objects.nonNull(sourceTree) && Objects.isNull(sourceTree.getChildren())) {
                         sourceTree.setChildren(new ArrayList<>());
                     }
-                    VideoTree carOfTreeNode = combnationOfCar(carNo, company,spread);
+                    VideoTree carOfTreeNode = combnationOfCar(carNo, company,spread,asyn);
                     carOfTreeNode.setSpread(Boolean.TRUE.toString());
                     sourceTree.getChildren().add(carOfTreeNode);
                     sourceTree.setSpread("true");
-                    List<VideoTree> children = queryChannelsTree(carNo,spread);
+                    List<VideoTree> children = queryChannelsTree(carNo,spread,asyn);
                     carOfTreeNode.setChildren(children);
                     return group;
@@ -181,7 +183,7 @@ public class VideoServiceImpl implements VideoService {
     }
     @Override
-    public List<VideoTree> queryChannelsTree(String carNo, boolean spread) throws Exception {
+    public List<VideoTree> queryChannelsTree(String carNo, boolean spread,boolean asyn) throws Exception {
         List<Map<String, Object>> videoChannels = getVideoChannel(carNo);
         List<VideoTree> trees = new ArrayList<>();
@@ -196,6 +198,7 @@ public class VideoServiceImpl implements VideoService {
                 String name = Objects.isNull(map.get("name")) ? map.get("channelId") + "_" + map.get("deviceId") : map.get("name").toString();
                 tree.setText("<span><img src='/metronic_v4.5.4/layui/icon/video1.ico' class ='imageIcon' /></span><span>"+name+"</span>");
                 tree.setNodePValue(carNo);
+                tree.setWvpLiveBroadcast(wvpConfig.getWvpLiveBroadcast());
                 trees.add(tree);
             }
@@ -231,16 +234,16 @@ public class VideoServiceImpl implements VideoService {
             return Collections.emptyList();
         }
-        return combitionBussiness(businessIterable,false);
+        return combitionBussiness(businessIterable,false,Boolean.FALSE);
     }
-    private List<VideoTree> combitionBussiness(Iterable<Business> businessIterable,boolean spread) {
+    private List<VideoTree> combitionBussiness(Iterable<Business> businessIterable,boolean spread,boolean asyn) {
         List<VideoTree> trees = new ArrayList<>();
         Iterator<Business> iterator = businessIterable.iterator();
         while (iterator.hasNext()) {
             Business business = iterator.next();
-            VideoTree videoTree = combinationVideoTree(business.getBusinessCode(), business.getBusinessName(), business.getUpCode(), business.getId(), null, "company1", business.getBusinessCode(),spread);
+            VideoTree videoTree = combinationVideoTree(business.getBusinessCode(), business.getBusinessName(), business.getUpCode(), business.getId(), null, "company1", business.getBusinessCode(),spread,asyn);
             trees.add(videoTree);
         }
         List<VideoTree> groupTree = new ArrayList<>();
@@ -275,7 +278,7 @@ public class VideoServiceImpl implements VideoService {
      * @param icon 图标
      * @return com.bsth.entity.video.VideoTree
      */
-    private VideoTree combinationVideoTree(Object id, String text, String parent, Object sourceId, Integer type, String icon, Object code,boolean spread) {
+    private VideoTree combinationVideoTree(Object id, String text, String parent, Object sourceId, Integer type, String icon, Object code,boolean spread,boolean asyn) {
         VideoTree videoTree = new VideoTree();
         videoTree.setId(id);
         videoTree.setText("<span><img src='/metronic_v4.5.4/layui/icon/"+icon+".png' class ='imageIcon' /></span><span>"+text+"</span>");
@@ -284,6 +287,7 @@ public class VideoServiceImpl implements VideoService {
         videoTree.setType(type);
         videoTree.setIcon(icon);
         videoTree.setCode(code);
+        videoTree.setInitChild(asyn);
         videoTree.setSpread(String.valueOf(spread));
         return videoTree;
     }
@@ -18,11 +18,11 @@ public interface VideoService {
     List<VideoTree> combinationTree();
-    List<VideoTree> combinationTreeOfCar(String code,boolean spread);
+    List<VideoTree> combinationTreeOfCar(String code,boolean spread,boolean asyn);
-    List<VideoTree> searchTreeDataByCarNo(String carNo,boolean spread) throws Exception;
+    List<VideoTree> searchTreeDataByCarNo(String carNo,boolean spread,boolean asyn) throws Exception;
-    List<VideoTree> queryChannelsTree(String carNo,boolean spread) throws Exception;
+    List<VideoTree> queryChannelsTree(String carNo,boolean spread,boolean asyn) throws Exception;
     List<Map<String, Object>> getVideoChannel(String carNo)throws  Exception;
@@ -119,6 +119,7 @@ function initTreeOpt(data, tree) {
 }
 function  treeClickFun(node,tree){
+
     if(node.data.initChild == true){
         return;
     }
@@ -232,19 +233,9 @@ function layCarNoConcatArr(d, node, data, result) {
         d.spread = true;
         d.initChild= true;
-        if (result) {
-            $.each(data, function (index, d1) {
-                d1.wvpLiveBroadcast = result.wvpLiveBroadcast;
-            })
-        }
         if( data){
             d.children = data;
         }
-       // d.children = [];
-       // d.children = d.children.concat(data);
-        if (result) {
-            d.wvpLiveBroadcast = result.wvpLiveBroadcast;
-        }
     } else {
         layCarNoChildren(d.children, node, data, result);
     }