修改代码

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

@@ -255,9 +255,9 @@ public class MonitorFanIdxController extends BaseController {
         List<Map>  list = parseArray(json, Map.class);
         for (Map map : list) {
             String key = map.get("title").toString();
+            map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
+            map.put("title2",map.get("title"));
             if (map.containsKey("action")){
-                map.put("title", columnMap.get(key)==null?0.00:columnMap.get(key));
-                map.put("title2",map.get("title"));
                 if (key.equals("日利用小时")){
                     String format = String.format("%.2f", ((Double.parseDouble(columnMap.get("日发电量").toString())*10)/ (Double.parseDouble(columnMap.get("装机容量").toString()))));
                     map.put("title", format);

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

+[
+  {
+    "euqipmentNumber": "01",
+    "latitude": "26°19'20.3968",
+    "longitude": "114°43'01.3487"
+  },
+  {
+    "euqipmentNumber": "02",
+    "latitude": "26°18'17.3192",
+    "longitude": "114°43'55.0756"
+  },
+  {
+    "euqipmentNumber": "03",
+    "latitude": "26°18'34.3219",
+    "longitude": "114°44'01.4686"
+  },
+  {
+    "euqipmentNumber": "04",
+    "latitude": "26°18'42.2673",
+    "longitude": "114°44'10.7522"
+  },
+  {
+    "euqipmentNumber": "05",
+    "latitude": "26°18'38.0098",
+    "longitude": "114°44'21.7018"
+  },
+  {
+    "euqipmentNumber": "06",
+    "latitude": "26°18'34.6466",
+    "longitude": "114°44'29.9556"
+  },
+  {
+    "euqipmentNumber": "07",
+    "latitude": "26°18'36.8995",
+    "longitude": "114°44'39.7470"
+  },
+  {
+    "euqipmentNumber": "08",
+    "latitude": "26°18'33.5051",
+    "longitude": "114°44'50.8102"
+  },
+  {
+    "euqipmentNumber": "09",
+    "longitude": "114°42'38.4597",
+    "latitude": "26°16'45.3175"
+  },
+  {
+    "euqipmentNumber": "10",
+    "longitude": "114°42'46.7892",
+    "latitude": "26°16'34.2193"
+  },
+  {
+    "euqipmentNumber": "11",
+    "longitude": "114°42'57.3524",
+    "latitude": "26°16'18.2295"
+  },
+  {
+    "euqipmentNumber": "12",
+    "longitude": "114°43'44.6453",
+    "latitude": "26°16'22.9530"
+  },
+  {
+    "euqipmentNumber": "13",
+    "latitude": "26°16'25.2473",
+    "longitude": "114°43'55.4240"
+  },
+  {
+    "euqipmentNumber": "14",
+    "latitude": "26°15'23.8288",
+    "longitude": "114°42'46.1713"
+  },
+  {
+    "euqipmentNumber": "15",
+    "latitude": "26°15'18.3501",
+    "longitude": "114°42'36.4494"
+  },
+  {
+    "euqipmentNumber": "16",
+    "latitude": "26°15'15.1157",
+    "longitude": "114°42'24.2207"
+  },
+  {
+    "euqipmentNumber": "17",
+    "latitude": "26°15'12.3541",
+    "longitude": "114°42'16.2315"
+  },
+  {
+    "euqipmentNumber": "18",
+    "latitude": "26°15'07.7590",
+    "longitude": "114°42'09.1002"
+  },
+  {
+    "euqipmentNumber": "19",
+    "latitude": "26°15'06.4482",
+    "longitude": "114°41'59.3730"
+  },
+  {
+    "euqipmentNumber": "20",
+    "latitude": "26°15'05.7242",
+    "longitude": "114°41'51.2436"
+  },
+  {
+    "euqipmentNumber": "21",
+    "latitude": "26°14'54.2353",
+    "longitude": "114°41'45.1572"
+  },
+  {
+    "euqipmentNumber": "22",
+    "latitude": "26°14'53.7742",
+    "longitude": "114°41'35.6931"
+  },
+  {
+    "euqipmentNumber": "23",
+    "latitude": "26°14'49.6670",
+    "longitude": "114°41'28.9852"
+  },
+  {
+    "euqipmentNumber": "24",
+    "latitude": "26°14'52.6637",
+    "longitude": "114°41'19.3269"
+  },
+  {
+    "euqipmentNumber": "25",
+    "latitude": "26°14'43.4608",
+    "longitude": "114°41'12.0974"
+  },
+  {
+    "euqipmentNumber": "26",
+    "latitude": "26°14'40.3649",
+    "longitude": "114°41'03.8101"
+  },
+  {
+    "euqipmentNumber": "27",
+    "latitude": "26°15'33.5730",
+    "longitude": "114°40'33.7931"
+  },
+  {
+    "euqipmentNumber": "28",
+    "latitude": "26°15'24.1330",
+    "longitude": "114°40'51.2196"
+  },
+  {
+    "euqipmentNumber": "29",
+    "latitude": "26°15'29.4603",
+    "longitude": "114°40'45.3326"
+  }
+]
\ No newline at end of file

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

@@ -635,7 +635,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 temporaryData.setCreatedTime(time.split(" ")[1]);
                 temporaryData.setEquipmentIndexName(indicatorsDto.getEquipmentIndexName());
                 temporaryData.setGatewayId(indicatorsDto.getGatewayId());
-                temporaryData.setValue(Float.valueOf(indicatorsDto.getValue()));
+                temporaryData.setValue(indicatorsDto.getValueDouble());
                 temporaryData.setEquipmentNumber(indicatorsDto.getEquipmentNumber());
                 temporaryDatas.add(temporaryData);
             } catch (Exception e) {
@@ -649,7 +649,7 @@ public class MonitorFanIndicatorImpl implements IMonitorFanIndicator {
                 temporaryData.setCreatedTime(time.split(" ")[1]);
                 temporaryData.setEquipmentIndexName(indicatorsDto.getEquipmentIndexName());
                 temporaryData.setGatewayId(indicatorsDto.getGatewayId());
-                temporaryData.setValue(Float.valueOf(indicatorsDto.getValue()));
+                temporaryData.setValue(indicatorsDto.getValueDouble());
                 temporaryData.setEquipmentNumber(indicatorsDto.getEquipmentNumber());
                 temporaryDatass.add(temporaryData);
             } catch (Exception e) {