Merge remote-tracking branch 'origin/master'

xiangpei

2024-08-09 290426983e4a3f2331e74d10790e64ec97323c99

 ycl-server/src/main/java/com/ycl/calculate/IndexCalculationServe.java

@@ -119,13 +119,13 @@

    //返回省厅国标码集合
    public List<String> getProvince() {
        List<YwPoint> province = pointMapper.selectByTag(null, "province");
        List<YwPoint> province = pointMapper.selectByTag(null, Boolean.TRUE);
        return province.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
    }

    //返回重点点位集合
    public List<String> getImportant() {
        List<YwPoint> important = pointMapper.selectByTag("important", null);
        List<YwPoint> important = pointMapper.selectByTag(Boolean.TRUE, null);
        return important.stream().map(YwPoint::getSerialNumber).collect(Collectors.toList());
    }

@@ -136,7 +136,7 @@
        // 检查是否已存在今日数据
        Optional<T> existingIndex = checkIndexList.stream()
                .filter(index -> key.equals(index.getDeptId().toString()) &&
                        (key.startsWith("Province_") ? CheckConstants.Examine_Tag_City.equals(index.getExamineTag())
                        (key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province.equals(index.getExamineTag())
                                : CheckConstants.Examine_Tag_County.equals(index.getExamineTag())))
                .findFirst();

@@ -146,7 +146,7 @@
            try {
                checkIndex = clazz.getDeclaredConstructor().newInstance();
                checkIndex.setDeptId(key.startsWith("Province_") ? Long.parseLong(key.split("_")[1]) : Long.parseLong(key));
                checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_City : CheckConstants.Examine_Tag_County);
                checkIndex.setExamineTag(key.startsWith("Province_") ? CheckConstants.Examine_Tag_Province : CheckConstants.Examine_Tag_County);
                checkIndex.setCreateTime(new Date());
            } catch (Exception e) {
                checkIndex = null;