1.单位

tangzy

2021-09-08 31cac151ee472f29ad6e6c57f6039c42ea863ded

1.单位

 src/main/java/org/springblade/modules/rsvr/controller/RsvrRController.java

@@ -464,14 +464,18 @@
                    c.put(stcd, v3);
                }
            }
            if (m1.size()!=0) {
            //获取涨幅最大的信息
            Object maxKey = getMaxKey(m1);
            String s1 = m1.get(maxKey).toString();
            text += " 涨幅最大的是：" + s1 + "(涨" + maxKey + "米)。";
            }
            if (m2.size()!=0) {
            //获取跌幅最大的信息
            Object maxKey2 = getMaxKey(m2);
            String s2 = m2.get(maxKey2).toString();
            text += " 跌幅最大的是：" + s2 + "(跌" + maxKey + "米)。";
                text += " 跌幅最大的是：" + s2 + "(跌" + maxKey2 + "米)。";
            }
            m.put("text", text);
            m.put("number", number);
            m.put("Yjlist", ylist);
@@ -617,8 +621,7 @@
                            texta += "出库流量" + OTQ + "(立方米每秒);";
                        }
//                        texta += "汛限水位暂无数据;";
                    }
                    else if ( stnm.equals("廖坊")){
                    } else if (stnm.equals("廖坊")) {
                        texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&";
                        if (RZ == 0) {
                            texth += "库水位暂无数据、";
@@ -697,8 +700,7 @@
                            texta += "出库流量" + OTQ + "(立方米每秒);";
                        }
//                        texta += "汛限水位暂无数据;";
                    }
                    else if ( stnm.equals("廖坊")){
                    } else if (stnm.equals("廖坊")) {
                        texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&";
                        if (RZ == 0) {
                            texth += "库水位暂无数据、";
@@ -782,8 +784,7 @@
                                texta += "出库流量" + OTQ + "(立方米每秒);";
                            }
//                        texta += "汛限水位暂无数据;";
                        }
                        else if ( stnm.equals("廖坊")){
                        } else if (stnm.equals("廖坊")) {
                            texth += "$$$$$" + stnm.replaceAll(" ", "") + "水库&&&&&";
                            if (RZ == 0) {
                                texth += "库水位暂无数据、";
@@ -973,19 +974,16 @@
        if(mou>=bs&&mou<=es){
            egmd=b;
            edmd=e;
        }
        else if(mou>=b2s&&mou<=e2s) {
        } else if (mou >= b2s && mou <= e2s) {
            egmd=b2;
            edmd=e2;
        }
        else {
        } else {
            String mous="0901";
            int m = Integer.parseInt(mous);
            if(m>=bs&&m<=es){
                egmd=b;
                edmd=e;
            }
            else if(m>=b2s&&m<=e2s) {
            } else if (m >= b2s && m <= e2s) {
                egmd=b2;
                edmd=e2;
            }
@@ -993,8 +991,7 @@
        List<Map<String, Object>> map;
        if(k==13){
            map = rsvrRService.selectyj(egmd,edmd,times,dateEnd);
        }
        else {
        } else {
            map = rsvrRService.selectyj(egmd,edmd,times,dateEnd);
        }
        List<Map<String, Object>> lists = new ArrayList<>();