1

13693261870

2024-11-20 74e3485e6bae63e73f5d3be8b36c671e30aa389d

 src/main/java/com/yssh/service/WarningAnalyseService.java

@@ -71,10 +71,11 @@
        List<Qxsh> list = CacheUtils.getListByKey(key);
        if (null == list) {
            list = qxshMapper.selectAlarmByBeginAndEnd(start, end);
            copeHasSuYuan(list);
            CacheUtils.putListByKey(key, list);
        }

        return copeHasSuYuan(list);
        return list;
    }

    /**
@@ -86,10 +87,11 @@
        List<Qxsh> list = CacheUtils.getListByKey(key);
        if (null == list) {
            list = qxshMapper.selectWarnByBeginAndEnd(start, end);
            copeHasSuYuan(list);
            CacheUtils.putListByKey(key, list);
        }

        return copeHasSuYuan(list);
        return list;
    }

    /**
@@ -262,12 +264,20 @@

            WarningDetail wd = new WarningDetail(0L, tab, suYuanId, qxsh.getName(), null, 0, qxsh.getValue());
            DistanceSuYuan suYuan = suYuanMapper.getSuYuanById(tab, suYuanId);
            if (null == suYuan) {
                String[] strs = suYuanId.split("_");
                suYuan = new DistanceSuYuan(null, null, 0.0, suYuanId, Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), 0, 0, null, 0.0, 0.0, 0.0, 0.0);
            }
            //List<String> ids3d = CalculateUtils.aloneCrosswiseExtend(point, 50);
            //DistanceSuYuan suMax = suYuanMapper.getSuYuan500Max(tab, ids3d);

            //String filter = CalculateUtils.getFilterByExtend(point, 50);
            String filter = getFilterByPoint(point, 50);
            DistanceSuYuan suMax = suYuanMapper.getSuYuan500MaxByFilter(tab, filter);
            if (null == suMax) {
                String[] strs = suYuanId.split("_");
                suMax = new DistanceSuYuan(null, null, 0.0, suYuanId, Integer.parseInt(strs[0]), Integer.parseInt(strs[1]), 0, 0, null, 0.0, 0.0, 0.0, 0.0);
            }
            suMax.setAddr(getAddr(suMax.getId()));

            Report report = Report.calcReport(wd, suYuan, suMax);