风资源增加中文

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;

runeconomy-xk/src/main/java/com/gyee/runeconomy/service/specific/SpecificService.java

@@ -546,39 +546,24 @@ public class SpecificService {
         qw.select("COALESCE(sum(llfdl), 0) as llfdl,COALESCE(sum(rfdl), 0) as rfdl,COALESCE(sum(gzss), 0) as gzss,COALESCE(sum(jhjxss), 0) as jhjxss,COALESCE(sum(fjhjxss), 0) as fjhjxss,COALESCE(sum(djss), 0) as djss,COALESCE(sum(xnss), 0) as xnss,COALESCE(sum(slss), 0) as slss");
         qw.between("record_date", Date.from(firstDayOfYear.atStartOfDay(ZoneId.systemDefault()).toInstant()), Date.from(now.minusYears(1).atStartOfDay(ZoneId.systemDefault()).toInstant()));
         List<TurbineInfoDay> yearList = iTurbineInfoDayService.list(qw);
-            Optional<TurbineInfoDay> yearFirsts = yearList.stream().findFirst();
-            if (yearFirsts.isPresent()) {
-                TurbineInfoDay yearSpecific = yearFirsts.get();
-                dqvo.setNllfdl(DoubleUtils.getRoundingNum(yearSpecific.getLlfdl() / 1000, 2));
-                dqvo.setNsjfdl(DoubleUtils.getRoundingNum(yearSpecific.getRfdl() / 1000, 2));
-                dqvo.setNwhssdl(DoubleUtils.getRoundingNum(yearSpecific.getJhjxss() / 1000 + yearSpecific.getFjhjxss() / 1000, 2));
-                dqvo.setNgzssdl(DoubleUtils.getRoundingNum(yearSpecific.getGzss() / 1000, 2));
-                dqvo.setNxdssdl(DoubleUtils.getRoundingNum(yearSpecific.getXnss() / 1000, 2));
-                dqvo.setNxnssdl(DoubleUtils.getRoundingNum(yearSpecific.getDjss() / 1000, 2));
-                dqvo.setNslssdl(DoubleUtils.getRoundingNum(yearSpecific.getSlss() / 1000, 2));
-                if (dqvo.getYllfdl() != 0) {
-                    dqvo.setNfnlyl(DoubleUtils.getRoundingNum(dqvo.getNsjfdl() / dqvo.getNllfdl() * 100, 2));
-                    dqvo.setNwhssl(DoubleUtils.getRoundingNum(dqvo.getNwhssdl() / dqvo.getNllfdl() * 100, 2));
-                    dqvo.setNgzssl(DoubleUtils.getRoundingNum(dqvo.getNgzssdl() / dqvo.getNllfdl() * 100, 2));
-                    dqvo.setNxdssl(DoubleUtils.getRoundingNum(dqvo.getNxdssdl() / dqvo.getNllfdl() * 100, 2));
-                    dqvo.setNxnssl(DoubleUtils.getRoundingNum(dqvo.getNxnssdl() / dqvo.getNllfdl() * 100, 2));
-                    dqvo.setNslssl(DoubleUtils.getRoundingNum(dqvo.getNslssdl() / dqvo.getNllfdl() * 100, 2));
-                } else {
-                    dqvo.setNfnlyl(0.0);
-                    dqvo.setNwhssl(0.0);
-                    dqvo.setNgzssl(0.0);
-                    dqvo.setNxdssl(0.0);
-                    dqvo.setNxnssl(0.0);
-                    dqvo.setNslssl(0.0);
-                }
+        Optional<TurbineInfoDay> yearFirsts = yearList.stream().findFirst();
+        if (yearFirsts.isPresent()) {
+            TurbineInfoDay yearSpecific = yearFirsts.get();
+            dqvo.setNllfdl(DoubleUtils.getRoundingNum(yearSpecific.getLlfdl() / 1000, 2));
+            dqvo.setNsjfdl(DoubleUtils.getRoundingNum(yearSpecific.getRfdl() / 1000, 2));
+            dqvo.setNwhssdl(DoubleUtils.getRoundingNum(yearSpecific.getJhjxss() / 1000 + yearSpecific.getFjhjxss() / 1000, 2));
+            dqvo.setNgzssdl(DoubleUtils.getRoundingNum(yearSpecific.getGzss() / 1000, 2));
+            dqvo.setNxdssdl(DoubleUtils.getRoundingNum(yearSpecific.getXnss() / 1000, 2));
+            dqvo.setNxnssdl(DoubleUtils.getRoundingNum(yearSpecific.getDjss() / 1000, 2));
+            dqvo.setNslssdl(DoubleUtils.getRoundingNum(yearSpecific.getSlss() / 1000, 2));
+            if (dqvo.getYllfdl() != 0) {
+                dqvo.setNfnlyl(DoubleUtils.getRoundingNum(dqvo.getNsjfdl() / dqvo.getNllfdl() * 100, 2));
+                dqvo.setNwhssl(DoubleUtils.getRoundingNum(dqvo.getNwhssdl() / dqvo.getNllfdl() * 100, 2));
+                dqvo.setNgzssl(DoubleUtils.getRoundingNum(dqvo.getNgzssdl() / dqvo.getNllfdl() * 100, 2));
+                dqvo.setNxdssl(DoubleUtils.getRoundingNum(dqvo.getNxdssdl() / dqvo.getNllfdl() * 100, 2));
+                dqvo.setNxnssl(DoubleUtils.getRoundingNum(dqvo.getNxnssdl() / dqvo.getNllfdl() * 100, 2));
+                dqvo.setNslssl(DoubleUtils.getRoundingNum(dqvo.getNslssdl() / dqvo.getNllfdl() * 100, 2));
             } else {
-                dqvo.setNllfdl(0.0);
-                dqvo.setNsjfdl(0.0);
-                dqvo.setNwhssdl(0.0);
-                dqvo.setNgzssdl(0.0);
-                dqvo.setNxdssdl(0.0);
-                dqvo.setNxnssdl(0.0);
-                dqvo.setNslssdl(0.0);
                 dqvo.setNfnlyl(0.0);
                 dqvo.setNwhssl(0.0);
                 dqvo.setNgzssl(0.0);
@@ -586,6 +571,21 @@ public class SpecificService {
                 dqvo.setNxnssl(0.0);
                 dqvo.setNslssl(0.0);
             }
+        } else {
+            dqvo.setNllfdl(0.0);
+            dqvo.setNsjfdl(0.0);
+            dqvo.setNwhssdl(0.0);
+            dqvo.setNgzssdl(0.0);
+            dqvo.setNxdssdl(0.0);
+            dqvo.setNxnssdl(0.0);
+            dqvo.setNslssdl(0.0);
+            dqvo.setNfnlyl(0.0);
+            dqvo.setNwhssl(0.0);
+            dqvo.setNgzssl(0.0);
+            dqvo.setNxdssl(0.0);
+            dqvo.setNxnssl(0.0);
+            dqvo.setNslssl(0.0);
+        }
 
     }
 
@@ -1836,11 +1836,15 @@ public class SpecificService {
 
 
     public List<SpecificTarget> fdlList(String companys, String type, String year) {
+        LocalDate now = LocalDate.now();
+        LocalDate of = LocalDate.of(Integer.parseInt(year), now.getMonth(), now.getDayOfMonth());
+
         //获取年份所有当月的数据
         QueryWrapper<StationInfoDay> currentqw = new QueryWrapper<>();
-        currentqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
+        currentqw.select("station_id,max(record_date) as record_date,sum(rfdl_fj) rfdl_fj");
         currentqw.eq("to_char(record_date,'yyyy')", year);
         currentqw.like("station_id", "_FDC_");
+        currentqw.lt("record_date", of);
         currentqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         List<StationInfoDay> currentList = iStationInfoDayService.list(currentqw);
 
@@ -1849,6 +1853,7 @@ public class SpecificService {
         sameperiodqw.select("station_id,max(record_date) record_date,sum(rfdl_fj) rfdl_fj");
         currentqw.like("station_id", "_FDC_");
         sameperiodqw.eq("to_char(record_date,'yyyy')", String.valueOf(subYear));
+        currentqw.lt("record_date", of);
         sameperiodqw.groupBy("to_char(record_date,'yyyy-MM'),station_id");
         List<StationInfoDay> sameperiodList = iStationInfoDayService.list(sameperiodqw);
         sameperiodqw.clear();
@@ -1864,7 +1869,7 @@ public class SpecificService {
             Date date = Date.from(instant);
             vo.setYear(DateUtils.getYear(date));
             vo.setMonth(DateUtils.getMonth(date));
-            vo.setCurrent(NumberUtil.round(i.getRfdlFj().doubleValue() / 1000,2).doubleValue());
+            vo.setCurrent(NumberUtil.round(i.getRfdlFj().doubleValue() / 1000, 2).doubleValue());
             resultList.add(vo);
         });
         resultList.stream().forEach(i -> {
@@ -1873,7 +1878,7 @@ public class SpecificService {
 
             if (optional.isPresent()) {
                 StationInfoDay tqinfoday = optional.get();
-                i.setSameperiod(NumberUtil.round(tqinfoday.getRfdlFj().doubleValue() / 1000,2).doubleValue());
+                i.setSameperiod(NumberUtil.round(tqinfoday.getRfdlFj().doubleValue() / 1000, 2).doubleValue());
                 i.setCompare(i.getCurrent().compareTo(i.getSameperiod()));
             } else {
                 i.setSameperiod(0.0);