修复日照强度(平罗没有数,写死66)

electricity/meter/src/main/java/com/gyee/gaia/meter/entity/vo/SisViewVO.java

@@ -62,6 +62,20 @@ public class SisViewVO {
     //宣和发电量
     public BigDecimal xhfdl;
 
+    //大武口日照强度
+    public BigDecimal dwkrzqd;
+    //平罗日照强度
+    public BigDecimal plrzqd;
+    //宣和日照强度
+    public BigDecimal xhrzqd;
+    //马场湖日照强度
+    public BigDecimal mchrzqd;
+    //海子井日照强度
+    public BigDecimal hzjrzqd;
+    //埃肯日照强度
+    public BigDecimal akrzqd;
+
+
     //月利用小时
     public BigDecimal gfylyxs;
     //年利用小时

electricity/meter/src/main/java/com/gyee/gaia/meter/service/meter/GetView.java

@@ -3,7 +3,9 @@ package com.gyee.gaia.meter.service.meter;
 import cn.hutool.core.date.DateTime;
 import cn.hutool.core.date.DateUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.gyee.gaia.meter.adapter.Adapter;
 import com.gyee.gaia.meter.entity.MeterInfoCalculating;
+import com.gyee.gaia.meter.entity.PointData;
 import com.gyee.gaia.meter.entity.vo.SisViewVO;
 import com.gyee.gaia.meter.service.impl.MeterInfoBottomcodeServiceImpl;
 import com.gyee.gaia.meter.service.impl.MeterInfoCalculatingServiceImpl;
@@ -12,6 +14,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.math.BigDecimal;
 import java.math.RoundingMode;
+import java.util.Map;
 
 /**
  * Author: malijun
@@ -23,6 +26,8 @@ public class GetView {
     MeterInfoCalculatingServiceImpl meterInfoCalculatingService;
     @Resource
     MeterInfoBottomcodeServiceImpl meterInfoBottomcodeService;
+    @Resource
+    Adapter adapter;
 
     public SisViewVO getView() {
 
@@ -186,6 +191,29 @@ public class GetView {
         );
         sisViewVO.setXhfdl(oneXHFDL.getValue());
 
+        //大武口日照强度
+        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()));
+
+        //平罗日照强度
+//        Map<String, PointData> historyLatest2 = adapter.getHistoryLatest("DWKDQ.NX_GD_DWKG_DQ_P1_L1_001_AI0082");
+        sisViewVO.setPlrzqd(BigDecimal.valueOf(66));
+
+        //宣和日照强度
+        Map<String, PointData> historyLatest3 = adapter.getHistoryLatest("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0473");
+        sisViewVO.setXhrzqd(BigDecimal.valueOf(historyLatest3.get("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0473").getValue()));
+
+        //马场湖日照强度
+        Map<String, PointData> historyLatest4 = adapter.getHistoryLatest("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0475");
+        sisViewVO.setMchrzqd(BigDecimal.valueOf(historyLatest4.get("XHDQ.NX_GD_XHG_DQ_P1_L1_001_AI0475").getValue()));
+
+//        //海子井日照强度
+        Map<String, PointData> historyLatest5 = adapter.getHistoryLatest("HZJFGLZN.NX_GD_HZJG_YC_P1_L1_001_QXZ002");
+        sisViewVO.setHzjrzqd(BigDecimal.valueOf(historyLatest5.get("HZJFGLZN.NX_GD_HZJG_YC_P1_L1_001_QXZ002").getValue()));
+
+
+
+
 
         //总
         //装机容量

electricity/wind/src/main/java/com/gyee/gaia/electricity/wind/serviceimpl/EquipPowerGenDayServiceImpl.java

@@ -93,7 +93,7 @@ public class EquipPowerGenDayServiceImpl extends ServiceImpl<EquipPowerGenDayMap
                     l.setTheoryGeneration(l.getGeneratingCapacity());
                 }
             }
-            l.setCategory(String.valueOf(l.getGeneratingCapacity().divide(l.getTheoryGeneration(),4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100))));
+            l.setCategory(String.valueOf(l.getGeneratingCapacity().divide(l.getTheoryGeneration(),4, RoundingMode.HALF_EVEN).multiply(new BigDecimal(100)).setScale(2,RoundingMode.HALF_EVEN)));
         }).collect(Collectors.toList());
         return list;
     }