修改代码

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

@@ -598,17 +598,17 @@ public class MonitorFanIdxController extends BaseController {
 
 
         Map<String, Object> data = new HashMap<>();
-        data.put("title1",columnMap.get("装机容量").toString());
-        data.put("title2",columnMap.get("日发电量").toString());
-        data.put("title3",columnMap.get("风机台数").toString().replace(".0",""));
-        data.put("title4",columnMap.get("月发电量").toString());
-        data.put("title5",7.47);//辐照强度
-        data.put("title6",columnMap.get("年发电量").toString());
-        data.put("title7",columnMap.get("有功功率").toString());
-
-        data.put("title8",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
-        data.put("title9",columnMap.get("总辐射累计").toString());//总辐射日累计
-        data.put("title0",7.47);//综合效率
+        data.put("total1",columnMap.get("装机容量").toString());
+        data.put("total2",columnMap.get("日发电量").toString());
+        data.put("total3",columnMap.get("风机台数").toString().replace(".0",""));
+        data.put("total4",columnMap.get("月发电量").toString());
+        data.put("total5",7.47);//辐照强度
+        data.put("total6",columnMap.get("年发电量").toString());
+        data.put("total7", String.format("%.2f",Double.parseDouble(columnMap.get("有功功率").toString())/1000));
+
+        data.put("total8",String.format("%.2f",Double.parseDouble(columnMap.get("日发电量").toString())/ (Double.parseDouble(columnMap.get("装机容量").toString())*1000)));
+        data.put("total9",columnMap.get("总辐射累计").toString());//总辐射日累计
+        data.put("total0",7.47);//综合效率
         return ResponseHelper.buildResponse(data);
     }
 

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

@@ -774,7 +774,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 TemporaryData temporaryData = new TemporaryData();
                 temporaryData.setBatchNo(timeInMillis);
                 temporaryData.setCreatedTime(time.split(" ")[1]);
-                temporaryData.setEquipmentIndexName(indicatorsDto.getEquipmentIndexName());
+                temporaryData.setEquipmentIndexName(indicatorsDto.getDisplayName());
                 temporaryData.setGatewayId(indicatorsDto.getGatewayId());
                 temporaryData.setValue(Float.valueOf(indicatorsDto.getValue()));
                 temporaryData.setEquipmentNumber(indicatorsDto.getEquipmentNumber());
@@ -788,7 +788,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 TemporaryData temporaryData = new TemporaryData();
                 temporaryData.setBatchNo(timeInMillis);
                 temporaryData.setCreatedTime(time.split(" ")[1]);
-                temporaryData.setEquipmentIndexName(indicatorsDto.getEquipmentIndexName());
+                temporaryData.setEquipmentIndexName(indicatorsDto.getDisplayName());
                 temporaryData.setGatewayId(indicatorsDto.getGatewayId());
                 temporaryData.setValue(Float.valueOf(indicatorsDto.getValue()));
                 temporaryData.setEquipmentNumber(indicatorsDto.getEquipmentNumber());