1.单位

tangzy

2021-09-08 1c5e273bbd5751664dd9b65149c4b2dd3ede94ec

1.单位

 src/main/java/org/springblade/modules/mountainrain/controller/MountainrainController.java

@@ -474,7 +474,6 @@
            String dateEnd24 =dateEnds24;

            //对应雨量站
            long startTime=System.currentTimeMillis();
            String s = mountainrainService.selectCode();
            String[] split = s.split(",");
            String strArrays = "";
@@ -483,7 +482,6 @@
            }
            String code = strArrays.substring(0, strArrays.length() - 1);
            List<MountainrainsCVO> mountainrainsCVOS = mountainrainService.Mountains(times, dateEnd24, dateEnd1, dateEnd3, dateEnd6,timess,code);
            long endTime=System.currentTimeMillis(); //获取结束时间
            List<Map<String, Object>> lists = new ArrayList<>();
            for (int i = 0; i < mountainrainsCVOS.size(); i++) {
                if (mountainrainsCVOS.get(i).getCenconding()==null){
@@ -496,7 +494,6 @@
                map.put("Max", Max);
                lists.add(map);
            }
            System.out.println("程序运行时间： "+(endTime-startTime)+"ms");
            return R.data(lists);

        }

 src/main/java/org/springblade/modules/mountainrain/mapper/MountainrainMapper.xml

@@ -265,13 +265,30 @@
    ) AS siteids
    </select>

    <select id="Mountains">
    <select id="Mountains" resultMap="mountainrainResultMapcInfo">
        SELECT
            cs.id,
            cs.cenconding,
            cs.crainfall,
            isnull(cs.gohour, 0)   gohour,
            isnull(cs.gthour, 0)   gthour,
            isnull(cs.gshour, 0)   gshour,
            isnull(cs.imohour, 0)  imohour,
            isnull(cs.imthour, 0)  imthour,
            isnull(cs.imshour, 0)  imshour,
        a.drp1,
        b.drp3,
        c.drp6,
        d.dyp,
        cs.*
            isnull(d.dyp, 0)     dyp,
            cs.township,
            cs.village,
            cs.village_group,
            cs.dj,
            cs.bw,
            cs.county,
            isnull(cs.fyear, 0) as fyear,
            isnull(cs.tyear, 0) as tyear,
            isnull(cs.oyear, 0) as oyear
        FROM
        (
        SELECT

 src/main/java/org/springblade/modules/regionWeight/controller/RegionWeightController.java

@@ -643,6 +643,7 @@
        }
        return R.data(lists);
    }

    /**
     * @param type        类型 0：实时 1 历史
     * @param timez       当前时间 yyyy-MM-dd HH:00:00
@@ -696,8 +697,7 @@
                lists.add(map);
            }
            return R.data(lists);
        }
        else {
        } else {
            //当前时间
            String time = timez;