fix

zhanzhiqin

2022-05-11 b9276c27abdac33f7e3fefccb4600a98db465c6e

fix

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

@@ -76,12 +76,15 @@
            return ResponseUtil.fail("缺少对应用户权限");
        }
        CommonPage commonPage = poleService.queryAllStatesAndList(baseConditionVO.getPageNo(), baseConditionVO.getPageSize(), param);
        List<Pole> listCommonPage = (List<Pole>) commonPage.getList();

        List<PoleBindVO> listResult = new ArrayList<>();
        for (Pole pole : (List<Pole>) commonPage.getList()) {
        for (Pole pole : listCommonPage) {
            PoleBindVO bindByPoleId = poleService.getBindByPoleId(pole.getId());
            bindByPoleId.setPole(pole);
            listResult.add(bindByPoleId);
        }
        commonPage.setList(listResult);
        return ResponseUtil.success(commonPage);
    }


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

@@ -66,7 +66,6 @@
    /**
     * 首页灯杆绑定信息
     */
    //TODO
    public EquipmentInfomation getBySnAndPlayerSnInfo(String sn) {
        EquipmentInfomation equipmentInfo = new EquipmentInfomation();
        equipmentInfo.setEquipmentType("诺瓦LED");
@@ -75,6 +74,9 @@
        }

        LedPlayerEntity one = getOne(Wrappers.lambdaQuery(LedPlayerEntity.class).eq(LedPlayerEntity::getSn, sn));
        if (one == null) {
            return equipmentInfo;
        }
        List<LedPlayerEntity> list = new ArrayList<>();
        list.add(one);
        List<LedPlayerEntity> ledPlayerEntities = vnnoxAPIUtil.syncCurrentInfo(list);

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

@@ -276,6 +276,7 @@
        }

        List<Pole> PoleResult = isOnLine(poleList, param);
        setCount(PoleResult);

        CommonPage commonPage = ListPagingUtils.pages(PoleResult, pageNo, pageSize);


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

@@ -109,8 +109,11 @@

        try {
            String s = HttpUtil.get(WATER_QUALITY_DATA_URL + waterQualityEquipmentCode + ".json");
            System.out.println(s);

            System.out.println(waterQualityEquipmentCode+"-------------------------------"+s);
            if(!s.startsWith("{")){
                equipmentInfo.setEquipmentState("未知");
                return equipmentInfo;
            }
            WaterQualityDataDto waterQualityDataDto = JSON.parseObject(s, WaterQualityDataDto.class);
            //设置水质设备状态
            if (waterQualityDataDto != null) {

 ximon-admin/src/main/java/com/sandu/ximon/admin/utils/VnnoxAPIUtil.java

@@ -47,6 +47,7 @@

    /**
     * 获取播放器列表
     *
     * @param count 每次读取数量，默认20，取值范围：1~100
     * @param start 从第几条记录开始读取，默认0
     * @return
@@ -74,6 +75,9 @@
     */
    public List<LedPlayerEntity> syncCurrentInfo(List<LedPlayerEntity> list) {
        List<String> playerIds = new ArrayList<>();
        if (list.isEmpty()) {
            return list;
        }

        for (LedPlayerEntity playerEntity : list) {
            playerIds.add(playerEntity.getPlayerId());
@@ -224,7 +228,6 @@

    /**
     * 同步播放
     *
     */
    public VnnoxResult syncPlay(List<String> playerId, Integer option) {
        VnnoxBaseRequest request = new VnnoxBaseRequest();