解决默认值

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/JpStationController.java

@@ -158,7 +158,7 @@ public class JpStationController extends BaseController {
         collector.put("zx",0);
         collector.put("bj",0);
         collector.put("lx",0);
-            if(list!=null&&list.isEmpty()){
+            if(list!=null&&!list.isEmpty()){
                 for (Map<String, Object> map : list) {
                     if("在线".equals(map.get("state").toString())){
                         collector.put("zx",Integer.valueOf(map.get("num").toString()));

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/controller/TdHygfJpInverterWarnController.java

@@ -205,9 +205,9 @@ public class TdHygfJpInverterWarnController extends BaseController {
         if(datalist!=null&&!datalist.isEmpty()){
             for (Map<String, Object> map  : datalist) {
                 if("未处理".equals(map.get("state").toString())){
-                    collector.put("wcl",map.get("num"));
+                    collector.put("wcl",Integer.valueOf(map.get("num").toString()));
                 }else if("已处理".equals(map.get("state").toString())||"已恢复".equals(map.get("state").toString())){
-                    collector.put("ycl",map.get("num"));
+                    collector.put("ycl",Integer.valueOf(map.get("num").toString()));
                 }
             }
         }

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

@@ -128,7 +128,13 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
             int month = aCalendar.get(Calendar.MONTH) + 1;//月份
             int day = aCalendar.getActualMaximum(Calendar.DATE);
             for (int i = 1; i <= day; i++) {
-                String aDate = month+"-"+i;
+                String aDate =null;
+                if(i<10){
+                    aDate = date+"-0"+i;
+                }else{
+                    aDate = date+"-"+i;
+                }
+
                 listx.add(aDate);
                 listy.add(0);
             }
@@ -145,7 +151,13 @@ public class JpStationServiceImpl extends BaseService<JpStationDto,JpStation,JpS
         List<Object> listx =new  ArrayList<>();
         List<Object> listy =new ArrayList<>();
         for (int i = 1; i <= 12; i++) {
-            String aDate = date+"-"+i;
+            String aDate =null;
+            if(i<10){
+                 aDate = date+"-0"+i;
+            }else{
+                aDate = date+"-"+i;
+            }
+
             listx.add(aDate);
             listy.add(0);
         }