测风塔玫瑰图数据问题处理

generationXK-service/src/main/java/com/gyee/generation/service/WtwindDayInfoService.java

@@ -349,11 +349,11 @@ public class WtwindDayInfoService {
         }
 
 
-//        if (!fxpointls.isEmpty() && !fspointls.isEmpty() && fxpointls.size() == fspointls.size()) {
-        if (!fxpointls.isEmpty() && !fspointls.isEmpty()) {
-            List<PointData> pointData = fxpointls.size() < fspointls.size() ? fxpointls : fspointls;
+        if (!fxpointls.isEmpty() && !fspointls.isEmpty() && (fxpointls.size() == fspointls.size() || Math.abs(fxpointls.size() - fspointls.size()) < 2)) {
+//        if (!fxpointls.isEmpty() && !fspointls.isEmpty()) {
+            int length = Math.min(fxpointls.size(), fspointls.size());
 
-            for (int i = 0; i < pointData.size(); i++) {
+            for (int i = 0; i < length; i++) {
                 double fx = fxpointls.get(i).getPointValueInDouble();
 
                 double lastfx = -1;
@@ -1425,405 +1425,405 @@ public class WtwindDayInfoService {
                 QueryWrapper<ProEconWtwindDayInfo> queryWrapper2 = new QueryWrapper<>();
                 queryWrapper2.eq("record_date", addDay).eq("windTurbine_Id", pewp.getWindturbineId());
                 pepid1ls = proEconWtwindDayInfoService.list(queryWrapper2);
-            }else {
+            } else {
                 setInfoYear(pewp);
             }
 
         }
-            ProEconWtwindDayInfo pepid = pepid1ls.get(0);
-            //年静风次数
-            pewp.setCf(pewp.getCa() + pepid.getCf());
-            //年风次数
-            pewp.setCj(pewp.getCh() + pepid.getCj());
-            if (pewp.getCj() != 0) {
-                pewp.setCg(BigDecimal.valueOf(pewp.getCf()).divide(new BigDecimal(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
-            }
+        ProEconWtwindDayInfo pepid = pepid1ls.get(0);
+        //年静风次数
+        pewp.setCf(pewp.getCa() + pepid.getCf());
+        //年风次数
+        pewp.setCj(pewp.getCh() + pepid.getCj());
+        if (pewp.getCj() != 0) {
+            pewp.setCg(BigDecimal.valueOf(pewp.getCf()).divide(new BigDecimal(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        }
 
-            //平均风速
-            pewp.setE13(BigDecimal.valueOf(pewp.getE() + pepid.getE13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //平均风速
+        pewp.setE13(BigDecimal.valueOf(pewp.getE() + pepid.getE13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getE14() && pepid.getE14() > pewp.getE2()) {
-                pewp.setE14(pepid.getE14());
-            } else {
-                pewp.setE14(pewp.getE2());
-            }
-            //风向次数
-            pewp.setE15(pewp.getE3() + pepid.getE15());
-            //风向频率
-            pewp.setE16(BigDecimal.valueOf(pewp.getE15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getE14() && pepid.getE14() > pewp.getE2()) {
+            pewp.setE14(pepid.getE14());
+        } else {
+            pewp.setE14(pewp.getE2());
+        }
+        //风向次数
+        pewp.setE15(pewp.getE3() + pepid.getE15());
+        //风向频率
+        pewp.setE16(BigDecimal.valueOf(pewp.getE15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setE17(pewp.getE5() + pepid.getE17());
-            //静风频率
+        //静风次数
+        pewp.setE17(pewp.getE5() + pepid.getE17());
+        //静风频率
 
-            double yfxcs = pepid.getCj() + pewp.getCh();
-            if (yfxcs != 0) {
-                pewp.setE18(BigDecimal.valueOf(pewp.getE17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        double yfxcs = pepid.getCj() + pewp.getCh();
+        if (yfxcs != 0) {
+            pewp.setE18(BigDecimal.valueOf(pewp.getE17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setEse13(BigDecimal.valueOf(pewp.getEse() + pepid.getEse13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setEse13(BigDecimal.valueOf(pewp.getEse() + pepid.getEse13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getEse14() && pepid.getEse14() > pewp.getEse2()) {
-                pewp.setEse14(pepid.getEse14());
-            } else {
-                pewp.setEse14(pewp.getEse2());
-            }
-            //风向次数
-            pewp.setEse15(pewp.getEse3() + pepid.getEse15());
-            //风向频率
-            pewp.setEse16(BigDecimal.valueOf(pewp.getEse15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getEse14() && pepid.getEse14() > pewp.getEse2()) {
+            pewp.setEse14(pepid.getEse14());
+        } else {
+            pewp.setEse14(pewp.getEse2());
+        }
+        //风向次数
+        pewp.setEse15(pewp.getEse3() + pepid.getEse15());
+        //风向频率
+        pewp.setEse16(BigDecimal.valueOf(pewp.getEse15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setEse17(pewp.getEse5() + pepid.getEse17());
-            //静风频率
+        //静风次数
+        pewp.setEse17(pewp.getEse5() + pepid.getEse17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setEse18(BigDecimal.valueOf(pewp.getEse17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setEse18(BigDecimal.valueOf(pewp.getEse17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setSe13(BigDecimal.valueOf(pewp.getSe() + pepid.getSe13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setSe13(BigDecimal.valueOf(pewp.getSe() + pepid.getSe13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getSe14() && pepid.getSe14() > pewp.getSe2()) {
-                pewp.setSe14(pepid.getSe14());
-            } else {
-                pewp.setSe14(pewp.getSe2());
-            }
-            //风向次数
-            pewp.setSe15(pewp.getSe3() + pepid.getSe15());
-            //风向频率
-            pewp.setSe16(BigDecimal.valueOf(pewp.getSe15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getSe14() && pepid.getSe14() > pewp.getSe2()) {
+            pewp.setSe14(pepid.getSe14());
+        } else {
+            pewp.setSe14(pewp.getSe2());
+        }
+        //风向次数
+        pewp.setSe15(pewp.getSe3() + pepid.getSe15());
+        //风向频率
+        pewp.setSe16(BigDecimal.valueOf(pewp.getSe15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setSe17(pewp.getSe5() + pepid.getSe17());
-            //静风频率
+        //静风次数
+        pewp.setSe17(pewp.getSe5() + pepid.getSe17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setSe18(BigDecimal.valueOf(pewp.getSe17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setSe18(BigDecimal.valueOf(pewp.getSe17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setSse13(BigDecimal.valueOf(pewp.getSse() + pepid.getSse13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setSse13(BigDecimal.valueOf(pewp.getSse() + pepid.getSse13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getSse14() && pepid.getSse14() > pewp.getSse2()) {
-                pewp.setSse14(pepid.getSse14());
-            } else {
-                pewp.setSse14(pewp.getSse2());
-            }
-            //风向次数
-            pewp.setSse15(pewp.getSse3() + pepid.getSse15());
-            //风向频率
-            pewp.setSse16(BigDecimal.valueOf(pewp.getSse15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getSse14() && pepid.getSse14() > pewp.getSse2()) {
+            pewp.setSse14(pepid.getSse14());
+        } else {
+            pewp.setSse14(pewp.getSse2());
+        }
+        //风向次数
+        pewp.setSse15(pewp.getSse3() + pepid.getSse15());
+        //风向频率
+        pewp.setSse16(BigDecimal.valueOf(pewp.getSse15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setSse17(pewp.getSse5() + pepid.getSse17());
-            //静风频率
+        //静风次数
+        pewp.setSse17(pewp.getSse5() + pepid.getSse17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setSse18(BigDecimal.valueOf(pewp.getSse17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setSse18(BigDecimal.valueOf(pewp.getSse17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setS13(BigDecimal.valueOf(pewp.getS() + pepid.getS13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setS13(BigDecimal.valueOf(pewp.getS() + pepid.getS13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getS14() && pepid.getS14() > pewp.getS2()) {
-                pewp.setS14(pepid.getS14());
-            } else {
-                pewp.setS14(pewp.getS2());
-            }
-            //风向次数
-            pewp.setS15(pewp.getS3() + pepid.getS15());
-            //风向频率
-            pewp.setS16(BigDecimal.valueOf(pewp.getS15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getS14() && pepid.getS14() > pewp.getS2()) {
+            pewp.setS14(pepid.getS14());
+        } else {
+            pewp.setS14(pewp.getS2());
+        }
+        //风向次数
+        pewp.setS15(pewp.getS3() + pepid.getS15());
+        //风向频率
+        pewp.setS16(BigDecimal.valueOf(pewp.getS15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setS17(pewp.getS5() + pepid.getS17());
-            //静风频率
+        //静风次数
+        pewp.setS17(pewp.getS5() + pepid.getS17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setS18(BigDecimal.valueOf(pewp.getS17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setS18(BigDecimal.valueOf(pewp.getS17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setSsw13(BigDecimal.valueOf(pewp.getSsw() + pepid.getSsw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setSsw13(BigDecimal.valueOf(pewp.getSsw() + pepid.getSsw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getSsw14() && pepid.getSsw14() > pewp.getSsw2()) {
-                pewp.setSsw14(pepid.getSsw14());
-            } else {
-                pewp.setSsw14(pewp.getSsw2());
-            }
-            //风向次数
-            pewp.setSsw15(pewp.getSsw3() + pepid.getSsw15());
-            //风向频率
-            pewp.setSsw16(BigDecimal.valueOf(pewp.getSsw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getSsw14() && pepid.getSsw14() > pewp.getSsw2()) {
+            pewp.setSsw14(pepid.getSsw14());
+        } else {
+            pewp.setSsw14(pewp.getSsw2());
+        }
+        //风向次数
+        pewp.setSsw15(pewp.getSsw3() + pepid.getSsw15());
+        //风向频率
+        pewp.setSsw16(BigDecimal.valueOf(pewp.getSsw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setSsw17(pewp.getSsw5() + pepid.getSsw17());
-            //静风频率
+        //静风次数
+        pewp.setSsw17(pewp.getSsw5() + pepid.getSsw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setSsw18(BigDecimal.valueOf(pewp.getSsw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setSsw18(BigDecimal.valueOf(pewp.getSsw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setSw13(BigDecimal.valueOf(pewp.getSw() + pepid.getSw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setSw13(BigDecimal.valueOf(pewp.getSw() + pepid.getSw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getSw14() && pepid.getSw14() > pewp.getSw2()) {
-                pewp.setSw14(pepid.getSw14());
-            } else {
-                pewp.setSw14(pewp.getSw2());
-            }
-            //风向次数
-            pewp.setSw15(pewp.getSw3() + pepid.getSw15());
-            //风向频率
-            pewp.setSw16(BigDecimal.valueOf(pewp.getSw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getSw14() && pepid.getSw14() > pewp.getSw2()) {
+            pewp.setSw14(pepid.getSw14());
+        } else {
+            pewp.setSw14(pewp.getSw2());
+        }
+        //风向次数
+        pewp.setSw15(pewp.getSw3() + pepid.getSw15());
+        //风向频率
+        pewp.setSw16(BigDecimal.valueOf(pewp.getSw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setSw17(pewp.getSw5() + pepid.getSw17());
-            //静风频率
+        //静风次数
+        pewp.setSw17(pewp.getSw5() + pepid.getSw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setSw18(BigDecimal.valueOf(pewp.getSw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setSw18(BigDecimal.valueOf(pewp.getSw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setWsw13(BigDecimal.valueOf(pewp.getWsw() + pepid.getWsw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setWsw13(BigDecimal.valueOf(pewp.getWsw() + pepid.getWsw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getWsw14() && pepid.getWsw14() > pewp.getWsw2()) {
-                pewp.setWsw14(pepid.getWsw14());
-            } else {
-                pewp.setWsw14(pewp.getWsw2());
-            }
-            //风向次数
-            pewp.setWsw15(pewp.getWsw3() + pepid.getWsw15());
-            //风向频率
-            pewp.setWsw16(BigDecimal.valueOf(pewp.getWsw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getWsw14() && pepid.getWsw14() > pewp.getWsw2()) {
+            pewp.setWsw14(pepid.getWsw14());
+        } else {
+            pewp.setWsw14(pewp.getWsw2());
+        }
+        //风向次数
+        pewp.setWsw15(pewp.getWsw3() + pepid.getWsw15());
+        //风向频率
+        pewp.setWsw16(BigDecimal.valueOf(pewp.getWsw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setWsw17(pewp.getWsw5() + pepid.getWsw17());
-            //静风频率
+        //静风次数
+        pewp.setWsw17(pewp.getWsw5() + pepid.getWsw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setWsw18(BigDecimal.valueOf(pewp.getWsw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setWsw18(BigDecimal.valueOf(pewp.getWsw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setW13(BigDecimal.valueOf(pewp.getW() + pepid.getW13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setW13(BigDecimal.valueOf(pewp.getW() + pepid.getW13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getW14() && pepid.getW14() > pewp.getW2()) {
-                pewp.setW14(pepid.getW14());
-            } else {
-                pewp.setW14(pewp.getW2());
-            }
-            //风向次数
-            pewp.setW15(pewp.getW3() + pepid.getW15());
-            //风向频率
-            pewp.setW16(BigDecimal.valueOf(pewp.getW15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getW14() && pepid.getW14() > pewp.getW2()) {
+            pewp.setW14(pepid.getW14());
+        } else {
+            pewp.setW14(pewp.getW2());
+        }
+        //风向次数
+        pewp.setW15(pewp.getW3() + pepid.getW15());
+        //风向频率
+        pewp.setW16(BigDecimal.valueOf(pewp.getW15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setW17(pewp.getW5() + pepid.getW17());
-            //静风频率
+        //静风次数
+        pewp.setW17(pewp.getW5() + pepid.getW17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setW18(BigDecimal.valueOf(pewp.getW17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setW18(BigDecimal.valueOf(pewp.getW17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setWnw13(BigDecimal.valueOf(pewp.getWnw() + pepid.getWnw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setWnw13(BigDecimal.valueOf(pewp.getWnw() + pepid.getWnw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getWnw14() && pepid.getWnw14() > pewp.getWnw2()) {
-                pewp.setWnw14(pepid.getWnw14());
-            } else {
-                pewp.setWnw14(pewp.getWnw2());
-            }
-            //风向次数
-            pewp.setWnw15(pewp.getWnw3() + pepid.getWnw15());
-            //风向频率
-            pewp.setWnw16(BigDecimal.valueOf(pewp.getWnw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getWnw14() && pepid.getWnw14() > pewp.getWnw2()) {
+            pewp.setWnw14(pepid.getWnw14());
+        } else {
+            pewp.setWnw14(pewp.getWnw2());
+        }
+        //风向次数
+        pewp.setWnw15(pewp.getWnw3() + pepid.getWnw15());
+        //风向频率
+        pewp.setWnw16(BigDecimal.valueOf(pewp.getWnw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setWnw17(pewp.getWnw5() + pepid.getWnw17());
-            //静风频率
+        //静风次数
+        pewp.setWnw17(pewp.getWnw5() + pepid.getWnw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setWnw18(BigDecimal.valueOf(pewp.getWnw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setWnw18(BigDecimal.valueOf(pewp.getWnw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setNw13(BigDecimal.valueOf(pewp.getNw() + pepid.getNw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setNw13(BigDecimal.valueOf(pewp.getNw() + pepid.getNw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getNw14() && pepid.getNw14() > pewp.getNw2()) {
-                pewp.setNw14(pepid.getNw14());
-            } else {
-                pewp.setNw14(pewp.getNw2());
-            }
-            //风向次数
-            pewp.setNw15(pewp.getNw3() + pepid.getNw15());
-            //风向频率
-            pewp.setNw16(BigDecimal.valueOf(pewp.getNw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getNw14() && pepid.getNw14() > pewp.getNw2()) {
+            pewp.setNw14(pepid.getNw14());
+        } else {
+            pewp.setNw14(pewp.getNw2());
+        }
+        //风向次数
+        pewp.setNw15(pewp.getNw3() + pepid.getNw15());
+        //风向频率
+        pewp.setNw16(BigDecimal.valueOf(pewp.getNw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setNw17(pewp.getNw5() + pepid.getNw17());
-            //静风频率
+        //静风次数
+        pewp.setNw17(pewp.getNw5() + pepid.getNw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setNw18(BigDecimal.valueOf(pewp.getNw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setNw18(BigDecimal.valueOf(pewp.getNw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setNnw13(BigDecimal.valueOf(pewp.getNnw() + pepid.getNnw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setNnw13(BigDecimal.valueOf(pewp.getNnw() + pepid.getNnw13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getNnw14() && pepid.getNnw14() > pewp.getNnw2()) {
-                pewp.setNnw14(pepid.getNnw14());
-            } else {
-                pewp.setNnw14(pewp.getNnw2());
-            }
-            //风向次数
-            pewp.setNnw15(pewp.getNnw3() + pepid.getNnw15());
-            //风向频率
-            pewp.setNnw16(BigDecimal.valueOf(pewp.getNnw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getNnw14() && pepid.getNnw14() > pewp.getNnw2()) {
+            pewp.setNnw14(pepid.getNnw14());
+        } else {
+            pewp.setNnw14(pewp.getNnw2());
+        }
+        //风向次数
+        pewp.setNnw15(pewp.getNnw3() + pepid.getNnw15());
+        //风向频率
+        pewp.setNnw16(BigDecimal.valueOf(pewp.getNnw15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setNnw17(pewp.getNnw5() + pepid.getNnw17());
-            //静风频率
+        //静风次数
+        pewp.setNnw17(pewp.getNnw5() + pepid.getNnw17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setNnw18(BigDecimal.valueOf(pewp.getNnw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setNnw18(BigDecimal.valueOf(pewp.getNnw17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setN13(BigDecimal.valueOf(pewp.getN() + pepid.getN13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setN13(BigDecimal.valueOf(pewp.getN() + pepid.getN13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getN14() && pepid.getN14() > pewp.getN2()) {
-                pewp.setN14(pepid.getN14());
-            } else {
-                pewp.setN14(pewp.getN2());
-            }
-            //风向次数
-            pewp.setN15(pewp.getN3() + pepid.getN15());
-            //风向频率
-            pewp.setN16(BigDecimal.valueOf(pewp.getN15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getN14() && pepid.getN14() > pewp.getN2()) {
+            pewp.setN14(pepid.getN14());
+        } else {
+            pewp.setN14(pewp.getN2());
+        }
+        //风向次数
+        pewp.setN15(pewp.getN3() + pepid.getN15());
+        //风向频率
+        pewp.setN16(BigDecimal.valueOf(pewp.getN15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setN17(pewp.getN5() + pepid.getN17());
-            //静风频率
+        //静风次数
+        pewp.setN17(pewp.getN5() + pepid.getN17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setN18(BigDecimal.valueOf(pewp.getN17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setN18(BigDecimal.valueOf(pewp.getN17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setNne13(BigDecimal.valueOf(pewp.getNne() + pepid.getNne13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setNne13(BigDecimal.valueOf(pewp.getNne() + pepid.getNne13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getNne14() && pepid.getNne14() > pewp.getNne2()) {
-                pewp.setNne14(pepid.getNne14());
-            } else {
-                pewp.setNne14(pewp.getNne2());
-            }
-            //风向次数
-            pewp.setNne15(pewp.getNne3() + pepid.getNne15());
-            //风向频率
-            pewp.setNne16(BigDecimal.valueOf(pewp.getNne15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getNne14() && pepid.getNne14() > pewp.getNne2()) {
+            pewp.setNne14(pepid.getNne14());
+        } else {
+            pewp.setNne14(pewp.getNne2());
+        }
+        //风向次数
+        pewp.setNne15(pewp.getNne3() + pepid.getNne15());
+        //风向频率
+        pewp.setNne16(BigDecimal.valueOf(pewp.getNne15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setNne17(pewp.getNne5() + pepid.getNne17());
-            //静风频率
+        //静风次数
+        pewp.setNne17(pewp.getNne5() + pepid.getNne17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setNne18(BigDecimal.valueOf(pewp.getNne17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setNne18(BigDecimal.valueOf(pewp.getNne17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setNe13(BigDecimal.valueOf(pewp.getNe() + pepid.getNe13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setNe13(BigDecimal.valueOf(pewp.getNe() + pepid.getNe13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getNe14() && pepid.getNe14() > pewp.getNe2()) {
-                pewp.setNe14(pepid.getNe14());
-            } else {
-                pewp.setNe14(pewp.getNe2());
-            }
-            //风向次数
-            pewp.setNe15(pewp.getNe3() + pepid.getNe15());
-            //风向频率
-            pewp.setNe16(BigDecimal.valueOf(pewp.getNe15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getNe14() && pepid.getNe14() > pewp.getNe2()) {
+            pewp.setNe14(pepid.getNe14());
+        } else {
+            pewp.setNe14(pewp.getNe2());
+        }
+        //风向次数
+        pewp.setNe15(pewp.getNe3() + pepid.getNe15());
+        //风向频率
+        pewp.setNe16(BigDecimal.valueOf(pewp.getNe15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setNe17(pewp.getNe5() + pepid.getNe17());
-            //静风频率
+        //静风次数
+        pewp.setNe17(pewp.getNe5() + pepid.getNe17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setNe18(BigDecimal.valueOf(pewp.getNe17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setNe18(BigDecimal.valueOf(pewp.getNe17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
-            //平均风速
-            pewp.setEne13(BigDecimal.valueOf(pewp.getEne() + pepid.getEne13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
+        //*******************************************************************************************************************/
+        //平均风速
+        pewp.setEne13(BigDecimal.valueOf(pewp.getEne() + pepid.getEne13()).divide(new BigDecimal(2), 2, RoundingMode.HALF_EVEN).doubleValue());
 
-            //最大风速
-            if (null != pepid.getEne14() && pepid.getEne14() > pewp.getEne2()) {
-                pewp.setEne14(pepid.getEne14());
-            } else {
-                pewp.setEne14(pewp.getEne2());
-            }
-            //风向次数
-            pewp.setEne15(pewp.getEne3() + pepid.getEne15());
-            //风向频率
-            pewp.setEne16(BigDecimal.valueOf(pewp.getEne15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        //最大风速
+        if (null != pepid.getEne14() && pepid.getEne14() > pewp.getEne2()) {
+            pewp.setEne14(pepid.getEne14());
+        } else {
+            pewp.setEne14(pewp.getEne2());
+        }
+        //风向次数
+        pewp.setEne15(pewp.getEne3() + pepid.getEne15());
+        //风向频率
+        pewp.setEne16(BigDecimal.valueOf(pewp.getEne15()).divide(BigDecimal.valueOf(pewp.getCj()), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            //静风次数
-            pewp.setEne17(pewp.getEne5() + pepid.getEne17());
-            //静风频率
+        //静风次数
+        pewp.setEne17(pewp.getEne5() + pepid.getEne17());
+        //静风频率
 
-            if (yfxcs != 0) {
-                pewp.setEne18(BigDecimal.valueOf(pewp.getEne17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
+        if (yfxcs != 0) {
+            pewp.setEne18(BigDecimal.valueOf(pewp.getEne17()).divide(new BigDecimal(yfxcs), 2, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).doubleValue());
 
-            }
+        }
 
-            //*******************************************************************************************************************/
+        //*******************************************************************************************************************/
 
 
     }

generationXK-service/src/main/java/com/gyee/generation/task/SaticSchedulePgTask.java

@@ -281,39 +281,38 @@ public class SaticSchedulePgTask {
      * 日、月、年功率曲线拟合
      * 每天执行一次
      */
-        @XxlJob("powerCurveFittingnew_PG")
-        public void powerCurveFittingnew_PG()  {
+    @XxlJob("powerCurveFittingnew_PG")
+    public void powerCurveFittingnew_PG() {
 
-            XxlJobHelper.log("日、月、年功率曲线拟合调度程序执行开始!........");
+        XxlJobHelper.log("日、月、年功率曲线拟合调度程序执行开始!........");
 
-            Date date=new Date();
-            try {
+        Date date = new Date();
+        try {
 //                XxlJobHelper.log("日序执行开始!........");
 //                powerCurveFittingByTimeService.cureFittingDay(date);
 //                XxlJobHelper.log("日处理完成!........");
 
-                XxlJobHelper.log("月序执行开始!........");
-                powerCurveFittingByTimeService.cureFittingMonth(date,"0",null);
-                XxlJobHelper.log("月处理完成!........");
+            XxlJobHelper.log("月序执行开始!........");
+            powerCurveFittingByTimeService.cureFittingMonth(date, "0", null);
+            XxlJobHelper.log("月处理完成!........");
 
 //                XxlJobHelper.log("年序执行开始!........");
 //                powerCurveFittingByTimeService.cureFittingYear(date);
 //                XxlJobHelper.log("年处理完成!........");
 
-    //            powerCurveFittingByTimeGfService.cureFittingDay(date);
+            //            powerCurveFittingByTimeGfService.cureFittingDay(date);
 //                powerCurveFittingByTimeGfService.cureFittingMonth(date,"0");
-    //            powerCurveFittingByTimeGfService.cureFittingYear(date);
-
+            //            powerCurveFittingByTimeGfService.cureFittingYear(date);
 
 
-            } catch (Exception e) {
-                e.printStackTrace();
-                XxlJobHelper.log(e.getMessage());
-            }
-
-            XxlJobHelper.log("日、月、年功率曲线拟合调度任务处理完成!........");
+        } catch (Exception e) {
+            e.printStackTrace();
+            XxlJobHelper.log(e.getMessage());
         }
 
+        XxlJobHelper.log("日、月、年功率曲线拟合调度任务处理完成!........");
+    }
+
 
     /**
      * 惠安风电场功率预测
@@ -1097,7 +1096,6 @@ public class SaticSchedulePgTask {
     @XxlJob("wtwindDayInfo_PG")
     public void wtwindDayInfo_PG() {
 
-
         XxlJobHelper.log("设备风资源统计调度程序执行开始!........");
         try {
             wtwindDayInfoService.calWtwindDayInfo(new Date());
@@ -1108,7 +1106,6 @@ public class SaticSchedulePgTask {
     }
 
 
-
 //    @XxlJob("wtwindDayInfo_PG")
 //    public void wtwindDayInfo_PG() {
 //
@@ -1116,26 +1113,25 @@ public class SaticSchedulePgTask {
 //        DateTime dateTimeEnd = DateUtil.endOfDay(dateTime);
 //        int ilength = DateUtil.dayOfYear(new Date());
 //
-//        DateTime parse = DateUtil.parse("2025-08-27 23:59:10", "yyyy-MM-dd HH:mm:ss");
-//        for (int i = 0; i < ilength; i++) {
+//        DateTime parse = DateUtil.parse("2025-09-02 23:59:10", "yyyy-MM-dd HH:mm:ss");
+////        for (int i = 0; i < ilength; i++) {
 //            try {
-//                DateTime offset = DateUtil.offset(dateTimeEnd, DateField.DAY_OF_MONTH, i);
+////                DateTime offset = DateUtil.offset(dateTimeEnd, DateField.DAY_OF_MONTH, i);
 //                wtwindDayInfoService.calWtwindDayInfo(parse);
 //            } catch (Exception e) {
 //                e.printStackTrace();
 //            }
-//        }
+////        }
 //    }
 
 
     /**
      * 场站风资源统计调度
-     * 每天2点执行一次
+     * 每天23:59:00点执行一次
      */
     @XxlJob("wpwindDayInfo_PG")
     public void wpwindDayInfo_PG() {
 
-
         XxlJobHelper.log("场站风资源统计调度程序执行开始!........");
         try {
             wpwindDayInfoService.calWpwindDayInfo(new Date());
@@ -1145,6 +1141,24 @@ public class SaticSchedulePgTask {
         XxlJobHelper.log("场站风资源统计调度任务处理完成!........");
     }
 
+//    @XxlJob("wpwindDayInfo_PG")
+//    public void wpwindDayInfo_PG() {
+//        DateTime dateTime = DateUtil.beginOfYear(new Date());
+//        DateTime dateTimeEnd = DateUtil.endOfDay(dateTime);
+//        int ilength = DateUtil.dayOfYear(new Date());
+////        DateTime parse = DateUtil.parse("2025-02-10 23:59:10", "yyyy-MM-dd HH:mm:ss");
+//        for (int i = 0; i < ilength - 1; i++) {
+//            try {
+//                DateTime offset = DateUtil.offset(dateTimeEnd, DateField.DAY_OF_MONTH, i);
+//                wpwindDayInfoService.calWpwindDayInfo(offset);
+//            } catch (Exception e) {
+//                e.printStackTrace();
+//            }
+//        }
+//        XxlJobHelper.log("场站风资源统计调度任务处理完成!........");
+//    }
+
+
     /**
      * 对风偏差率
      * 每日0点15执行
@@ -1758,8 +1772,6 @@ public class SaticSchedulePgTask {
     //    }
 
 
-
-
     /**
      * 光伏数据写入
      */
@@ -1795,7 +1807,6 @@ public class SaticSchedulePgTask {
     }
 
 
-
     /**
      * 一/二期风机运行参数
      */

generationXK-service/src/test/java/com/gyee/generation/SaticScheduleCALTaskTest.java

@@ -68,11 +68,11 @@ public class SaticScheduleCALTaskTest {
 
 
 //        saticSchedulePgTask.inputOrOutPutSpeed_PG();
-        //saticSchedulePgTask.inputOrOutPut_PG();
+//        saticSchedulePgTask.inputOrOutPut_PG();
 //        saticSchedulePgTask.shutdown_PG();
 
-        //saticSchedulePgTask.wtwindDayInfo_PG();
-        //saticSchedulePgTask.wpwindDayInfo_PG();
+//        saticSchedulePgTask.wtwindDayInfo_PG();
+//        saticSchedulePgTask.wpwindDayInfo_PG();
 
 //        saticSchedulePgTask.equipment_PowerInfo1_PG();
         //saticSchedulePgTask.equipment_PowerInfo2_PG();

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WpwindDayInfoService.java

@@ -79,7 +79,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN() ? winfo.getN() : 0.0;
                             temp3 = null != winfo.getN4() ? winfo.getN4() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -88,7 +88,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne() ? winfo.getNne() : 0.0;
                             temp3 = null != winfo.getNne4() ? winfo.getNne4() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -97,7 +97,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe() ? winfo.getNe() : 0.0;
                             temp3 = null != winfo.getNe4() ? winfo.getNe4() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -106,7 +106,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne() ? winfo.getEne() : 0.0;
                             temp3 = null != winfo.getEne4() ? winfo.getEne4() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -116,7 +116,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE() ? winfo.getE() : 0.0;
                             temp3 = null != winfo.getE4() ? winfo.getE4() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -124,7 +124,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse4() ? winfo.getEse4() : 0.0;
                             temp2 = null != winfo.getEse() ? winfo.getEse() : 0.0;
                             temp3 = null != winfo.getEse4() ? winfo.getEse4() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -132,21 +132,21 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe() ? winfo.getSe() : 0.0;
                             temp3 = null != winfo.getSe4() ? winfo.getSe4() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse4() ? winfo.getSse4() : 0.0;
                             temp2 = null != winfo.getSse() ? winfo.getSse() : 0.0;
                             temp3 = null != winfo.getSse4() ? winfo.getSse4() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS4() ? winfo.getS4() : 0.0;
                             temp2 = null != winfo.getS() ? winfo.getS() : 0.0;
                             temp3 = null != winfo.getS4() ? winfo.getS4() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -154,7 +154,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw() ? winfo.getSsw() : 0.0;
                             temp3 = null != winfo.getSsw4() ? winfo.getSsw4() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -162,7 +162,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw() ? winfo.getSw() : 0.0;
                             temp3 = null != winfo.getSw4() ? winfo.getSw4() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -171,7 +171,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw() ? winfo.getWsw() : 0.0;
                             temp3 = null != winfo.getWsw4() ? winfo.getWsw4() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -180,7 +180,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW() ? winfo.getW() : 0.0;
                             temp3 = null != winfo.getW4() ? winfo.getW4() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -189,7 +189,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw() ? winfo.getWnw() : 0.0;
                             temp3 = null != winfo.getWnw4() ? winfo.getWnw4() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -198,7 +198,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw() ? winfo.getNw() : 0.0;
                             temp3 = null != winfo.getNw4() ? winfo.getNw4() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -207,7 +207,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw() ? winfo.getNnw() : 0.0;
                             temp3 = null != winfo.getNnw4() ? winfo.getNnw4() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -262,7 +262,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN7() ? winfo.getN7() : 0.0;
                             temp3 = null != winfo.getN10() ? winfo.getN10() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -271,7 +271,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne7() ? winfo.getNne7() : 0.0;
                             temp3 = null != winfo.getNne10() ? winfo.getNne10() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -280,7 +280,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe7() ? winfo.getNe7() : 0.0;
                             temp3 = null != winfo.getNe10() ? winfo.getNe10() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -289,7 +289,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne7() ? winfo.getEne7() : 0.0;
                             temp3 = null != winfo.getEne10() ? winfo.getEne10() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -299,7 +299,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE7() ? winfo.getE7() : 0.0;
                             temp3 = null != winfo.getE10() ? winfo.getE10() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -307,7 +307,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse10() ? winfo.getEse10() : 0.0;
                             temp2 = null != winfo.getEse7() ? winfo.getEse7() : 0.0;
                             temp3 = null != winfo.getEse10() ? winfo.getEse10() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -315,21 +315,21 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe7() ? winfo.getSe7() : 0.0;
                             temp3 = null != winfo.getSe10() ? winfo.getSe10() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse10() ? winfo.getSse10() : 0.0;
                             temp2 = null != winfo.getSse7() ? winfo.getSse7() : 0.0;
                             temp3 = null != winfo.getSse10() ? winfo.getSse10() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS10() ? winfo.getS10() : 0.0;
                             temp2 = null != winfo.getS7() ? winfo.getS7() : 0.0;
                             temp3 = null != winfo.getS10() ? winfo.getS10() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -337,7 +337,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw7() ? winfo.getSsw7() : 0.0;
                             temp3 = null != winfo.getSsw10() ? winfo.getSsw10() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -345,7 +345,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw7() ? winfo.getSw7() : 0.0;
                             temp3 = null != winfo.getSw10() ? winfo.getSw10() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -354,7 +354,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw7() ? winfo.getWsw7() : 0.0;
                             temp3 = null != winfo.getWsw10() ? winfo.getWsw10() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -363,7 +363,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW7() ? winfo.getW7() : 0.0;
                             temp3 = null != winfo.getW10() ? winfo.getW10() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -372,7 +372,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw7() ? winfo.getWnw7() : 0.0;
                             temp3 = null != winfo.getWnw10() ? winfo.getWnw10() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -381,7 +381,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw7() ? winfo.getNw7() : 0.0;
                             temp3 = null != winfo.getNw10() ? winfo.getNw10() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -390,7 +390,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw7() ? winfo.getNnw7() : 0.0;
                             temp3 = null != winfo.getNnw10() ? winfo.getNnw10() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -444,7 +444,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN13() ? winfo.getN13() : 0.0;
                             temp3 = null != winfo.getN16() ? winfo.getN16() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -453,7 +453,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne13() ? winfo.getNne13() : 0.0;
                             temp3 = null != winfo.getNne16() ? winfo.getNne16() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -462,7 +462,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe13() ? winfo.getNe13() : 0.0;
                             temp3 = null != winfo.getNe16() ? winfo.getNe16() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -471,7 +471,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne13() ? winfo.getEne13() : 0.0;
                             temp3 = null != winfo.getEne16() ? winfo.getEne16() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -482,7 +482,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE13() ? winfo.getE13() : 0.0;
                             temp3 = null != winfo.getE16() ? winfo.getE16() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -490,7 +490,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse16() ? winfo.getEse16() : 0.0;
                             temp2 = null != winfo.getEse13() ? winfo.getEse13() : 0.0;
                             temp3 = null != winfo.getEse16() ? winfo.getEse16() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -498,21 +498,21 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe13() ? winfo.getSe13() : 0.0;
                             temp3 = null != winfo.getSe16() ? winfo.getSe16() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse16() ? winfo.getSse16() : 0.0;
                             temp2 = null != winfo.getSse13() ? winfo.getSse13() : 0.0;
                             temp3 = null != winfo.getSse16() ? winfo.getSse16() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS16() ? winfo.getS16() : 0.0;
                             temp2 = null != winfo.getS13() ? winfo.getS13() : 0.0;
                             temp3 = null != winfo.getS16() ? winfo.getS16() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -520,7 +520,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw13() ? winfo.getSsw13() : 0.0;
                             temp3 = null != winfo.getSsw16() ? winfo.getSsw16() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -528,7 +528,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw13() ? winfo.getSw13() : 0.0;
                             temp3 = null != winfo.getSw16() ? winfo.getSw16() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -537,7 +537,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw13() ? winfo.getWsw13() : 0.0;
                             temp3 = null != winfo.getWsw16() ? winfo.getWsw16() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -546,7 +546,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW13() ? winfo.getW13() : 0.0;
                             temp3 = null != winfo.getW16() ? winfo.getW16() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -555,7 +555,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw13() ? winfo.getWnw13() : 0.0;
                             temp3 = null != winfo.getWnw16() ? winfo.getWnw16() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -564,7 +564,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw13() ? winfo.getNw13() : 0.0;
                             temp3 = null != winfo.getNw16() ? winfo.getNw16() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -573,7 +573,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw13() ? winfo.getNnw13() : 0.0;
                             temp3 = null != winfo.getNnw16() ? winfo.getNnw16() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -629,7 +629,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN() ? winfo.getN() : 0.0;
                             temp3 = null != winfo.getN2() ? winfo.getN2() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("N(" + winfo.getN4() + "/" + winfo.getN() + ")");
                             //
@@ -640,7 +640,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne() ? winfo.getNne() : 0.0;
                             temp3 = null != winfo.getNne2() ? winfo.getNne2() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NNE(" + winfo.getNne4() + "/" + winfo.getNne() + ")");
                             //
@@ -651,7 +651,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe() ? winfo.getNe() : 0.0;
                             temp3 = null != winfo.getNe2() ? winfo.getNe2() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NE(" + winfo.getNe4() + "/" + winfo.getNe() + ")");
                             //
@@ -662,7 +662,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne() ? winfo.getEne() : 0.0;
                             temp3 = null != winfo.getEne2() ? winfo.getEne2() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("ENE(" + winfo.getEne4() + "/" + winfo.getEne() + ")");
                             //
@@ -674,7 +674,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE() ? winfo.getE() : 0.0;
                             temp3 = null != winfo.getE2() ? winfo.getE2() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //vo.setName("E(" + winfo.getE4() + "/" + winfo.getE() + ")");
 
@@ -684,7 +684,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse4() ? winfo.getEse4() : 0.0;
                             temp2 = null != winfo.getEse() ? winfo.getEse() : 0.0;
                             temp3 = null != winfo.getEse2() ? winfo.getEse2() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             //vo.setName("ESE(" + winfo.getEse4() + "/" + winfo.getEse() + ")");
 
                             vo.setData1(temp3);
@@ -694,7 +694,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe() ? winfo.getSe() : 0.0;
                             temp3 = null != winfo.getSe2() ? winfo.getSe2() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             //vo.setName("SE(" + winfo.getSe4() + "/" + winfo.getSe() + ")");
 
                             vo.setData1(temp3);
@@ -703,7 +703,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getSse4() ? winfo.getSse4() : 0.0;
                             temp2 = null != winfo.getSse() ? winfo.getSse() : 0.0;
                             temp3 = null != winfo.getSse2() ? winfo.getSse2() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             //	vo.setName("SSE(" + winfo.getSse4() + "/" + winfo.getSse() + ")");
 
                             vo.setData1(temp3);
@@ -712,7 +712,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getS4() ? winfo.getS4() : 0.0;
                             temp2 = null != winfo.getS() ? winfo.getS() : 0.0;
                             temp3 = null != winfo.getS2() ? winfo.getS2() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             //vo.setName("S(" + winfo.getS4() + "/" + winfo.getS() + ")");
 
                             vo.setData1(temp3);
@@ -722,7 +722,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw() ? winfo.getSsw() : 0.0;
                             temp3 = null != winfo.getSsw2() ? winfo.getSsw2() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             //						vo.setName("SSW(" + winfo.getSsw4() + "/" + winfo.getSsw() + ")");
@@ -733,7 +733,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw() ? winfo.getSw() : 0.0;
                             temp3 = null != winfo.getSw2() ? winfo.getSw2() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("SW(" + winfo.getSw4() + "/" + winfo.getSw() + ")");
                             //
@@ -744,7 +744,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw() ? winfo.getWsw() : 0.0;
                             temp3 = null != winfo.getWsw2() ? winfo.getWsw2() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             //						vo.setName("WSW(" + winfo.getWsw4() + "/" + winfo.getWsw() + ")");
@@ -757,7 +757,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW() ? winfo.getW() : 0.0;
                             temp3 = null != winfo.getW2() ? winfo.getW2() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("W(" + winfo.getW4() + "/" + winfo.getW() + ")");
                             //
@@ -768,7 +768,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw() ? winfo.getWnw() : 0.0;
                             temp3 = null != winfo.getWnw2() ? winfo.getWnw2() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("WNW(" + winfo.getWnw4() + "/" + winfo.getWnw() + ")");
                             //
@@ -779,7 +779,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw() ? winfo.getNw() : 0.0;
                             temp3 = null != winfo.getNw2() ? winfo.getNw2() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NW(" + winfo.getNw4() + "/" + winfo.getNw() + ")");
                             //
@@ -790,7 +790,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw() ? winfo.getNnw() : 0.0;
                             temp3 = null != winfo.getNnw2() ? winfo.getNnw2() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NNW(" + winfo.getNnw4() + "/" + winfo.getNnw() + ")");
                             //
@@ -846,7 +846,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN7() ? winfo.getN7() : 0.0;
                             temp3 = null != winfo.getN8() ? winfo.getN8() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -855,7 +855,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne7() ? winfo.getNne7() : 0.0;
                             temp3 = null != winfo.getNne8() ? winfo.getNne8() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -864,7 +864,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe7() ? winfo.getNe7() : 0.0;
                             temp3 = null != winfo.getNe8() ? winfo.getNe8() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -873,7 +873,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne7() ? winfo.getEne7() : 0.0;
                             temp3 = null != winfo.getEne8() ? winfo.getEne8() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -883,7 +883,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE7() ? winfo.getE7() : 0.0;
                             temp3 = null != winfo.getE8() ? winfo.getE8() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -891,7 +891,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse10() ? winfo.getEse10() : 0.0;
                             temp2 = null != winfo.getEse7() ? winfo.getEse7() : 0.0;
                             temp3 = null != winfo.getEse8() ? winfo.getEse8() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -899,21 +899,21 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe7() ? winfo.getSe7() : 0.0;
                             temp3 = null != winfo.getSe8() ? winfo.getSe8() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse10() ? winfo.getSse10() : 0.0;
                             temp2 = null != winfo.getSse7() ? winfo.getSse7() : 0.0;
                             temp3 = null != winfo.getSse8() ? winfo.getSse8() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS10() ? winfo.getS10() : 0.0;
                             temp2 = null != winfo.getS7() ? winfo.getS7() : 0.0;
                             temp3 = null != winfo.getS8() ? winfo.getS8() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -921,7 +921,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw7() ? winfo.getSsw7() : 0.0;
                             temp3 = null != winfo.getSsw8() ? winfo.getSsw8() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -929,7 +929,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw7() ? winfo.getSw7() : 0.0;
                             temp3 = null != winfo.getSw8() ? winfo.getSw8() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -938,7 +938,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw7() ? winfo.getWsw7() : 0.0;
                             temp3 = null != winfo.getWsw8() ? winfo.getWsw8() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -947,7 +947,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW7() ? winfo.getW7() : 0.0;
                             temp3 = null != winfo.getW8() ? winfo.getW8() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -956,7 +956,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw7() ? winfo.getWnw7() : 0.0;
                             temp3 = null != winfo.getWnw8() ? winfo.getWnw8() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -965,7 +965,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw7() ? winfo.getNw7() : 0.0;
                             temp3 = null != winfo.getNw8() ? winfo.getNw8() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -974,7 +974,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw7() ? winfo.getNnw7() : 0.0;
                             temp3 = null != winfo.getNnw8() ? winfo.getNnw8() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1022,7 +1022,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getN13() ? winfo.getN13() : 0.0;
                             temp3 = null != winfo.getN14() ? winfo.getN14() : 0.0;
 
-                            vo.setName("N (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1031,7 +1031,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNne13() ? winfo.getNne13() : 0.0;
                             temp3 = null != winfo.getNne14() ? winfo.getNne14() : 0.0;
 
-                            vo.setName("NNE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1040,7 +1040,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNe13() ? winfo.getNe13() : 0.0;
                             temp3 = null != winfo.getNe14() ? winfo.getNe14() : 0.0;
 
-                            vo.setName("NE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1049,7 +1049,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getEne13() ? winfo.getEne13() : 0.0;
                             temp3 = null != winfo.getEne14() ? winfo.getEne14() : 0.0;
 
-                            vo.setName("ENE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -1059,7 +1059,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getE13() ? winfo.getE13() : 0.0;
                             temp3 = null != winfo.getE14() ? winfo.getE14() : 0.0;
 
-                            vo.setName("E (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1067,7 +1067,7 @@ public class WpwindDayInfoService {
                             temp1 = null != winfo.getEse16() ? winfo.getEse16() : 0.0;
                             temp2 = null != winfo.getEse13() ? winfo.getEse13() : 0.0;
                             temp3 = null != winfo.getEse14() ? winfo.getEse14() : 0.0;
-                            vo.setName("ESE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -1075,21 +1075,21 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSe13() ? winfo.getSe13() : 0.0;
                             temp3 = null != winfo.getSe14() ? winfo.getSe14() : 0.0;
 
-                            vo.setName("SE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse16() ? winfo.getSse16() : 0.0;
                             temp2 = null != winfo.getSse13() ? winfo.getSse13() : 0.0;
                             temp3 = null != winfo.getSse14() ? winfo.getSse14() : 0.0;
-                            vo.setName("SSE (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS16() ? winfo.getS16() : 0.0;
                             temp2 = null != winfo.getS13() ? winfo.getS13() : 0.0;
                             temp3 = null != winfo.getS14() ? winfo.getS14() : 0.0;
-                            vo.setName("S (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -1097,7 +1097,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSsw13() ? winfo.getSsw13() : 0.0;
                             temp3 = null != winfo.getSsw14() ? winfo.getSsw14() : 0.0;
 
-                            vo.setName("SSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -1105,7 +1105,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getSw13() ? winfo.getSw13() : 0.0;
                             temp3 = null != winfo.getSw14() ? winfo.getSw14() : 0.0;
 
-                            vo.setName("SW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1114,7 +1114,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWsw13() ? winfo.getWsw13() : 0.0;
                             temp3 = null != winfo.getWsw14() ? winfo.getWsw14() : 0.0;
 
-                            vo.setName("WSW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1123,7 +1123,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getW13() ? winfo.getW13() : 0.0;
                             temp3 = null != winfo.getW14() ? winfo.getW14() : 0.0;
 
-                            vo.setName("W (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1132,7 +1132,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getWnw13() ? winfo.getWnw13() : 0.0;
                             temp3 = null != winfo.getWnw14() ? winfo.getWnw14() : 0.0;
 
-                            vo.setName("WNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1141,7 +1141,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNw13() ? winfo.getNw13() : 0.0;
                             temp3 = null != winfo.getNw14() ? winfo.getNw14() : 0.0;
 
-                            vo.setName("NW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1150,7 +1150,7 @@ public class WpwindDayInfoService {
                             temp2 = null != winfo.getNnw13() ? winfo.getNnw13() : 0.0;
                             temp3 = null != winfo.getNnw14() ? winfo.getNnw14() : 0.0;
 
-                            vo.setName("NNW (" + temp1 + "/" + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:" + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/WtwindDayInfoService.java

@@ -98,7 +98,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN() ? NumberUtil.round(winfo.getN(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN2() ? NumberUtil.round(winfo.getN2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"  + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("N (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"  + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("N(" + winfo.getN4() + "/" + winfo.getN() + ")");
                             //
@@ -109,7 +109,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne() ? NumberUtil.round(winfo.getNne(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne2() ? NumberUtil.round(winfo.getNne2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"  + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("NNE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"  + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NNE(" + winfo.getNne4() + "/" + winfo.getNne() + ")");
                             //
@@ -120,7 +120,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe() ? NumberUtil.round(winfo.getNe(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe2() ? NumberUtil.round(winfo.getNe2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("NE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NE(" + winfo.getNe4() + "/" + winfo.getNe() + ")");
                             //
@@ -131,7 +131,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne() ? NumberUtil.round(winfo.getEne(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne2() ? NumberUtil.round(winfo.getEne2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("ENE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("ENE(" + winfo.getEne4() + "/" + winfo.getEne() + ")");
                             //
@@ -143,7 +143,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE() ? NumberUtil.round(winfo.getE(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE2() ? NumberUtil.round(winfo.getE2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("E (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //vo.setName("E(" + winfo.getE4() + "/" + winfo.getE() + ")");
 
@@ -153,7 +153,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse4() ? NumberUtil.round(winfo.getEse4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse() ? NumberUtil.round(winfo.getEse(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse2() ? NumberUtil.round(winfo.getEse2(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("ESE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             //vo.setName("ESE(" + winfo.getEse4() + "/" + winfo.getEse() + ")");
 
                             vo.setData1(temp3);
@@ -163,7 +163,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe() ? NumberUtil.round(winfo.getSe(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe2() ? NumberUtil.round(winfo.getSe2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("SE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             //vo.setName("SE(" + winfo.getSe4() + "/" + winfo.getSe() + ")");
 
                             vo.setData1(temp3);
@@ -172,7 +172,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getSse4() ? NumberUtil.round(winfo.getSse4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse() ? NumberUtil.round(winfo.getSse(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse2() ? NumberUtil.round(winfo.getSse2(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("SSE (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             //	vo.setName("SSE(" + winfo.getSse4() + "/" + winfo.getSse() + ")");
 
                             vo.setData1(temp3);
@@ -181,7 +181,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getS4() ? NumberUtil.round(winfo.getS4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS() ? NumberUtil.round(winfo.getS(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS2() ? NumberUtil.round(winfo.getS2(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("S (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             //vo.setName("S(" + winfo.getS4() + "/" + winfo.getS() + ")");
 
                             vo.setData1(temp3);
@@ -191,7 +191,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw() ? NumberUtil.round(winfo.getSsw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw2() ? NumberUtil.round(winfo.getSsw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("SSW (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
 
                             //						vo.setName("SSW(" + winfo.getSsw4() + "/" + winfo.getSsw() + ")");
@@ -202,7 +202,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw() ? NumberUtil.round(winfo.getSw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw2() ? NumberUtil.round(winfo.getSw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "风速:"   + NumberUtil.round(temp2, 2) + ")");
+                            vo.setName("SW (" + "频率:" + NumberUtil.round(temp1, 2) + "/" + "平均风速:"   + NumberUtil.round(temp2, 2) + ")");
                             vo.setData1(temp3);
                             //						vo.setName("SW(" + winfo.getSw4() + "/" + winfo.getSw() + ")");
                             //
@@ -213,7 +213,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw() ? NumberUtil.round(winfo.getWsw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw2() ? NumberUtil.round(winfo.getWsw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             //						vo.setName("WSW(" + winfo.getWsw4() + "/" + winfo.getWsw() + ")");
@@ -226,7 +226,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW() ? NumberUtil.round(winfo.getW(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW2() ? NumberUtil.round(winfo.getW2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("W(" + winfo.getW4() + "/" + winfo.getW() + ")");
                             //
@@ -237,7 +237,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw() ? NumberUtil.round(winfo.getWnw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw2() ? NumberUtil.round(winfo.getWnw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("WNW(" + winfo.getWnw4() + "/" + winfo.getWnw() + ")");
                             //
@@ -248,7 +248,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw() ? NumberUtil.round(winfo.getNw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw2() ? NumberUtil.round(winfo.getNw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NW(" + winfo.getNw4() + "/" + winfo.getNw() + ")");
                             //
@@ -259,7 +259,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw() ? NumberUtil.round(winfo.getNnw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw2() ? NumberUtil.round(winfo.getNnw2(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             //						vo.setName("NNW(" + winfo.getNnw4() + "/" + winfo.getNnw() + ")");
                             //
@@ -313,7 +313,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN7() ? NumberUtil.round(winfo.getN7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN8() ? NumberUtil.round(winfo.getN8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -322,7 +322,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne7() ? NumberUtil.round(winfo.getNne7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne8() ? NumberUtil.round(winfo.getNne8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -331,7 +331,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe7() ? NumberUtil.round(winfo.getNe7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe8() ? NumberUtil.round(winfo.getNe8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -340,7 +340,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne7() ? NumberUtil.round(winfo.getEne7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne8() ? NumberUtil.round(winfo.getEne8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -350,7 +350,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE7() ? NumberUtil.round(winfo.getE7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE8() ? NumberUtil.round(winfo.getE8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -358,7 +358,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse10() ? NumberUtil.round(winfo.getEse10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse7() ? NumberUtil.round(winfo.getEse7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse8() ? NumberUtil.round(winfo.getEse8(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -366,21 +366,21 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe7() ? NumberUtil.round(winfo.getSe7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe8() ? NumberUtil.round(winfo.getSe8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse10() ? NumberUtil.round(winfo.getSse10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse7() ? NumberUtil.round(winfo.getSse7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse8() ? NumberUtil.round(winfo.getSse8(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS10() ? NumberUtil.round(winfo.getS10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS7() ? NumberUtil.round(winfo.getS7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS8() ? NumberUtil.round(winfo.getS8(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -388,7 +388,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw7() ? NumberUtil.round(winfo.getSsw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw8() ? NumberUtil.round(winfo.getSsw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -396,7 +396,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw7() ? NumberUtil.round(winfo.getSw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw8() ? NumberUtil.round(winfo.getSw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -405,7 +405,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw7() ? NumberUtil.round(winfo.getWsw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw8() ? NumberUtil.round(winfo.getWsw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -414,7 +414,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW7() ? NumberUtil.round(winfo.getW7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW8() ? NumberUtil.round(winfo.getW8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -423,7 +423,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw7() ? NumberUtil.round(winfo.getWnw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw8() ? NumberUtil.round(winfo.getWnw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -432,7 +432,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw7() ? NumberUtil.round(winfo.getNw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw8() ? NumberUtil.round(winfo.getNw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -441,7 +441,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw7() ? NumberUtil.round(winfo.getNnw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw8() ? NumberUtil.round(winfo.getNnw8(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -492,7 +492,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN13() ? NumberUtil.round(winfo.getN13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN14() ? NumberUtil.round(winfo.getN14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -501,7 +501,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne13() ? NumberUtil.round(winfo.getNne13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne14() ? NumberUtil.round(winfo.getNne14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -510,7 +510,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe13() ? NumberUtil.round(winfo.getNe13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe14() ? NumberUtil.round(winfo.getNe14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -519,7 +519,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne13() ? NumberUtil.round(winfo.getEne13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne14() ? NumberUtil.round(winfo.getEne14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -529,7 +529,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE13() ? NumberUtil.round(winfo.getE13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE14() ? NumberUtil.round(winfo.getE14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -537,7 +537,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse16() ? NumberUtil.round(winfo.getEse16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse13() ? NumberUtil.round(winfo.getEse13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse14() ? NumberUtil.round(winfo.getEse14(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -545,21 +545,21 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe13() ? NumberUtil.round(winfo.getSe13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe14() ? NumberUtil.round(winfo.getSe14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse16() ? NumberUtil.round(winfo.getSse16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse13() ? NumberUtil.round(winfo.getSse13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse14() ? NumberUtil.round(winfo.getSse14(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS16() ? NumberUtil.round(winfo.getS16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS13() ? NumberUtil.round(winfo.getS13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS14() ? NumberUtil.round(winfo.getS14(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -567,7 +567,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw13() ? NumberUtil.round(winfo.getSsw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw14() ? NumberUtil.round(winfo.getSsw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -575,7 +575,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw13() ? NumberUtil.round(winfo.getSw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw14() ? NumberUtil.round(winfo.getSw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -584,7 +584,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw13() ? NumberUtil.round(winfo.getWsw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw14() ? NumberUtil.round(winfo.getWsw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -593,7 +593,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW13() ? NumberUtil.round(winfo.getW13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW14() ? NumberUtil.round(winfo.getW14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -602,7 +602,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw13() ? NumberUtil.round(winfo.getWnw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw14() ? NumberUtil.round(winfo.getWnw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -611,7 +611,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw13() ? NumberUtil.round(winfo.getNw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw14() ? NumberUtil.round(winfo.getNw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -620,7 +620,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw13() ? NumberUtil.round(winfo.getNnw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw14() ? NumberUtil.round(winfo.getNnw14(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -671,7 +671,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN() ? NumberUtil.round(winfo.getN(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN4() ? NumberUtil.round(winfo.getN4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -680,7 +680,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne() ? NumberUtil.round(winfo.getNne(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne4() ? NumberUtil.round(winfo.getNne4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -689,7 +689,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe() ? NumberUtil.round(winfo.getNe(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe4() ? NumberUtil.round(winfo.getNe4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -698,7 +698,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne() ? NumberUtil.round(winfo.getEne(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne4() ? NumberUtil.round(winfo.getEne4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -709,7 +709,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE() ? NumberUtil.round(winfo.getE(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE4() ? NumberUtil.round(winfo.getE4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -717,7 +717,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse4() ? NumberUtil.round(winfo.getEse4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse() ? NumberUtil.round(winfo.getEse(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse4() ? NumberUtil.round(winfo.getEse4(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -725,21 +725,21 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe() ? NumberUtil.round(winfo.getSe(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe4() ? NumberUtil.round(winfo.getSe4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse4() ? NumberUtil.round(winfo.getSse4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse() ? NumberUtil.round(winfo.getSse(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse4() ? NumberUtil.round(winfo.getSse4(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS4() ? NumberUtil.round(winfo.getS4(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS() ? NumberUtil.round(winfo.getS(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS4() ? NumberUtil.round(winfo.getS4(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -747,7 +747,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw() ? NumberUtil.round(winfo.getSsw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw4() ? NumberUtil.round(winfo.getSsw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -755,7 +755,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw() ? NumberUtil.round(winfo.getSw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw4() ? NumberUtil.round(winfo.getSw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -764,7 +764,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw() ? NumberUtil.round(winfo.getWsw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw4() ? NumberUtil.round(winfo.getWsw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -773,7 +773,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW() ? NumberUtil.round(winfo.getW(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW4() ? NumberUtil.round(winfo.getW4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -782,7 +782,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw() ? NumberUtil.round(winfo.getWnw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw4() ? NumberUtil.round(winfo.getWnw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -791,7 +791,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw() ? NumberUtil.round(winfo.getNw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw4() ? NumberUtil.round(winfo.getNw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -800,7 +800,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw() ? NumberUtil.round(winfo.getNnw(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw4() ? NumberUtil.round(winfo.getNnw4(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -849,7 +849,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN7() ? NumberUtil.round(winfo.getN7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN10() ? NumberUtil.round(winfo.getN10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -858,7 +858,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne7() ? NumberUtil.round(winfo.getNne7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne10() ? NumberUtil.round(winfo.getNne10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -867,7 +867,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe7() ? NumberUtil.round(winfo.getNe7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe10() ? NumberUtil.round(winfo.getNe10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -876,7 +876,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne7() ? NumberUtil.round(winfo.getEne7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne10() ? NumberUtil.round(winfo.getEne10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -886,7 +886,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE7() ? NumberUtil.round(winfo.getE7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE10() ? NumberUtil.round(winfo.getE10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -894,7 +894,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse10() ? NumberUtil.round(winfo.getEse10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse7() ? NumberUtil.round(winfo.getEse7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse10() ? NumberUtil.round(winfo.getEse10(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -902,21 +902,21 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe7() ? NumberUtil.round(winfo.getSe7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe10() ? NumberUtil.round(winfo.getSe10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse10() ? NumberUtil.round(winfo.getSse10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse7() ? NumberUtil.round(winfo.getSse7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse10() ? NumberUtil.round(winfo.getSse10(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS10() ? NumberUtil.round(winfo.getS10(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS7() ? NumberUtil.round(winfo.getS7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS10() ? NumberUtil.round(winfo.getS10(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -924,7 +924,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw7() ? NumberUtil.round(winfo.getSsw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw10() ? NumberUtil.round(winfo.getSsw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -932,7 +932,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw7() ? NumberUtil.round(winfo.getSw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw10() ? NumberUtil.round(winfo.getSw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -941,7 +941,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw7() ? NumberUtil.round(winfo.getWsw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw10() ? NumberUtil.round(winfo.getWsw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -950,7 +950,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW7() ? NumberUtil.round(winfo.getW7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW10() ? NumberUtil.round(winfo.getW10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -959,7 +959,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw7() ? NumberUtil.round(winfo.getWnw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw10() ? NumberUtil.round(winfo.getWnw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -968,7 +968,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw7() ? NumberUtil.round(winfo.getNw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw10() ? NumberUtil.round(winfo.getNw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -977,7 +977,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw7() ? NumberUtil.round(winfo.getNnw7(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw10() ? NumberUtil.round(winfo.getNnw10(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1027,7 +1027,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getN13() ? NumberUtil.round(winfo.getN13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getN16() ? NumberUtil.round(winfo.getN16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("N (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("N (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1036,7 +1036,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNne13() ? NumberUtil.round(winfo.getNne13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNne16() ? NumberUtil.round(winfo.getNne16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1045,7 +1045,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNe13() ? NumberUtil.round(winfo.getNe13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNe16() ? NumberUtil.round(winfo.getNe16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1054,7 +1054,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getEne13() ? NumberUtil.round(winfo.getEne13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEne16() ? NumberUtil.round(winfo.getEne16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ENE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
 
@@ -1064,7 +1064,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getE13() ? NumberUtil.round(winfo.getE13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getE16() ? NumberUtil.round(winfo.getE16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("E (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("E (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1072,7 +1072,7 @@ public class WtwindDayInfoService {
                             temp1 = null != winfo.getEse16() ? NumberUtil.round(winfo.getEse16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getEse13() ? NumberUtil.round(winfo.getEse13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getEse16() ? NumberUtil.round(winfo.getEse16(), 2).doubleValue() : 0.0;
-                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("ESE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 6:
@@ -1080,21 +1080,21 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSe13() ? NumberUtil.round(winfo.getSe13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSe16() ? NumberUtil.round(winfo.getSe16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 7:
                             temp1 = null != winfo.getSse16() ? NumberUtil.round(winfo.getSse16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getSse13() ? NumberUtil.round(winfo.getSse13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSse16() ? NumberUtil.round(winfo.getSse16(), 2).doubleValue() : 0.0;
-                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSE (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 8:
                             temp1 = null != winfo.getS16() ? NumberUtil.round(winfo.getS16(), 2).doubleValue() : 0.0;
                             temp2 = null != winfo.getS13() ? NumberUtil.round(winfo.getS13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getS16() ? NumberUtil.round(winfo.getS16(), 2).doubleValue() : 0.0;
-                            vo.setName("S (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("S (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 9:
@@ -1102,7 +1102,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSsw13() ? NumberUtil.round(winfo.getSsw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSsw16() ? NumberUtil.round(winfo.getSsw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
                             break;
                         case 10:
@@ -1110,7 +1110,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getSw13() ? NumberUtil.round(winfo.getSw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getSw16() ? NumberUtil.round(winfo.getSw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("SW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("SW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1119,7 +1119,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWsw13() ? NumberUtil.round(winfo.getWsw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWsw16() ? NumberUtil.round(winfo.getWsw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WSW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1128,7 +1128,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getW13() ? NumberUtil.round(winfo.getW13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getW16() ? NumberUtil.round(winfo.getW16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("W (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("W (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1137,7 +1137,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getWnw13() ? NumberUtil.round(winfo.getWnw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getWnw16() ? NumberUtil.round(winfo.getWnw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("WNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1146,7 +1146,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNw13() ? NumberUtil.round(winfo.getNw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNw16() ? NumberUtil.round(winfo.getNw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;
@@ -1155,7 +1155,7 @@ public class WtwindDayInfoService {
                             temp2 = null != winfo.getNnw13() ? NumberUtil.round(winfo.getNnw13(), 2).doubleValue() : 0.0;
                             temp3 = null != winfo.getNnw16() ? NumberUtil.round(winfo.getNnw16(), 2).doubleValue() : 0.0;
 
-                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "风速:"   + temp2 + ")");
+                            vo.setName("NNW (" + "频率:" + temp1 + "/" + "平均风速:"   + temp2 + ")");
                             vo.setData1(temp3);
 
                             break;