Merge branch 'wuhuyancao' of http://139.186.142.91:10010/r/productDev/dmvis...

MrShi

12 小时以前 917c4ee8b05e816602aa06f67f2f5447150b242f

 server/visits/dmvisit_admin/src/main/java/com/doumee/cloud/admin/HkSyncCloudController.java

@@ -349,6 +349,9 @@
                    t1.setIndexCode(i+"_"+j+"_ChildCode");
                    t1.setParentIndexCode(t.getIndexCode());
                    t1.setCarmeraList(new ArrayList<>());
                    t1.setDeviceList(new ArrayList<>());
                    t1.setSensorList(new ArrayList<>());

                    CarmeraListVO c1= new CarmeraListVO();
                    c1.setName(i+"监控点111"+j);
                    c1.setIndexCode(i+"jkd111"+j);
@@ -357,8 +360,31 @@
                    c1.setName(i+"监控点112"+j);
                    c1.setIndexCode(i+"jkd112"+j);
                    t1.getCarmeraList().add(c1);


                    c1= new CarmeraListVO();
                    c1.setName(i+"传感器111"+j);
                    c1.setIndexCode(i+"cgq111"+j);
                    t1.getSensorList().add(c1);
                    c1= new CarmeraListVO();
                    c1.setName(i+"传感器111112"+j);
                    c1.setIndexCode(i+"cgq112"+j);
                    t1.getSensorList().add(c1);



                    c1= new CarmeraListVO();
                    c1.setName(i+"消防设备111"+j);
                    c1.setIndexCode(i+"xf111"+j);
                    t1.getDeviceList().add(c1);
                    c1= new CarmeraListVO();
                    c1.setName(i+"消防设备111112"+j);
                    c1.setIndexCode(i+"xf112"+j);
                    t1.getDeviceList().add(c1);

                    t.getChildList().add(t1);
                }

                result.add(t);
            }
            //------TODO---------测试模拟数据----end-----