修改默认值

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

@@ -89,7 +89,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                     for (int i = 0; i < listx.size(); i++) {
                        if(datum.getDate().equals(listx.get(i).toString())){
                            listy.remove(i);
-                           String format = datum.getNum()!=null?new DecimalFormat("#.000").format(datum.getNum()):"0";
+                           String format = datum.getNum()!=null?new DecimalFormat("#.000").format(datum.getNum()):null;
                            listy.add(i,format);
                            break;
                        }
@@ -137,7 +137,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
                 }
 
                 listx.add(aDate);
-                listy.add(0);
+                listy.add(null);
             }
             map.put("x",listx);
             map.put("y",listy);
@@ -160,7 +160,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             }
 
             listx.add(aDate);
-            listy.add(0);
+            listy.add(null);
         }
         map.put("x",listx);
         map.put("y",listy);
@@ -176,7 +176,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         for (int i = 1; i <= 10; i++) {
             int aDate = year-(10-i);
             listx.add(String.valueOf(aDate));
-            listy.add(0);
+            listy.add(null);
         }
         map.put("x",listx);
         map.put("y",listy);
@@ -192,7 +192,7 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             for (int i = 0; i < 24; i++) {
                 String s1 =i+":00";
                 listx.add(s1);
-                listy.add(0);
+                listy.add(null);
             }
 
         }catch (Exception e){

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

@@ -60,7 +60,7 @@ public class TdHygfJpCollectorHistoryServiceImpl
 			if (!list.isEmpty()) {
 				list.forEach(i -> {
 					i.setTimeFormat(TimeUtil.minuteFormat(i.getTime()));
-                    i.setSignalStrength(i.getSignalStrength()==null?0D:i.getSignalStrength());
+                    i.setSignalStrength(i.getSignalStrength()==null?null:i.getSignalStrength());
 
 				});
 			}

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

@@ -87,12 +87,12 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
                     da.setDay(s);
                     da.setSnCode(invertor.getSnCode().trim());
                     da.setYearMonth(monthStr);
-                    da.setUAcCurrent(0D);
-                    da.setUAcVoltage(0D);
-                    da.setVAcVoltage(0D);
-                    da.setVAcCurrent(0D);
-                    da.setWAcCurrent(0D);
-                    da.setWAcVoltage(0D);
+                    da.setUAcCurrent(null);
+                    da.setUAcVoltage(null);
+                    da.setVAcVoltage(null);
+                    da.setVAcCurrent(null);
+                    da.setWAcCurrent(null);
+                    da.setWAcVoltage(null);
                 }
                 lidata.add(da) ;
             }
@@ -160,12 +160,12 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
                     da.setMonth(String.valueOf(i));
                     da.setSnCode(invertor.getSnCode().trim());
                     da.setYear(yearStr);
-                    da.setUAcCurrent(0D);
-                    da.setUAcVoltage(0D);
-                    da.setVAcVoltage(0D);
-                    da.setVAcCurrent(0D);
-                    da.setWAcCurrent(0D);
-                    da.setWAcVoltage(0D);
+                    da.setUAcCurrent(null);
+                    da.setUAcVoltage(null);
+                    da.setVAcVoltage(null);
+                    da.setVAcCurrent(null);
+                    da.setWAcCurrent(null);
+                    da.setWAcVoltage(null);
                 }
                 lidata.add(da) ;
 
@@ -200,12 +200,12 @@ public class TdHygfJpInvertorElecHistoryServiceImpl extends
                     da=new JpInvertorElecHistoryAllDto();
                     da.setYear(String.valueOf(i));
                     da.setSnCode(invertor.getSnCode().trim());
-                    da.setUAcCurrent(0D);
-                    da.setUAcVoltage(0D);
-                    da.setVAcVoltage(0D);
-                    da.setVAcCurrent(0D);
-                    da.setWAcCurrent(0D);
-                    da.setWAcVoltage(0D);
+                    da.setUAcCurrent(null);
+                    da.setUAcVoltage(null);
+                    da.setVAcVoltage(null);
+                    da.setVAcCurrent(null);
+                    da.setWAcCurrent(null);
+                    da.setWAcVoltage(null);
                 }
                 lidata.add(da) ;