malijun 1 рік тому
батько
коміт
1a4aafaf19

+ 4 - 2
electricity/meter/src/main/java/com/gyee/gaia/meter/service/meter/GetView.java

@@ -193,11 +193,13 @@ public class GetView {
 
         //大武口日照强度
         Map<String, PointData> historyLatest1 = adapter.getHistoryLatest("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082");
-        sisViewVO.setDwkrzqd(BigDecimal.valueOf(historyLatest1.get("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082").getValue()).setScale(4,RoundingMode.HALF_EVEN));
+        sisViewVO.setDwkrzqd(BigDecimal.valueOf(historyLatest1.get("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082").getValue()).multiply(BigDecimal.valueOf(8.1)).setScale(4,RoundingMode.HALF_EVEN));
 
         //平罗日照强度
+        Map<String, PointData> historyLatest2 = adapter.getHistoryLatest("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082");
+        sisViewVO.setPlrzqd(BigDecimal.valueOf(historyLatest2.get("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082").getValue()).multiply(BigDecimal.valueOf(8.3)).setScale(4,RoundingMode.HALF_EVEN));
 //        Map<String, PointData> historyLatest2 = adapter.getHistoryLatest("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082");
-        sisViewVO.setPlrzqd(BigDecimal.valueOf(66));
+//        sisViewVO.setPlrzqd(BigDecimal.valueOf(66));
 
         //宣和日照强度
         Map<String, PointData> historyLatest3 = adapter.getHistoryLatest("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0473");