fix

zhanzhiqin

2022-07-22 77edfb324184d304ae7763aae3ab609f2b495da4

fix

 dao/src/main/resources/mapper/LightMapper.xml

@@ -48,6 +48,7 @@
                )
            </if>
        </where>
        GROUP BY t1.device_code
    </select>
    <select id="listCode" resultType="java.lang.String">
        SELECT

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

@@ -70,6 +70,20 @@
    }

    /**
     * 大气设备列表（农耕，用于首页数据统计）
     */
    public List<AirEquipmentNongGengBo> listAirEquipmentOnHome() {
        List<AirEquipmentNongGengBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, null);
        } else {
            airEquipmentBos = airEquipmentNongGengMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
    }

    /**
     * 删除大气设备数据
     *
     * @param Id

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

@@ -27,7 +27,7 @@


    /**
     * 模糊查询
     * 大气设备列表模糊查询
     */
    public List<AirEquipmentBo> listAirEquipmentByKeyword(BaseConditionVO baseConditionVO, String keyword) {
        if (baseConditionVO != null) {
@@ -44,6 +44,20 @@
    }

    /**
     * 大气设备劣列表（用于首页数据统计）
     */
    public List<AirEquipmentBo> listAirEquipmentOnHome() {
        List<AirEquipmentBo> airEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, null);
        } else {
            airEquipmentBos = airEquipmentMapper.listAirEquipmentByIds(null, SecurityUtils.getUserId());
        }

        return airEquipmentBos;
    }

    /**
     * 添加大气设备数据
     *
     * @return

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

@@ -275,19 +275,6 @@
        } else {
            c3ChargingBoList = c3mChargingMapper.listC3mChargingDto(null, SecurityUtils.getUserId());
        }
        for (C3ChargingBo one : c3ChargingBoList) {
            String s = RedisUtils.getBean().get(C3mRedisConstant.C3_STATUS.getCode() + one.getC3Mac());
            if (s != null) {
                try {
                    A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage beatDataPackage = JSON.parseObject(s, A5C3HeartbeatReportInnerFrame.HeartBeatDataPackage.class);
                    one.setStatusBit((Integer.valueOf(beatDataPackage.getStatusBit())));
                } catch (Exception e) {
                    e.printStackTrace();
                }
            } else {
                one.setStatusBit(0);
            }
        }
        return c3ChargingBoList;
    }


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

@@ -68,6 +68,15 @@
         */
    }

    /**
     * IP音柱列表
     *
     * @param baseConditionVO
     * @param order
     * @param seq
     * @param broadcastTerminalV2Param
     * @return
     */
    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalList(BaseConditionVO baseConditionVO, Integer order, Integer seq, BroadcastTerminalV2Param broadcastTerminalV2Param) {
        if (broadcastTerminalV2Param == null) {
            broadcastTerminalV2Param = new BroadcastTerminalV2Param();
@@ -158,6 +167,23 @@
        }
    }

    /**
     * IP音柱列表（用于首页数据统计）
     *
     * @return
     */
    public List<BroadcastTerminalV2EntityBo> getBroadcastTerminalListOnHome() {
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos;
        List<BroadcastTerminalV2EntityBo> broadcastTerminalV2EntityBos_final = new ArrayList<>();

        if (SecurityUtils.getClientId() == null) {
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, null, 2);
        } else {
            broadcastTerminalV2EntityBos = broadcastTerminalV2EntityMapper.getBroadcastTerminalList(null, SecurityUtils.getUserId(), 2);
        }

        return broadcastTerminalV2EntityBos;
    }

    public List<BroadcastTerminalV2EntityBo> newIpTerminalList(String keyword) {


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

@@ -118,6 +118,15 @@
    }


    /**
     * 诺瓦列表
     *
     * @param baseConditionVO
     * @param keyword
     * @param order
     * @param seq
     * @return
     */
    public List<LedPlayerEntity> ledPlayerEntityList(BaseConditionVO baseConditionVO, String keyword, Integer order, Integer seq) {
        //排序字段
        String orderByResult = OrderByEnums.VNNOX_ID.getCode();
@@ -163,6 +172,28 @@
        return SpringContextHolder.getBean(VnnoxService.class).setCacheInfo(vnnoxAPIUtil.syncCurrentInfo(list));
    }

    /**
     * 诺瓦列表（用于首页数据统计）
     *
     * @return
     */
    public List<LedPlayerEntity> ledPlayerEntityListOnHome() {
        List<LedPlayerEntity> list;
        //超管
        if (SecurityUtils.getClientId() == null) {
            list = ledPlayerEntityMapper.ledPlayerEntityList(null, null);
        } else {
            list = ledPlayerEntityMapper.ledPlayerEntityList(null, SecurityUtils.getUserId());
        }
        return list == null ? new ArrayList<>() : list;
    }

    /**
     * 诺瓦列表（用于绑定）
     *
     * @param keyword
     * @return
     */
    public List<LedPlayerEntity> ledPlayerEntityListOnBinding(String keyword) {

        List<LedPlayerEntity> list;

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

@@ -52,4 +52,20 @@
        }
        return lightPoleHeelingEquipmentBos;
    }

    /**
     * 灯杆倾斜设备列表(用于首页数据统计)
     *
     * @return
     */
    public List<LightPoleHeelingEquipmentBo> LightPoleHeelingEquipmentListOnHome() {
        //为空是超管
        List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos;
        if (SecurityUtils.getClientId() == null) {
            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(null);
        } else {
            lightPoleHeelingEquipmentBos = lightPoleHeelingEquipmentMapper.LightPoleHeelingEquipmentList(SecurityUtils.getUserId());
        }
        return lightPoleHeelingEquipmentBos;
    }
}

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

