修改代码

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/dto/IdxBizFanPointProcessVariableClassificationDto.java

@@ -9,6 +9,7 @@ import lombok.Data;
 import lombok.EqualsAndHashCode;
 
 import java.time.LocalDateTime;
+import java.util.Date;
 
 /**
  * 
@@ -30,7 +31,7 @@ public class IdxBizFanPointProcessVariableClassificationDto  {
     private String record;
 
     @TableField("REC_DATE")
-    private LocalDateTime recDate;
+    private Date recDate;
 
     @TableField("REC_USER_ID")
     private String recUserId;

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/cluster/IdxBizFanPointProcessVariableClassificationMapper.xml

@@ -47,6 +47,7 @@
         WHERE b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT1_ID
            OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT2_ID
            OR b.SEQUENCE_NBR = ibfpvcv.PROCESS_POINT3_ID
+           OR b.SEQUENCE_NBR = ibfpvcv.ANALYSIS_POINT_ID
         GROUP BY b.SEQUENCE_NBR
     </select>
 

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

@@ -629,7 +629,7 @@ public class MonitorFanIdxController extends BaseController {
         String num = monitorFanIndicator.getFJCount(gatewayId);
         columnMap.put("逆变器台数",num);
         Double capacityl = commonService.getStationCapactityByStationWerks(stationBasic.getStationNumber());
-        columnMap.put("装机容量",capacityl);
+        columnMap.put("装机容量",String.format("%.2f",capacityl));
 
         String json = null;
         try {

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

@@ -89,6 +89,9 @@ public class CommonServiceImpl {
         String sql = "SELECT * FROM indicators_"+gatewayId+" where equipmentIndexName='"+indicator+"'";
         Double avageValue =  0.0;
         List<Map<String,Object>> mapList = influxdbUtil.query(sql);
+        if (mapList.size() < 1){
+            return avageValue;
+        }
         avageValue =mapList.stream().filter(stringObjectMap -> !ObjectUtils.isEmpty(stringObjectMap.get("value"))).mapToDouble(l->Double.parseDouble((String) l.get("value"))).average().getAsDouble();
         return Double.valueOf(String.format("%.2f",avageValue));
     }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overview.json

 [
   {
-    "titie": "装机容量",
+    "title": "装机容量",
     "title1": "装机容量(MW)",
     "url": "upload/jxiop/amos_studio/2F378EF430F788CA71E876359B46C4E.png"
   },
   {
-    "titie": "日发电量",
+    "title": "日发电量",
     "title1": "日发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/E07C6C41715033585F69934AF08A3431.png"
   },
   {
-    "titie": "风机台数",
+    "title": "风机台数",
     "title1": "风机台数(台)",
     "action": "*.replace(\".0\",\"\")",
     "url": "upload/jxiop/amos_studio/EA3572E1BD31DC1E7D8DA162F09ECB.png"
   },
   {
-    "titie": "月发电量",
+    "title": "月发电量",
     "title1": "月发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/6CE2792ABEEAE816CB798649A6796.png"
   },
   {
-    "titie": "瞬时风速",
+    "title": "瞬时风速",
     "title1": "平均风速(m/s)",
     "url": "upload/jxiop/amos_studio/3B66742AAB2FEB0F5CEC10DA50156F.png"
   },
   {
-    "titie": "年发电量",
+    "title": "年发电量",
     "title1": "年发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/12D321E29727689B334E3E625383EB7C.png"
   },
   {
-    "titie": "有功功率",
+    "title": "有功功率",
     "title1": "有功功率(MW)",
     "action": "String.format(\"%.2f\",Double.parseDouble(*)/1000)",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
   },
   {
-    "titie": "日利用小时",
+    "title": "日利用小时",
     "title1": "日利用小时",
     "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
   },
   {
-    "titie": "上网电量",
+    "title": "上网电量",
     "title1": "上网电量(万kWh)",
     "url": "upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png"
   }

amos-boot-system-jxiop/amos-boot-module-jxiop-bigscreen-biz/src/main/resources/json/overviewGF.json

 [
   {
-  "titie": "逆变器台数",
+  "title": "逆变器台数",
   "title1": "逆变器台数(台)",
   "action": "*.replace(\".0\",\"\")",
   "url": "upload/jxiop/amos_studio/EA3572E1BD31DC1E7D8DA162F09ECB.png"
   },
   {
-    "titie": "装机容量",
+    "title": "装机容量",
     "title1": "装机容量(MW)",
     "url": "upload/jxiop/amos_studio/2F378EF430F788CA71E876359B46C4E.png"
   },
   {
-    "titie": "有功功率",
+    "title": "有功功率",
     "title1": "有功功率(MW)",
     "action": "String.format(\"%.2f\",Double.parseDouble(*)/1000)",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"
@@ -19,7 +19,7 @@
   {
     "url": "upload/jxiop/amos_studio/F9A5F9E6EB7C825CA869063E817E281.png",
     "title1": "综合效率（%）",
-    "title2": "综合效率"
+    "title": "综合效率"
   },
   {
     "url": "upload/jxiop/amos_studio/DD1CE8BAF5A7C3AC5E6E2C0D46C3EEC.png",
@@ -29,30 +29,30 @@
   {
     "url": "upload/jxiop/amos_studio/22639FDFF29B20B681DF55F1252876B3.png",
     "title1": "总辐射日累计（Mb/㎡）",
-    "title2": "总辐射累计"
+    "title": "总辐射累计"
   },
   {
-    "titie": "日发电量",
+    "title": "日发电量",
     "title1": "日发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/E07C6C41715033585F69934AF08A3431.png"
   },
   {
-    "titie": "月发电量",
+    "title": "月发电量",
     "title1": "月发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/6CE2792ABEEAE816CB798649A6796.png"
   },
   {
-    "titie": "年发电量",
+    "title": "年发电量",
     "title1": "年发电量(万kWh)",
     "url": "upload/jxiop/amos_studio/12D321E29727689B334E3E625383EB7C.png"
   },
   {
-    "titie": "上网电量",
+    "title": "上网电量",
     "title1": "上网电量(万kWh)",
     "url": "upload/jxiop/amos_studio/1660C5DDA22ACFADC89A60DEDB82FA39.png"
   },
   {
-    "titie": "年利用小时",
+    "title": "年利用小时",
     "title1": "年利用小时",
     "action":"String.format(\"%.2f\",Double.parseDouble(columnMap.get(\"*\").toString())/ (Double.parseDouble(columnMap.get(\"-\").toString())*1000))",
     "url": "upload/jxiop/amos_studio/C46B483E51ACAC137CBEB5156F6F377.png"