修改bug

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

@@ -374,12 +374,12 @@ public class LargeScreenImpl {
          List<String> value=new ArrayList<>();
          value.add(RSD);
          Map<String,List<String>> map=new HashMap<>();
-         map.put("equipmentIndexName.keyword",value);
+         map.put("equipmentIndexName",value);
          List<String> value1=new ArrayList<>();
          value1.add(monthy);
-         map.put("moon.keyword",value1);
+         map.put("moon",value1);
 
-         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day.keyword", ESDailyPowerGeneration.class);
+         List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"value" ,"day", ESDailyPowerGeneration.class);
 
          Map<String,Double>  mapdta=new HashMap<>();
          DecimalFormat format2 = new DecimalFormat("#.0000");
@@ -422,13 +422,13 @@ public class LargeScreenImpl {
         List<String> value=new ArrayList<>();
         value.add(RSD);
         Map<String,List<String>> map=new HashMap<>();
-        map.put("equipmentIndexName.keyword",value);
-        map.put("gatewayId.keyword", gatewayId);
+        map.put("equipmentIndexName",value);
+        map.put("gatewayId", gatewayId);
         List<String> value1=new ArrayList<>();
         value1.add(monthy);
-        map.put("moon.keyword",value1);
+        map.put("moon",value1);
 
-        List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"valueDouble" ,"day.keyword",ESEquipments.class);
+        List<? extends Terms.Bucket> lidate=  commonServiceImpl.getgroupsum(map,"valueDouble" ,"day",ESDailyPowerGeneration.class);
 
         Map<String,Double>  mapdta=new HashMap<>();
         DecimalFormat format2 = new DecimalFormat("#.0000");
@@ -472,7 +472,7 @@ public class LargeScreenImpl {
         Calendar cal = Calendar.getInstance();
         cal.setTime(month);//month 为指定月份任意日期
         int year = cal.get(Calendar.YEAR);
-        int m = cal.get(Calendar.MONTH);
+        int m = cal.get(Calendar.MONTH)+1;
         int dayNumOfMonth = DateUtil.getDaysByYearMonth(year, m);
         cal.set(Calendar.DAY_OF_MONTH, 1);// 从一号开始