ip音柱文件上传

liuhaonan

2022-04-13 3f65fcaa359cadeffa9cec2c757ab879d0aad739

 ximon-admin/src/main/java/com/sandu/ximon/admin/service/PoleService.java

@@ -113,9 +113,6 @@


    public List<Pole> queryAllStatesAndList(Integer pageNo, Integer pageSize, PoleStatesParam param) {
        // List<LampPost> list = list(Wrappers.lambdaQuery(LampPost.class).eq(LampPost::getClientId, SecurityUtils.getUserId()));
        //List<Pole> list = list(Wrappers.lambdaQuery(Pole.class));
//        PageHelper.startPage(pageNo, pageSize);
        List<Pole> list = new ArrayList<>();
        LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
        if (SecurityUtils.getClientId() == null) {
@@ -132,12 +129,6 @@
        }

        list = list(wrapper);
        List<Pole> bindList = new ArrayList<>();//已绑定客户
        List<Pole> unbindList = new ArrayList<>();//未绑定客户
        List<Pole> isTrue = new ArrayList<>();//实体灯杆
        List<Pole> isFalse = new ArrayList<>();//虚拟灯杆
        List<Pole> online = new ArrayList<>();//在线
        List<Pole> offline = new ArrayList<>();//离线
        if (param.getGroupid() != null) {
            //  List<Long> poleIds = new ArrayList<>();
            List<Pole> pole = new ArrayList<>();
@@ -149,10 +140,6 @@
            );
            list = pole;
        }

//        List<Pole> bind = isBind(list, param);
//        List<Pole> aTrue = isTrue(list, param);
//        List<Pole> onLine = isOnLine(list, param);

        if (param.getBingStates() != 2) {//是否绑定
            list = isBind(list, param);//   绑定/未绑定
@@ -179,64 +166,6 @@
            }
        }


//        list.forEach(bindwarpper -> {
////                Long clientId = bindwarpper.getClientId();
//            if (bindwarpper.getClientId() == null) {//判断是否绑定
//                unbindList.add(bindwarpper);
//                if (bindwarpper.getDeviceCode() == null) {//判断灯杆类型
//                    isFalse.add(bindwarpper);
//                } else {
//                    isTrue.add(bindwarpper);
//                }
//            } else {
//                bindList.add(bindwarpper);
//                if (bindwarpper.getDeviceCode() == null) {
//                    isFalse.add(bindwarpper);
//                } else {
//                    isTrue.add(bindwarpper);
//                }
//            }
//        });
//        if (param.getBingStates() == 1) { //未绑定
//            list = unbindList;
//        } else if (param.getBingStates() == 0) {//已绑定
//            list = bindList;
//        }// else {//全部
////            list = list(wrapper);
////        }
//
//        if (param.getIsTrue() == 1) { //虚拟灯杆
//            list = isFalse;
//        } else if (param.getIsTrue() == 0) {//实体灯杆
//            setOnline(list);
//            list = isTrue;
//            list.forEach(onLinePole -> {
//                System.out.println("online---------------------------------------------------"+("ONLINE").equals(onLinePole.getOnLineState()));
//                System.out.println("online---------------------------------------------------"+(onLinePole.getOnLineState()));
//                if (("ONLINE").equals(onLinePole.getOnLineState())) {
//                    online.add(onLinePole);
//                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
//                    offline.add(onLinePole);
//                }
//            });
//        } else {//全部
//            setOnline(list);
//           list.forEach(onLinePole -> {
//           //    System.out.println("online-----------------------"+onLinePole.getOnLineState());
//               if (("ONLINE").equals(onLinePole.getOnLineState())) {
//                    online.add(onLinePole);
//                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
//                    offline.add(onLinePole);
//                }
//            });
//       }
//
//        if (param.getOnLineStates() == 1) { //离线
//            list = offline;
//        } else if (param.getOnLineStates() == 0) {//在线
//            list = online;
//        }
        setCount(list);
        return list;
    }
@@ -694,4 +623,16 @@
        setOnline(list);
        return list;
    }


    /**
     * 根据灯杆id查询灯杆绑定设备
     */
    public List<Pole> getBindByPoleId(Long poleId){
        List<PoleBinding> bind = poleBindingService.list(Wrappers.lambdaQuery(PoleBinding.class).eq(PoleBinding::getPoleId, poleId));

        return list(Wrappers.lambdaQuery(Pole.class).eq(Pole::getId,poleId));
    }


}