1.客户反馈问题处理

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/MonitorFanIdxController.java

@@ -579,7 +579,7 @@ public class MonitorFanIdxController extends BaseController {
         String boosterGatewayId = stationBasic.getBoosterGatewayId();
         String [] columnList = new String[]{"日发电量","月发电量","年发电量"};
         String [] columnLists = new String[]{"有功功率"};
-        String [] syLists = new String[]{"总辐射累计","总辐射"};
+        String [] syLists = new String[]{"总辐射累计","总辐射","日照时数"};
         Map<String, Object> columnMap = new HashMap<>();
         //日 月 年发电量同仅统计逆变器数据
         List<Map<String, Object>> mapList;
@@ -629,13 +629,13 @@ public class MonitorFanIdxController extends BaseController {
         data5.put("title",columnMap.get("年发电量").toString());
         objects.add(data5);
         Map<String, Object> data6 = new HashMap<>();
-        data6.put("title", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
+        data6.put("title", columnMap.get("有功功率").toString()) ;
         objects.add(data6);
         Map<String, Object> data7 = new HashMap<>();
-        data7.put("title",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
+        data7.put("title",columnMap.get("日照时数").toString());
         objects.add(data7);
         Map<String, Object> data8 = new HashMap<>();
-        data8.put("title",String.format("%.2f",Double.parseDouble(columnMap.get("总辐射累计").toString())));
+        data8.put("title",columnMap.get("总辐射累计").toString());
         objects.add(data8);
         Map<String, Object> data9 = new HashMap<>();
         data9.put("title","84.00%");//综合效率