|
@@ -1,5 +1,6 @@
|
|
|
package com.gyee.frame.service.app.index;
|
|
|
|
|
|
+import com.gyee.frame.common.conf.redis.CacheContext;
|
|
|
import com.gyee.frame.common.spring.Constant;
|
|
|
import com.gyee.frame.common.spring.InitialRunner;
|
|
|
import com.gyee.frame.model.auto.WindPowerStationTestingPoint2;
|
|
@@ -147,7 +148,7 @@ public class IndexService extends SocketToolService{
|
|
|
|
|
|
try {
|
|
|
//平均风速
|
|
|
- PointData pjfs_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_PJFS).getCode());
|
|
|
+ PointData pjfs_real = mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_SSFS).getCode());
|
|
|
pjfs = new BigDecimal(pjfs_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
pointDataMap.put("pjfs_real",pjfs_real);
|
|
|
}catch (Exception e){
|
|
@@ -282,8 +283,10 @@ public class IndexService extends SocketToolService{
|
|
|
|
|
|
try{
|
|
|
//理论功率
|
|
|
- PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZLLGL).getCode());
|
|
|
+ PointData llgl_real=mongodb.getRealData(stationPointmap.get(windpowerstation.getId()).get(Constant.TPOINT_WP_ZZSGL).getCode());
|
|
|
llgl =new BigDecimal(llgl_real.getPointValueInDouble()).divide(new BigDecimal(10000), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ double gfsjgl = mongodb.getRealData(stationPointmap.get("-2").get(Constant.TPOINT_WP_SJGL)).getPointValueInDouble();
|
|
|
+ llgl=StringUtils.round(llgl+gfsjgl,2);
|
|
|
//llgl = new BigDecimal(llgl_real.getPointValueInDouble()).setScale(decimal_digit, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
pointDataMap.put("llgl_real",llgl_real);
|
|
|
}catch (Exception e){
|