Merge remote-tracking branch 'origin/master'

zhanzhiqin

2022-03-04 ae39f3877901b92e04c1ef9ee1d7e99123a66672

Merge remote-tracking branch 'origin/master'

 ximon-admin/src/main/java/com/sandu/ximon/admin/controller/PoleController.java

@@ -6,6 +6,7 @@
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.toolkit.Wrappers;
import com.github.pagehelper.PageHelper;
import com.sandu.common.domain.CommonPage;
import com.sandu.common.domain.ResponseVO;
import com.sandu.common.object.BaseConditionVO;
import com.sandu.common.util.ResponseUtil;
@@ -58,14 +59,22 @@
        return ResponseUtil.success(poleService.deletePole(poleId));
    }

    @GetMapping("/listPoleAndState")//可以整合//已整合 弃用
    @PostMapping("/list")
    public ResponseVO<Object> listPole(BaseConditionVO baseConditionVO, @RequestBody PoleStatesParam param) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());
        List<Pole> poles = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),param);
        return ResponseUtil.success(poles);
        List<Pole> results = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(),param);
        CommonPage commonPage = CommonPage.restPage(results);
        int size = results.size();
        commonPage.setTotal((long) size);
        commonPage.setTotalPage(size / baseConditionVO.getPageSize() + 1);
        if (size % baseConditionVO.getPageSize() == 0) {
            commonPage.setTotalPage(size / baseConditionVO.getPageSize());
        }
        return ResponseUtil.success(commonPage);
       // return ResponseUtil.success(poles);
    }

    @GetMapping("/list")
    @GetMapping("/listPoleAndState")
    public ResponseVO<Object> listPoleAndState(BaseConditionVO baseConditionVO, @RequestParam(value = "keyword", required = false) String keyword,
                                               @RequestParam(value = "groupid", required = false) Long groupid) {
        PageHelper.startPage(baseConditionVO.getPageNo(), baseConditionVO.getPageSize());

 ximon-admin/src/main/java/com/sandu/ximon/admin/param/PoleParam.java

@@ -18,7 +18,7 @@
    /**
     * 客户id
     */
    @NotNull(message = "客户id不能为空")
//    @NotNull(message = "客户id不能为空")
    private Long clientId;

    /**

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

@@ -148,68 +148,100 @@
            list = pole;
        }

        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);
//        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);//   绑定/未绑定
            if (param.getIsTrue() != 2) {//已绑定的是否是真实灯杆
                list = isTrue(list, param);
                if (param.getOnLineStates() != 2) {//绑定的真实灯杆是否在线
                    list = isOnLine(list, param);
                }
            } else {
                bindList.add(bindwarpper);
                if (bindwarpper.getDeviceCode() == null) {
                    isFalse.add(bindwarpper);
                } else {
                    isTrue.add(bindwarpper);
            }else {//全部灯杆  实体/虚拟
                if (param.getOnLineStates() != 2) {  //查询全部灯杆是否在线
                    list = isOnLine(list, param);
                }
            }
        });
        if (param.getBingStates() == 1) { //未绑定
            list = unbindList;
        } else if (param.getBingStates() == 0) {//已绑定
            list = bindList;
        }// else {//全部
//            list = list(wrapper);
//        }

        setOnline(list);
        if (param.getIsTrue() == 1) { //虚拟灯杆
            list = isFalse;
        } else if (param.getIsTrue() == 0) {//实体灯杆
            list = isTrue;
            list.forEach(onLinePole -> {
//                System.out.println("online-----------------------"+onLinePole.getOnLineState());
                if (("ONLINAE").equals(onLinePole.getOnLineState())) {
                    online.add(onLinePole);
                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
                    offline.add(onLinePole);
        }else {//全部 绑定/未绑定
            if (param.getIsTrue() != 2) {// 判断灯杆类型
                list = isTrue(list, param);// 实体/虚拟
                if (param.getOnLineStates() != 2) {// 灯杆的在线判断
                    list = isOnLine(list, param);//在线/离线
                }
            });
        } 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);
            }else {//全类型灯杆
                if (param.getOnLineStates() != 2) {//判断在线状态
                    list = isOnLine(list, param);//在线/离线
                }
            });
       }

        if (param.getOnLineStates() == 1) { //离线
            list = offline;
        } else if (param.getOnLineStates() == 0) {//在线
            list = online;
            }
        }


//        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;
    }

    /**
     * 设置绑定设备数量
     *
     * @param list
     * @return
     */
@@ -222,8 +254,85 @@
        return list;
    }


    /**
     * 在线状态处理
     *
     * @param list
     * @param param
     * @return
     */
    public List<Pole> isOnLine(List<Pole> list, PoleStatesParam param) {
        setOnline(list);
        List<Pole> online = new ArrayList<>();//在线
        List<Pole> offline = new ArrayList<>();//离线
        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);
            }
        });

        if (param.getOnLineStates() == 0) {
            return online;
        } else if (param.getOnLineStates() == 1) {
            return offline;
        }
        return list;
    }

    /**
     * 查询绑定状态
     *
     * @param list
     * @param param
     * @return
     */
    public List<Pole> isBind(List<Pole> list, PoleStatesParam param) {
        List<Pole> bindList = new ArrayList<>();//已绑定客户
        List<Pole> unbindList = new ArrayList<>();//未绑定客户
        list.forEach(bindwarpper -> {
//                Long clientId = bindwarpper.getClientId();
            if (bindwarpper.getClientId() == null) {//判断是否绑定
                unbindList.add(bindwarpper);
            } else {
                bindList.add(bindwarpper);
            }
        });
        if (param.getBingStates() == 0) {
            return bindList;
        } else if (param.getBingStates() == 1) {
            return unbindList;
        }
        return list;
    }

    public List<Pole> isTrue(List<Pole> list, PoleStatesParam param) {
        List<Pole> isTrue = new ArrayList<>();//实体灯杆
        List<Pole> isFalse = new ArrayList<>();//虚拟灯杆
        list.forEach(bindwarpper -> {
//                Long clientId = bindwarpper.getClientId();
            if (bindwarpper.getDeviceCode() == null) {
                isFalse.add(bindwarpper);
            } else {
                isTrue.add(bindwarpper);
            }
        });
        if (param.getIsTrue() == 0) {
            return isTrue;
        } else if (param.getIsTrue() == 1) {
            return isFalse;
        }
        return list;
    }


    /**
     * 设置在线状态
     *
     * @param list
     * @return
     */