|
@@ -2316,7 +2316,7 @@ public class GenreSetPushService {
|
|
|
}
|
|
|
|
|
|
|
|
|
- if (id.equals(QY+QS)) {
|
|
|
+// if (id.equals(QY+QS)) {
|
|
|
// 减排二氧化碳
|
|
|
Windpowerstationpointnew temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_JPEYHT);
|
|
|
int jpeyht = (int) (realApiUtil.getRealData(temppoint).getPointValueInDouble() * 10000);
|
|
@@ -2340,11 +2340,11 @@ public class GenreSetPushService {
|
|
|
jczbmap.put("jpeyhl", StringUtils.round(jpeyhl, 2));
|
|
|
jczbmap.put("jys", StringUtils.round(jys, 2));
|
|
|
|
|
|
- }
|
|
|
+// }
|
|
|
|
|
|
// 安全天数
|
|
|
- Windpowerstationpointnew temppoint = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_AQTS);
|
|
|
- Double aqts = realApiUtil.getRealData(temppoint).getPointValueInDouble();
|
|
|
+ Windpowerstationpointnew temppoint1 = windPowerstationTestingPoint2Service.getWindPowerStationTestingPoint2(id, Constant.TPOINT_AQTS);
|
|
|
+ Double aqts = realApiUtil.getRealData(temppoint1).getPointValueInDouble();
|
|
|
jczbmap.put("aqts", StringUtils.round(aqts, 2));
|
|
|
if (bzgl == 0.0) {
|
|
|
bzgl = 1.0;
|