横向对比接口查询方式修改

src/main/java/com/gyee/frame/service/compare/CompareService.java

@@ -1046,125 +1046,134 @@ public class CompareService {
         Map<String, Object> map = new HashMap<String, Object>();
 
         if (StringUtils.notEmp(windturbineid) && StringUtils.notEmp(date)) {
-            List<ValueVo> vos = new ArrayList<ValueVo>();
 
 
-            List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(windturbineid, DateUtils.truncate(date));
+            String[] strs=windturbineid.split(",");
+            for(int j=0;j<strs.length;j++)
+            {
+                List<ValueVo> vos = new ArrayList<ValueVo>();
 
-            if (!wtdls.isEmpty()) {
+                String wtId=strs[j];
+                List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(wtId, DateUtils.truncate(date));
 
-                Windturbinethewindinfo winfo = wtdls.get(0);
+                if (!wtdls.isEmpty()) {
 
-                for (int i = 0; i < 16; i++) {
-                    ValueVo vo = new ValueVo();
+                    Windturbinethewindinfo winfo = wtdls.get(0);
 
-                    switch (i) {
-                        case 0:
-                            // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
-                            vo.setName("N");
-                            vo.setData1(winfo.getN4());
-                            break;
-                        case 1:
-                            // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
-                            vo.setName("NNE");
-                            vo.setData1(winfo.getNne4());
-                            break;
-                        case 2:
-                            // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
-                            vo.setName("NE");
-                            vo.setData1(winfo.getNe4());
-                            break;
-                        case 3:
-                            // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
-                            vo.setName("ENE");
-                            vo.setData1(winfo.getEne4());
+                    for (int i = 0; i < 16; i++) {
+                        ValueVo vo = new ValueVo();
 
-                            break;
-                        case 4:
-                            // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
-                            vo.setName("E");
-                            vo.setData1(winfo.getE4());
-                            break;
-                        case 5:
-                            // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
-                            vo.setName("ESE");
-                            vo.setData1(winfo.getEse4());
-                            break;
-                        case 6:
-                            // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
-                            vo.setName("SE");
-                            vo.setData1(winfo.getSe4());
-                            break;
-                        case 7:
-                            // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
-                            vo.setName("SSE");
-                            vo.setData1(winfo.getSse4());
-                            break;
-                        case 8:
-                            // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
-                            vo.setName("S");
-                            vo.setData1(winfo.getS4());
-                            break;
-                        case 9:
-                            // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
-                            vo.setName("SSW");
-                            vo.setData1(winfo.getSsw4());
-                            break;
-                        case 10:
-                            // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
-                            vo.setName("SW");
-                            vo.setData1(winfo.getSw4());
-                            break;
-                        case 11:
-                            // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
-                            vo.setName("WSW");
-                            vo.setData1(winfo.getWsw4());
+                        switch (i) {
+                            case 0:
+                                // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
+                                vo.setName("N");
+                                vo.setData1(winfo.getN4());
+                                break;
+                            case 1:
+                                // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
+                                vo.setName("NNE");
+                                vo.setData1(winfo.getNne4());
+                                break;
+                            case 2:
+                                // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
+                                vo.setName("NE");
+                                vo.setData1(winfo.getNe4());
+                                break;
+                            case 3:
+                                // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
+                                vo.setName("ENE");
+                                vo.setData1(winfo.getEne4());
 
-                            break;
-                        case 12:
-                            // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
-                            vo.setName("W");
-                            vo.setData1(winfo.getW4());
-                            break;
-                        case 13:
-                            // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
-                            vo.setName("WNW");
-                            vo.setData1(winfo.getWnw4());
-                            break;
-                        case 14:
-                            // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
-                            vo.setName("NW");
-                            vo.setData1(winfo.getNw4());
-                            break;
-                        case 15:
-                            // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
-                            vo.setName("NNW");
-                            vo.setData1(winfo.getNnw4());
-                            break;
+                                break;
+                            case 4:
+                                // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
+                                vo.setName("E");
+                                vo.setData1(winfo.getE4());
+                                break;
+                            case 5:
+                                // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                                vo.setName("ESE");
+                                vo.setData1(winfo.getEse4());
+                                break;
+                            case 6:
+                                // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
+                                vo.setName("SE");
+                                vo.setData1(winfo.getSe4());
+                                break;
+                            case 7:
+                                // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
+                                vo.setName("SSE");
+                                vo.setData1(winfo.getSse4());
+                                break;
+                            case 8:
+                                // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
+                                vo.setName("S");
+                                vo.setData1(winfo.getS4());
+                                break;
+                            case 9:
+                                // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
+                                vo.setName("SSW");
+                                vo.setData1(winfo.getSsw4());
+                                break;
+                            case 10:
+                                // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
+                                vo.setName("SW");
+                                vo.setData1(winfo.getSw4());
+                                break;
+                            case 11:
+                                // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
+                                vo.setName("WSW");
+                                vo.setData1(winfo.getWsw4());
 
-                        default:
-                            break;
+                                break;
+                            case 12:
+                                // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
+                                vo.setName("W");
+                                vo.setData1(winfo.getW4());
+                                break;
+                            case 13:
+                                // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
+                                vo.setName("WNW");
+                                vo.setData1(winfo.getWnw4());
+                                break;
+                            case 14:
+                                // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
+                                vo.setName("NW");
+                                vo.setData1(winfo.getNw4());
+                                break;
+                            case 15:
+                                // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
+                                vo.setName("NNW");
+                                vo.setData1(winfo.getNnw4());
+                                break;
+
+                            default:
+                                break;
+                        }
+
+                        vos.add(vo);
                     }
 
-                    vos.add(vo);
                 }
 
-            }
+                String jfpl=null;
 
-            String jfpl=null;
+                if (!wtdls.isEmpty()) {
+                    // jfpl="静风频率为"+wtdls.get(0).getCb();
 
-            if (!wtdls.isEmpty()) {
-                // jfpl="静风频率为"+wtdls.get(0).getCb();
+                    int c = (int) wtdls.get(0).getCb().intValue();
+
+                    jfpl = "静风频率为" + c;
+                } else {
+                    jfpl = "静风频率为1";
+                }
 
-                int c = (int) wtdls.get(0).getCb().intValue();
+                map.put("jfpl"+j, jfpl);
+                map.put("data"+j, vos);
 
-                jfpl = "静风频率为" + c;
-            } else {
-                jfpl = "静风频率为1";
             }
 
-            map.put("jfpl", jfpl);
-            map.put("data", vos);
+
 
         }
 
@@ -1184,124 +1193,129 @@ public class CompareService {
         if (StringUtils.notEmp(windturbineid) && StringUtils.notEmp(date)) {
             List<ValueVo> vos = new ArrayList<ValueVo>();
 
+            String[] strs=windturbineid.split(",");
+            for(int j=0;j<strs.length;j++)
+            {
+                String wtId=strs[j];
+                List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(wtId, DateUtils.truncate(date));
 
-            List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(windturbineid, DateUtils.truncate(date));
+                if (!wtdls.isEmpty()) {
 
-            if (!wtdls.isEmpty()) {
+                    Windturbinethewindinfo winfo = wtdls.get(0);
 
-                Windturbinethewindinfo winfo = wtdls.get(0);
+                    for (int i = 0; i < 16; i++) {
+                        ValueVo vo = new ValueVo();
 
-                for (int i = 0; i < 16; i++) {
-                    ValueVo vo = new ValueVo();
+                        switch (i) {
+                            case 0:
+                                // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
+                                vo.setName("N");
+                                vo.setData1(winfo.getN10());
+                                break;
+                            case 1:
+                                // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
+                                vo.setName("NNE");
+                                vo.setData1(winfo.getNne10());
+                                break;
+                            case 2:
+                                // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
+                                vo.setName("NE");
+                                vo.setData1(winfo.getNe10());
+                                break;
+                            case 3:
+                                // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
+                                vo.setName("ENE");
+                                vo.setData1(winfo.getEne10());
 
-                    switch (i) {
-                        case 0:
-                            // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
-                            vo.setName("N");
-                            vo.setData1(winfo.getN10());
-                            break;
-                        case 1:
-                            // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
-                            vo.setName("NNE");
-                            vo.setData1(winfo.getNne10());
-                            break;
-                        case 2:
-                            // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
-                            vo.setName("NE");
-                            vo.setData1(winfo.getNe10());
-                            break;
-                        case 3:
-                            // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
-                            vo.setName("ENE");
-                            vo.setData1(winfo.getEne10());
+                                break;
 
-                            break;
+                            case 4:
+                                // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
+                                vo.setName("E");
+                                vo.setData1(winfo.getE10());
+                                break;
+                            case 5:
+                                // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                                vo.setName("ESE");
+                                vo.setData1(winfo.getEse10());
+                                break;
+                            case 6:
+                                // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
+                                vo.setName("SE");
+                                vo.setData1(winfo.getSe10());
+                                break;
+                            case 7:
+                                // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
+                                vo.setName("SSE");
+                                vo.setData1(winfo.getSse10());
+                                break;
+                            case 8:
+                                // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
+                                vo.setName("S");
+                                vo.setData1(winfo.getS10());
+                                break;
+                            case 9:
+                                // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
+                                vo.setName("SSW");
+                                vo.setData1(winfo.getSsw10());
+                                break;
+                            case 10:
+                                // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
+                                vo.setName("SW");
+                                vo.setData1(winfo.getSw10());
+                                break;
+                            case 11:
+                                // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
+                                vo.setName("WSW");
+                                vo.setData1(winfo.getWsw10());
 
-                        case 4:
-                            // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
-                            vo.setName("E");
-                            vo.setData1(winfo.getE10());
-                            break;
-                        case 5:
-                            // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
-                            vo.setName("ESE");
-                            vo.setData1(winfo.getEse10());
-                            break;
-                        case 6:
-                            // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
-                            vo.setName("SE");
-                            vo.setData1(winfo.getSe10());
-                            break;
-                        case 7:
-                            // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
-                            vo.setName("SSE");
-                            vo.setData1(winfo.getSse10());
-                            break;
-                        case 8:
-                            // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
-                            vo.setName("S");
-                            vo.setData1(winfo.getS10());
-                            break;
-                        case 9:
-                            // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
-                            vo.setName("SSW");
-                            vo.setData1(winfo.getSsw10());
-                            break;
-                        case 10:
-                            // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
-                            vo.setName("SW");
-                            vo.setData1(winfo.getSw10());
-                            break;
-                        case 11:
-                            // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
-                            vo.setName("WSW");
-                            vo.setData1(winfo.getWsw10());
+                                break;
+                            case 12:
+                                // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
+                                vo.setName("W");
+                                vo.setData1(winfo.getW10());
+                                break;
+                            case 13:
+                                // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
+                                vo.setName("WNW");
+                                vo.setData1(winfo.getWnw10());
+                                break;
+                            case 14:
+                                // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
+                                vo.setName("NW");
+                                vo.setData1(winfo.getNw10());
+                                break;
+                            case 15:
+                                // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
+                                vo.setName("NNW");
+                                vo.setData1(winfo.getNnw10());
+                                break;
 
-                            break;
-                        case 12:
-                            // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
-                            vo.setName("W");
-                            vo.setData1(winfo.getW10());
-                            break;
-                        case 13:
-                            // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
-                            vo.setName("WNW");
-                            vo.setData1(winfo.getWnw10());
-                            break;
-                        case 14:
-                            // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
-                            vo.setName("NW");
-                            vo.setData1(winfo.getNw10());
-                            break;
-                        case 15:
-                            // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
-                            vo.setName("NNW");
-                            vo.setData1(winfo.getNnw10());
-                            break;
+                            default:
+                                break;
+                        }
 
-                        default:
-                            break;
+                        vos.add(vo);
                     }
 
-                    vos.add(vo);
                 }
 
-            }
+                String jfpl=null;
 
-            String jfpl=null;
+                if (!wtdls.isEmpty()) {
+                    // jfpl="静风频率为"+wtdls.get(0).getCb();
 
-            if (!wtdls.isEmpty()) {
-                // jfpl="静风频率为"+wtdls.get(0).getCb();
+                    int c = (int) wtdls.get(0).getCb().intValue();
 
-                int c = (int) wtdls.get(0).getCb().intValue();
+                    jfpl = "静风频率为" + c;
+                } else {
+                    jfpl = "静风频率为1";
+                }
 
-                jfpl = "静风频率为" + c;
-            } else {
-                jfpl = "静风频率为1";
+                map.put("jfpl"+j, jfpl);
+                map.put("data"+j, vos);
             }
 
-            map.put("jfpl", jfpl);
-            map.put("data", vos);
 
         }
 
@@ -1322,124 +1336,129 @@ public class CompareService {
         if (StringUtils.notEmp(windturbineid) && StringUtils.notEmp(date)) {
             List<ValueVo> vos = new ArrayList<ValueVo>();
 
+            String[] strs=windturbineid.split(",");
+            for(int j=0;j<strs.length;j++)
+            {
+                String wtId=strs[j];
+                List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(wtId, DateUtils.truncate(date));
 
-            List<Windturbinethewindinfo> wtdls = windturbinethewindinfoService.fzy(windturbineid, DateUtils.truncate(date));
+                if (!wtdls.isEmpty()) {
 
-            if (!wtdls.isEmpty()) {
+                    Windturbinethewindinfo winfo = wtdls.get(0);
 
-                Windturbinethewindinfo winfo = wtdls.get(0);
+                    for (int i = 0; i < 16; i++) {
+                        ValueVo vo = new ValueVo();
 
-                for (int i = 0; i < 16; i++) {
-                    ValueVo vo = new ValueVo();
+                        switch (i) {
+                            case 0:
+                                // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
+                                vo.setName("N");
+                                vo.setData1(winfo.getN16());
+                                break;
+                            case 1:
+                                // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
+                                vo.setName("NNE");
+                                vo.setData1(winfo.getNne16());
+                                break;
+                            case 2:
+                                // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
+                                vo.setName("NE");
+                                vo.setData1(winfo.getNe16());
+                                break;
+                            case 3:
+                                // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
+                                vo.setName("ENE");
+                                vo.setData1(winfo.getEne16());
 
-                    switch (i) {
-                        case 0:
-                            // vo.setName("N("+winfo.getN4()+"/"+winfo.getN()+")");
-                            vo.setName("N");
-                            vo.setData1(winfo.getN16());
-                            break;
-                        case 1:
-                            // vo.setName("NNE("+winfo.getNne4()+"/"+winfo.getNne()+")");
-                            vo.setName("NNE");
-                            vo.setData1(winfo.getNne16());
-                            break;
-                        case 2:
-                            // vo.setName("NE("+winfo.getNe4()+"/"+winfo.getNe()+")");
-                            vo.setName("NE");
-                            vo.setData1(winfo.getNe16());
-                            break;
-                        case 3:
-                            // vo.setName("ENE("+winfo.getEne4()+"/"+winfo.getEne()+")");
-                            vo.setName("ENE");
-                            vo.setData1(winfo.getEne16());
+                                break;
+                            case 4:
+                                // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
+                                vo.setName("E");
+                                vo.setData1(winfo.getE16());
+                                break;
+                            case 5:
+                                // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
+                                vo.setName("ESE");
+                                vo.setData1(winfo.getEse16());
+                                break;
+                            case 6:
+                                // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
+                                vo.setName("SE");
+                                vo.setData1(winfo.getSe16());
+                                break;
+                            case 7:
+                                // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
+                                vo.setName("SSE");
+                                vo.setData1(winfo.getSse16());
+                                break;
+                            case 8:
+                                // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
+                                vo.setName("S");
+                                vo.setData1(winfo.getS16());
+                                break;
+                            case 9:
+                                // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
+                                vo.setName("SSW");
+                                vo.setData1(winfo.getSsw16());
+                                break;
+                            case 10:
+                                // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
+                                vo.setName("SW");
+                                vo.setData1(winfo.getSw16());
+                                break;
+                            case 11:
+                                // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
+                                vo.setName("WSW");
+                                vo.setData1(winfo.getWsw16());
 
-                            break;
-                        case 4:
-                            // vo.setName("E("+winfo.getE4()+"/"+winfo.getE()+")");
-                            vo.setName("E");
-                            vo.setData1(winfo.getE16());
-                            break;
-                        case 5:
-                            // vo.setName("ESE("+winfo.getEse()+"/"+winfo.getEse()+")");
-                            vo.setName("ESE");
-                            vo.setData1(winfo.getEse16());
-                            break;
-                        case 6:
-                            // vo.setName("SE("+winfo.getSe4()+"/"+winfo.getSe()+")");
-                            vo.setName("SE");
-                            vo.setData1(winfo.getSe16());
-                            break;
-                        case 7:
-                            // vo.setName("SSE("+winfo.getSse4()+"/"+winfo.getSse()+")");
-                            vo.setName("SSE");
-                            vo.setData1(winfo.getSse16());
-                            break;
-                        case 8:
-                            // vo.setName("S("+winfo.getS4()+"/"+winfo.getS()+")");
-                            vo.setName("S");
-                            vo.setData1(winfo.getS16());
-                            break;
-                        case 9:
-                            // vo.setName("SSW("+winfo.getSsw4()+"/"+winfo.getSsw()+")");
-                            vo.setName("SSW");
-                            vo.setData1(winfo.getSsw16());
-                            break;
-                        case 10:
-                            // vo.setName("SW("+winfo.getSw4()+"/"+winfo.getSw()+")");
-                            vo.setName("SW");
-                            vo.setData1(winfo.getSw16());
-                            break;
-                        case 11:
-                            // vo.setName("WSW("+winfo.getWsw4()+"/"+winfo.getWsw()+")");
-                            vo.setName("WSW");
-                            vo.setData1(winfo.getWsw16());
+                                break;
+                            case 12:
+                                // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
+                                vo.setName("W");
+                                vo.setData1(winfo.getW16());
+                                break;
+                            case 13:
+                                // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
+                                vo.setName("WNW");
+                                vo.setData1(winfo.getWnw16());
+                                break;
+                            case 14:
+                                // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
+                                vo.setName("NW");
+                                vo.setData1(winfo.getNw16());
+                                break;
+                            case 15:
+                                // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
+                                vo.setName("NNW");
+                                vo.setData1(winfo.getNnw16());
+                                break;
 
-                            break;
-                        case 12:
-                            // vo.setName("W("+winfo.getW4()+"/"+winfo.getW()+")");
-                            vo.setName("W");
-                            vo.setData1(winfo.getW16());
-                            break;
-                        case 13:
-                            // vo.setName("WNW("+winfo.getWnw4()+"/"+winfo.getWnw()+")");
-                            vo.setName("WNW");
-                            vo.setData1(winfo.getWnw16());
-                            break;
-                        case 14:
-                            // vo.setName("NW("+winfo.getNw4()+"/"+winfo.getNw()+")");
-                            vo.setName("NW");
-                            vo.setData1(winfo.getNw16());
-                            break;
-                        case 15:
-                            // vo.setName("NNW("+winfo.getNnw4()+"/"+winfo.getNnw()+")");
-                            vo.setName("NNW");
-                            vo.setData1(winfo.getNnw16());
-                            break;
 
+                            default:
+                                break;
+                        }
 
-                        default:
-                            break;
+                        vos.add(vo);
                     }
 
-                    vos.add(vo);
                 }
 
-            }
+                String jfpl=null;
 
-            String jfpl=null;
+                if (!wtdls.isEmpty()) {
+                    // jfpl="静风频率为"+wtdls.get(0).getCb();
 
-            if (!wtdls.isEmpty()) {
-                // jfpl="静风频率为"+wtdls.get(0).getCb();
+                    int c = (int) wtdls.get(0).getCb().intValue();
 
-                int c = (int) wtdls.get(0).getCb().intValue();
+                    jfpl = "静风频率为" + c;
+                } else {
+                    jfpl = "静风频率为1";
+                }
 
-                jfpl = "静风频率为" + c;
-            } else {
-                jfpl = "静风频率为1";
+                map.put("jfpl"+j, jfpl);
+                map.put("data"+j, vos);
             }
 
-            map.put("jfpl", jfpl);
-            map.put("data", vos);
 
         }
 

src/main/resources/mybatis/auto/InputoroutputspeedtotalMapper.xml

@@ -1317,6 +1317,7 @@
     select WINDTURBINEID,avg(dayinputsmall)   xfqr,avg(dayinputsmallratio)   xfqrhgl
     from Inputoroutputspeedtotal
     where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}
+    group by WINDTURBINEID
 
   </select>
 

src/main/resources/mybatis/auto/WindTurbineInfoDay2Mapper.xml

@@ -347,6 +347,6 @@
     select WINDTURBINEID,avg(Monthcoefficient)   glyzxxs
     from WindTurbineInfoDay2
     where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}
-    ORDER BY Recorddate
+    group by WINDTURBINEID
   </select>
 </mapper>

src/main/resources/mybatis/auto/WindTurbineInfoDayMapper.xml

@@ -1410,7 +1410,8 @@
     ,avg(Windhours)   yxfss
     from WindTurbineInfoDay
     where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}
-    ORDER BY Recorddate
+    group by WINDTURBINEID
+
   </select>
 
 

src/main/resources/mybatis/auto/Windturbineinfoday3Mapper.xml

@@ -940,6 +940,7 @@
     ,sum(Daynhcfdl)/10000   slss
     from WindTurbineInfoDay3
     where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}
-    ORDER BY Recorddate
+    group by WINDTURBINEID
+
   </select>
 </mapper>

src/main/resources/mybatis/auto/WindturbinethewindinfoMapper.xml

@@ -4875,6 +4875,6 @@
     select WINDTURBINEID,avg(Cb)   jfpl
     from Windturbinethewindinfo
     where   WINDTURBINEID = #{wtId} and Recorddate >= #{beginDate} and Recorddate < #{endDate}
-    ORDER BY Recorddate
+    group BY WINDTURBINEID
   </select>
 </mapper>

src/test/java/test/CompareTest.java

@@ -1,14 +1,18 @@
 package test;
 
 import com.gyee.SpringbootStart;
+import com.gyee.frame.common.domain.AjaxResult;
 import com.gyee.frame.common.spring.SpringUtils;
 import com.gyee.frame.controller.compare.CompareController;
 import com.gyee.frame.model.custom.Tablepar;
+import com.gyee.frame.model.custom.ValueVo;
 import lombok.SneakyThrows;
 import org.springframework.boot.SpringApplication;
 
 import java.util.Calendar;
 import java.util.Date;
+import java.util.List;
+import java.util.Map;
 
 public class CompareTest {
 
@@ -30,7 +34,7 @@ public class CompareTest {
 
         Date date = c.getTime();
 
-        String wtid="MG01_01";
+        String wtid="MG01_01,MG01_02,MG01_03";
 
         CompareController compareController= SpringUtils.getBean("compareController");
 //
@@ -50,18 +54,18 @@ public class CompareTest {
 //            System.out.println(wtd.getName()+"----------------"+wtd.getValue1()+"----------------"+wtd.getValue2());
 //        }
 
-//        ajaxResult =compareController.fzyDay(wtid,date);
-//
-//        Map<String, Object> test2=(Map<String, Object>)ajaxResult.get("data");
-//        System.out.println(String.valueOf(test2.get("jfpl")));
-//        List<ValueVo> vos =(List<ValueVo>)test2.get("data");
-//
-//        for(ValueVo wtd:vos)
-//        {
-//            System.out.println(wtd.getName()+"----------------"+wtd.getValue()+"----------------"+wtd.getData1());
-//        }
-//        System.out.println("***************************************************************************************");
-//
+        AjaxResult ajaxResult =compareController.fzyDay(wtid,"2021-01-02");
+
+        Map<String, Object> test2=(Map<String, Object>)ajaxResult.get("data");
+        System.out.println(String.valueOf(test2.get("jfpl0")));
+        List<ValueVo> vos =(List<ValueVo>)test2.get("data0");
+
+        for(ValueVo wtd:vos)
+        {
+            System.out.println(wtd.getName()+"----------------"+wtd.getValue()+"----------------"+wtd.getData1());
+        }
+        System.out.println("***************************************************************************************");
+
 //        AjaxResult ajaxResult =compareController.compareDayChat(wtid,date);
 //
 //        List<DataVo> test3=(List<DataVo>)ajaxResult.get("data");