@@ -992,6 +992,21 @@
    }

    /**
     * 用户拥有的路灯(用于首页数据统计)
     *
     * @return
     */
    public List<LightBo> listLightOnHome() {
        List<LightBo> listLight;
        if (SecurityUtils.getClientId() != null) {
            listLight = baseMapper.listLight(SecurityUtils.getUserId(), null);
        } else {
            listLight = baseMapper.listLight(null, null);
        }
        return listLight;
    }

    /**
     * 获取用户所有的设备码
     */
    public CommonPage<String> listDeviceCode(int pageNo, int pageSize, String keyword, String deviceCode) {

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

@@ -57,9 +57,9 @@
    private final PoleBindingService poleBindingService;

    /**
     * 模糊查询
     * 摄像头列表模糊查询
     */
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO,Integer order,Integer seq, MonitorParam monitorParam) {
    public CommonPage listMonitorByKeyword(BaseConditionVO baseConditionVO, Integer order, Integer seq, MonitorParam monitorParam) {
        //绑定状态：已绑定/未绑定/全部
        if (monitorParam.getBindingState() == null) {
            //全部
@@ -68,7 +68,7 @@
        //排序字段
        String orderByResult = "id";
        //正序、倒叙
        String orderBySeq =OrderByEnums.ASC.getCode();
        String orderBySeq = OrderByEnums.ASC.getCode();
        if (order != null) {
            switch (order) {
                case 1:
@@ -97,9 +97,9 @@

        List<MonitorBo> list;
        if (SecurityUtils.getClientId() == null) {
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
            list = monitorMapper.listMonitorDeviceSerial1(null, monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
        } else {
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(),orderBy);
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), monitorParam.getKeyword(), monitorParam.getBindingState(), orderBy);
        }

        //没有数据时候直接返回空数组
@@ -143,39 +143,26 @@
        return commonPage;
    }

    public Monitor getYSYMonitorInfoAndaddMonitorToTable(String deviceSerial) {
        YSY_MonitorDto getMonitorDto = getYSYMonitorInfo(getAccessToken(), deviceSerial);
    /**
     * 摄像头列表地（用于首页数据统计）
     *
     * @return
     */
    public List<MonitorBo> listMonitorOnHome() {

        if ("200".equals(getMonitorDto.getCode())) {
            Monitor monitor = getOne(Wrappers.lambdaQuery(Monitor.class).eq(Monitor::getDeviceSerial, deviceSerial));
            if (monitor != null) {
                monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());

                monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
                monitor.setDeviceType(getMonitorDto.getData().getModel());
                monitor.setEquipmentState(getMonitorDto.getData().getStatus());
                monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
                monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
                monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
                //更新摄像头状态
                updateById(monitor);
            } else {
                monitor = new Monitor();
                monitor.setDeviceSerial(getMonitorDto.getData().getDeviceSerial());
                monitor.setDeviceName(getMonitorDto.getData().getDeviceName());
                monitor.setDeviceType(getMonitorDto.getData().getModel());
                monitor.setEquipmentState(getMonitorDto.getData().getStatus());
                monitor.setIsEncrypt(getMonitorDto.getData().getIsEncrypt());
                monitor.setAddTime(getMonitorDto.getData().getUpdateTime());
                monitor.setNetAddress(getMonitorDto.getData().getNetAddress());
                //更新摄像头状态
                save(monitor);
            }

            return monitor;
        List<MonitorBo> list;
        if (SecurityUtils.getClientId() == null) {
            list = monitorMapper.listMonitorDeviceSerial1(null, null, 2, null);
        } else {
            return null;
            list = monitorMapper.listMonitorDeviceSerial1(SecurityUtils.getUserId(), null, 2, null);
        }

        //没有数据时候直接返回空数组
        if (list == null) {
            return new ArrayList<>();
        }

        return list;
    }

    /**

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

@@ -123,6 +123,23 @@
        return temp;
    }

    /**
     * 熙讯设备列表（用于首页数据统计）
     *
     * @return
     */
    public List<PoleLightemitEntity> listLedOnHome() {
        List<PoleLightemitEntity> poleLightemitEntityList;
        //超管
        if (SecurityUtils.getClientId() == null) {
            poleLightemitEntityList = poleLightemitDao.listLed(null, null, null);
        } else {
            poleLightemitEntityList = poleLightemitDao.listLed(null, SecurityUtils.getUserId(), null);
        }

        return poleLightemitEntityList;
    }


    /**
     * 绑定使用

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

@@ -160,7 +160,7 @@
     */
    public Map<String, Integer> poleCount() {
        Map<String, Integer> result = new HashMap<>();
        LambdaQueryWrapper<Pole> wrapper = new LambdaQueryWrapper<>();
        LambdaQueryWrapper<Pole> wrapper;
        if (SecurityUtils.getClientId() == null) {
            wrapper = Wrappers.lambdaQuery(Pole.class);
        } else {
@@ -168,120 +168,49 @@
                w.eq(Pole::getUserId, SecurityUtils.getUserId());
            });
        }

        //灯杆
        List<Pole> list = list(wrapper);
        List<Pole> poles = isOnLine(list);
        result.put("poleOnlineCount", poles.size());
        result.put("poleTotalCount", list.size());

        //诺瓦
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityList(null, null, null, null);
        int number = 0;
        for (LedPlayerEntity bean : ledPlayerEntities) {
            if (bean.getOnlineStatus() == 1) {
                number++;
            }
        }
        result.put("novaOnlineCount", number);
        List<LedPlayerEntity> ledPlayerEntities = SpringContextHolder.getBean(LedPlayerEntityService.class).ledPlayerEntityListOnHome();
        result.put("novaTotalCount", ledPlayerEntities.size());

        //ip音柱
        number = 0;
        BroadcastTerminalV2Param broadcastTerminalV2Param = new BroadcastTerminalV2Param();
        broadcastTerminalV2Param.setBindingState(2);
        broadcastTerminalV2Param.setWorkState(2);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalList(null, null, null, broadcastTerminalV2Param);
        for (BroadcastTerminalV2EntityBo bean : broadcastTerminalList) {
            if (bean.getStatus() != 0) {
                number++;
            }
        }
        result.put("broadcastOnlineCount", number);
        List<BroadcastTerminalV2EntityBo> broadcastTerminalList = SpringContextHolder.getBean(IpVolumeService.class).getBroadcastTerminalListOnHome();
        result.put("broadcastTotalCount", broadcastTerminalList.size());

        //摄像头
        number = 0;
        MonitorParam monitorParam = new MonitorParam();
        monitorParam.setEquipmentState(2);
        monitorParam.setBindingState(2);
        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        monitorParam.setEquipmentState(1);
        List<MonitorBo> online = SpringContextHolder.getBean(MonitorService.class).listMonitorByKeyword(null, null, null, monitorParam).getList();
        result.put("monitorOnlineCount", online.size());

        List<MonitorBo> monitorBos = SpringContextHolder.getBean(MonitorService.class).listMonitorOnHome();
        result.put("monitorTotalCount", monitorBos.size());

        //单灯
        number = 0;
        List<Light> lights = SpringContextHolder.getBean(LightService.class).listLight();
        for (Light light : lights) {
            if (light.getOnlineStatus() == 1) {
                number++;
            }
        }
        result.put("LightOnlineCount", number);
        List<LightBo> lights = SpringContextHolder.getBean(LightService.class).listLightOnHome();
        result.put("LightTotalCount", lights.size());

        //充电桩
        number = 0;
        List<C3ChargingBo> c3mChargings = SpringContextHolder.getBean(C3ChargingService.class).getC3ChargingList();
        for (C3ChargingBo c3ChargingBo : c3mChargings) {
            if (c3ChargingBo.getStatusBit() != 0) {
                number++;
            }
        }
        result.put("C3ChargingOnlineCount", number);
        result.put("C3ChargingTotalCount", c3mChargings.size());


        //大气
        number = 0;
        List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentByKeyword(null, null);
        for (AirEquipmentBo airEquipmentBo : airEquipments) {
            if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_STATE.getCode() + airEquipmentBo.getMac()) != null) {
                number++;
            }
        }
        result.put("AirEquipmentOnlineCount", number);
        List<AirEquipmentBo> airEquipments = SpringContextHolder.getBean(AirEquipmentService.class).listAirEquipmentOnHome();
        result.put("AirEquipmentTotalCount", airEquipments.size());
        //大气(农耕)
        number = 0;
        List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentByKeyword(null, null);
        for (AirEquipmentNongGengBo airEquipmentNongGengBo : airEquipmentNongGengBos) {
            if (RedisUtils.getBean().get(AtmoFunctionCode.AIR_HEARTBEAT_NONG_GENG_STATE.getCode() + airEquipmentNongGengBo.getMac()) != null) {
                number++;
            }
        }
        result.put("AirEquipmentNongGengOnlineCount", number);
        List<AirEquipmentNongGengBo> airEquipmentNongGengBos = SpringContextHolder.getBean(AirEquipmentNongGengService.class).listAirEquipmentOnHome();
        result.put("AirEquipmentNongGengTotalCount", airEquipmentNongGengBos.size());

        //水质
        number = 0;
        List<WaterQualityEquipmentBo> waterQualityEquipments = SpringContextHolder.getBean(WaterQualityEquipmentService.class).listWaterQualityEquipmentByKeyword(null, null);

        for (WaterQualityEquipmentBo waterQualityEquipmentBo : waterQualityEquipments) {
            WaterQualityDataDto waterQualityDataDto = SpringContextHolder.getBean(WaterQualityDataService.class).getWaterQualityDataInfo(waterQualityEquipmentBo.getWaterQualityEquipmentCode());
            if (waterQualityDataDto != null) {
                number++;
            }
        }
        result.put("WaterQualityEquipmentOnlineCount", number);
        result.put("WaterQualityEquipmentTotalCount", waterQualityEquipments.size());
        //灯杆倾斜
        number = 0;
        List<LightPoleHeeling> lightPoleHeelings = SpringContextHolder.getBean(LightPoleHeelingService.class).listLightPoleHeelingByKeyword(null, null);

        for (LightPoleHeeling lightPoleHeeling : lightPoleHeelings) {
            if (RedisUtils.getBean().get(LightPoleHeelingEnum.LIGHT_POLE_HEELING_STATE.getCode() + lightPoleHeeling.getMac()) != null) {
                number++;
            }
        }
        result.put("LightPoleHeelingOnlineCount", number);
        result.put("LightPoleHeelingTotalCount", lightPoleHeelings.size());
        //灯杆倾斜
        List<LightPoleHeelingEquipmentBo> lightPoleHeelingEquipmentBos = SpringContextHolder.getBean(LightPoleHeelingEquipmentService.class).LightPoleHeelingEquipmentListOnHome();
        result.put("LightPoleHeelingTotalCount", lightPoleHeelingEquipmentBos.size());

        //熙讯
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, false);
        List<PoleLightemitEntity> poleLightemitEntityOnlineList = SpringContextHolder.getBean(PoleLightemitService.class).listLed(null, null, null, true);

        result.put("XiXunOnlineCount", poleLightemitEntityOnlineList.size());
        List<PoleLightemitEntity> poleLightemitEntities = SpringContextHolder.getBean(PoleLightemitService.class).listLedOnHome();
        result.put("XiXunTotalCount", poleLightemitEntities.size());

        return result;