update

jinpengyong

2021-07-22 6278a11e191892ae672eba0dce6d8990283327a6

update

 screen-api/src/main/java/com/moral/api/service/impl/DeviceServiceImpl.java

@@ -67,7 +67,6 @@
        String end;
        String timeUnits;
        String dateFormat;
        List<Map<String, Object>> result = new ArrayList<>();
        if ("day".equals(type)) {
            end = DateUtils.getDateAddDay(start, 1);
            timeUnits = "hourly";

 screen-api/src/main/java/com/moral/api/service/impl/SysAreaServiceImpl.java

@@ -41,17 +41,26 @@

    @Override
    public List<Map<String, Object>> getMapPath(Integer orgId) {
        //根据组织id查询所有站点
        QueryWrapper<MonitorPoint> queryWrapper = new QueryWrapper<>();
        queryWrapper.select("province_code", "city_code", "area_code")
                .eq("organization_id", orgId)
                .eq("is_delete", Constants.NOT_DELETE);
        //根据组织id查询所有站点
        List<MonitorPoint> monitorPoints = monitorPointMapper.selectList(queryWrapper);
        Set<Integer> cityCodes = new HashSet<>();
        for (MonitorPoint monitorPoint : monitorPoints) {
            cityCodes.add(monitorPoint.getProvinceCode());
            cityCodes.add(monitorPoint.getCityCode());
            cityCodes.add(monitorPoint.getAreaCode());
            Integer provinceCode = monitorPoint.getProvinceCode();
            Integer cityCode = monitorPoint.getCityCode();
            Integer areaCode = monitorPoint.getAreaCode();
            if (provinceCode != null) {
                cityCodes.add(provinceCode);
            }
            if (cityCode != null) {
                cityCodes.add(cityCode);
            }
            if (areaCode != null) {
                cityCodes.add(areaCode);
            }
        }

        QueryWrapper<SysArea> sysAreaQueryWrapper = new QueryWrapper<>();
@@ -76,7 +85,7 @@
        return newList;
    }

    //获取用户层级菜单递归方法
    //获取层级城市列表
    private List<Map<String, Object>> getAreasByRecursion(SysArea sysArea, List<SysArea> sysAreas) {
        SysArea newSysArea = new SysArea();
        newSysArea.setParentCode(sysArea.getAreaCode());