Browse Source

计算电量算法

shilin 1 year ago
parent
commit
1d9b8610c5

+ 19 - 0
web/runeconomy-xk/src/main/java/com/gyee/runeconomy/service/monitor/MonitorService.java

@@ -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;

+ 2 - 2
web/runeconomy-xk/src/main/resources/application-jn.yml

@@ -96,9 +96,9 @@ logging:
     com.example: debug
 initialcode: INITIAL
 db:
-  URL1: http://127.0.0.1:8011/ts
+  URL1: http://10.81.3.162:8011/ts
 #  URL1: http://10.81.3.160:8011/ts
-  URL2: http://10.81.3.160:8012/ts
+  URL2: http://10.81.3.162:8012/ts
 
 #
 #db: