|
@@ -25,6 +25,8 @@ import org.springframework.web.context.request.ServletRequestAttributes;
|
|
|
|
|
|
import javax.annotation.Resource;
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
+import java.math.BigDecimal;
|
|
|
+import java.math.RoundingMode;
|
|
|
import java.util.*;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
@@ -614,6 +616,23 @@ public class MonitorService {
|
|
|
ProBasicPowerstationPoint jymvalue = proBasicPowerstationPointService.getPowerstationPoint(wpId, ContantXk.JYM);
|
|
|
jym = edosUtil.getRealData(jymvalue).getPointValueInDouble();
|
|
|
|
|
|
+
|
|
|
+ Map<String, Double> map=(Map<String, Double>)plan(wpId).get("proplanmap");
|
|
|
+
|
|
|
+ double nfdltemp=0.0;
|
|
|
+ if(map.containsKey("gf_n_sjdl"))
|
|
|
+ {
|
|
|
+ nfdltemp=nfdltemp+Double.valueOf(map.get("gf_n_sjdl"));
|
|
|
+ }
|
|
|
+ if(map.containsKey("fd_n_sjdl"))
|
|
|
+ {
|
|
|
+ nfdltemp=nfdltemp+Double.valueOf(map.get("fd_n_sjdl"));
|
|
|
+ }
|
|
|
+ jym = new BigDecimal(nfdltemp * 0.37).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ jys = new BigDecimal(nfdltemp * 3.05).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ co2 = new BigDecimal(nfdltemp * 0.8568).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+ so2 = new BigDecimal(nfdltemp * 0.0059).divide(new BigDecimal(10000 ), 2, RoundingMode.HALF_EVEN).doubleValue();
|
|
|
+
|
|
|
if (wpId.contains(QS)) {
|
|
|
|
|
|
String str = wpId;
|