功能完善

liuhaonan

2022-03-04 f4a6289110e6aa67e635bfb5ed6b695b697c432c

功能完善

 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/service/PoleService.java

@@ -174,23 +174,24 @@
//            list = list(wrapper);
//        }

        setOnline(list);
        if (param.getIsTrue() == 1) { //虚拟灯杆
            list = isFalse;
        } else if (param.getIsTrue() == 0) {//实体灯杆
            setOnline(list);
            list = isTrue;
            list.forEach(onLinePole -> {
//                System.out.println("online-----------------------"+onLinePole.getOnLineState());
                if (("ONLINAE").equals(onLinePole.getOnLineState())) {
                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);
            setOnline(list);
           list.forEach(onLinePole -> {
//               System.out.println("online-----------------------"+onLinePole.getOnLineState());
           //    System.out.println("online-----------------------"+onLinePole.getOnLineState());
               if (("ONLINE").equals(onLinePole.getOnLineState())) {
                    online.add(onLinePole);
                } else if (("OFFLINE").equals(onLinePole.getOnLineState())) {
@@ -204,8 +205,8 @@
        } else if (param.getOnLineStates() == 0) {//在线
            list = online;
        }
        setCount(list);
        return list;
        List<Pole> poles = setCount(list);
        return poles;
    }

    /**