解决冲突

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

@@ -571,7 +571,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<>();
 
 
@@ -592,13 +592,8 @@ public class MonitorFanIdxController extends BaseController {
 
         String num = monitorFanIndicator.getFJCount(gatewayId);
         columnMap.put("风机台数",num);
-
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
         columnMap.put("装机容量",capacityl);
-
-
-
-
         List<Map<String,Object>> objects = new ArrayList<>();
         Map<String, Object> data = new HashMap<>();
         data.put("title",columnMap.get("装机容量").toString());
@@ -622,10 +617,10 @@ public class MonitorFanIdxController extends BaseController {
         data6.put("title", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000)) ;
         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%");//综合效率

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -532,7 +532,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
             }
         }
 
-        List<  Map<String,Object>> seriesData = new ArrayList<>();
+        List<Map<String,Object>> seriesData = new ArrayList<>();
         Map<String,Object> map3 = new HashMap<>();
         Map<String,Object> map1 = new HashMap<>();
         Map<String,Object> map2 = new HashMap<>();

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/ESDto/ESEquipments.java

@@ -29,7 +29,7 @@ public class ESEquipments {
     private String  dataType;
     @Field(type = FieldType.Text)
     private String  equipmentSpecificName;
-    @Field(type = FieldType.Text)
+    @Field(type = FieldType.Keyword)
     private String  gatewayId;
     @Field(type = FieldType.Text)
     private String  isAlarm;
@@ -37,17 +37,17 @@ public class ESEquipments {
     private Date createdTime;
     @Field(type = FieldType.Text , index = false)
     private String  unit;
-    @Field(type = FieldType.Text, index = false,fielddata=true)
+    @Field(type = FieldType.Text, index = false)
     private String  value;
-    @Field(type = FieldType.Double, index = false,fielddata=true)
+    @Field(type = FieldType.Double, index = false)
     private Double  valueDouble;
     @Field(type = FieldType.Text , index = false)
     private String  valueLabel;
     @Field(type = FieldType.Text , index = false)
     private String  traceId;
-    @Field(type = FieldType.Text )
+    @Field(type = FieldType.Keyword )
     private String  equipmentIndexName;
-    @Field(type = FieldType.Text )
+    @Field(type = FieldType.Keyword )
     private String  equipmentNumber;
     @Field(type = FieldType.Text)
     private String  frontModule;

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%");//综合效率

amos-boot-system-jxiop/amos-boot-module-jxiop-monitor-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/service/impl/MonitorFanIndicatorImpl.java

@@ -855,7 +855,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
         List<Map<String,Object>> statusMaps = new ArrayList<>();
         for (IndicatorsDto listDatum : listData) {
             Map<String, Object> statusMap = new HashMap<>();
-            statusMap.put("title",listDatum.getValue().equals("")? 0: keepTwoDecimalPlaces(listDatum.getValue())+"  "+listDatum.getUnit() == null?"":listDatum.getUnit());
+            statusMap.put("title",listDatum.getValue().equals("")? 0.00: keepTwoDecimalPlaces(listDatum.getValue())+"  "+listDatum.getUnit() == null?"":listDatum.getUnit());
             statusMap.put("title1",listDatum.getDisplayName());
             statusMaps.add(statusMap);
         }