Browse Source

修正五项损失数据推送

shilin 5 years ago
parent
commit
b11ee99cf8
1 changed files with 12 additions and 7 deletions
  1. 12 7
      src/main/java/com/gyee/frame/service/app/index/IndexService.java

+ 12 - 7
src/main/java/com/gyee/frame/service/app/index/IndexService.java

@@ -283,7 +283,8 @@ public class IndexService extends SocketToolService{
             try{
                 //理论功率
                 PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZLLGL).getCode());
-                llgl = new BigDecimal(llgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                llgl =new BigDecimal(llgl_real.getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
+                //llgl = new BigDecimal(llgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
                 pointDataMap.put("llgl_real",llgl_real);
             }catch (Exception e){
                 System.out.println(e.getMessage());
@@ -453,18 +454,22 @@ public class IndexService extends SocketToolService{
                 double yjhfdl = 0;
                 double njhfdl = 0;
 	            try {
-	                //月计划发电量
+	                //月发电量
 	                PointData yfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_YFDL).getCode());
-	                yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
+	               // yfdl = new BigDecimal(yfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                    yfdl =new BigDecimal(yfdl_real.getPointValueInDouble()).divide(new BigDecimal(10000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                }catch (Exception e){
 	                System.out.println(e.getMessage());
 	            }
 
 	            try {
-	                //年计划发电量
+	                //年发电量
 	                PointData nfdl_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_NFDL).getCode());
-	                nfdl = new BigDecimal(nfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
-	            }catch (Exception e){
+	                //nfdl = new BigDecimal(nfdl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+                    nfdl =new BigDecimal(nfdl_real.getPointValueInDouble()).divide(new BigDecimal(10000), decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
+
+                }catch (Exception e){
 	                System.out.println(e.getMessage());
 	            }