功能完善

liuhaonan

2022-03-01 4d08f39afcf6f458373dfd26c47f06b191560f92

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

@@ -226,7 +226,7 @@
            );
        }
        List<PoleLightemitEntity> list = poleLightemitService.list(wrapper);
        if(isOnLine){
        if (isOnLine) {
            List<PoleLightemitEntity> results = poleLightemitService.ledOnline(list);
            CommonPage commonPage = CommonPage.restPage(results);
            int size = results.size();
@@ -236,7 +236,7 @@
                commonPage.setTotalPage(size / baseConditionVO.getPageSize());
            }
            return ResponseUtil.success(commonPage);
        }else {
        } else {
            poleLightemitService.ledOnlineCheck(list);
            return ResponseUtil.success(list);
        }
@@ -248,8 +248,8 @@
     */

    @PostMapping("/setScreenOpen")
    public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity){
        if(setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null){
    public ResponseVO<Object> setScreenOpen(@RequestBody SetScreenOpenParam setScreenOpenEntity) {
        if (setScreenOpenEntity.getIds() == null || setScreenOpenEntity.getIds().length == 0 || setScreenOpenEntity.getBool() == null) {
            throw new BusinessException("未选择LED屏");
        }
        Collection poleLightemitControllers = poleLightemitService.listByIds(Arrays.asList(setScreenOpenEntity.getIds()));
@@ -263,15 +263,15 @@
                //结果查询
                String result = lightemitUtils.setScreenOpen(poleLightemitEntity.getLightemitControlCode(), setScreenOpenEntity.getBool());

                System.out.println("result:---------------------"+result);
                if(result.isEmpty() || !"true".equals(result)){
                System.out.println("result:---------------------" + result);
                if (result.isEmpty() || !"true".equals(result)) {

                }

                map.put(poleLightemitEntity.getLightemitId(), result);
            }
            return ResponseUtil.success(map);
        }else {
        } else {
            throw new BusinessException("未正确选择LED屏");
        }
    }