修改现场fenxi问题

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/controller/TDBigScreenAnalyseController.java

@@ -172,11 +172,11 @@ public class TDBigScreenAnalyseController extends BaseController {
                 return s + " 00:00:00";
             }).collect(Collectors.toList());
             List<Map<String, Object>> healthListInfo = fanHealthIndexMapper.getInfoByDate(finalAreaCode,
-                    finalStationCode, fullDateList);
+                    finalStationCode, dateList);
             Map<String, Object> map = healthListInfo.stream().collect(Collectors
                     .toMap(i -> String.valueOf(i.get("recdate")), i -> i.get("healthindex"), (key1, key2) -> key2));
             for (String date : dateList) {
-                String value = map.get(date + " 00:00:00") != null ? String.valueOf(map.get(date + " 00:00:00"))
+                String value = map.get(date) != null ? String.valueOf(map.get(date))
                         : "100";
                 valueList.add(String.valueOf(Math.round(Double.valueOf(value) * 10.0) / 10.0));
             }

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/mapper2/IdxBizFanHealthIndexMapper.java

@@ -23,6 +23,8 @@ public interface IdxBizFanHealthIndexMapper extends BaseMapper<IdxBizFanHealthIn
 
 	BigDecimal getHealthScoreInfo(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode);
 
+	BigDecimal getHealthScoreInfoNew(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode,@Param("analysisType") String analysisType);
+
 	BigDecimal getHealthScoreInfoByLatest(@Param("areaCode") String areaCode, @Param("stationCode") String stationCode);
 
 	BigDecimal getHealthScoreInfoByStation(@Param("stationCode") String stationCode,

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

@@ -1240,9 +1240,8 @@ public class MonitorFanIdxController extends BaseController {
 
 
         BoolQueryBuilder boolMustAll = QueryBuilders.boolQuery();
-        //警情状态
         List<QueryBuilder> should = boolMustAll.should();
-        String[] keys = new String[]{"日发电量", "月发电量", "年发电量"};
+        String[] keys = new String[]{"日发电量", "月发电量", "年发电量","有功功率"};
         List<String> list = Arrays.asList(keys);
         BoolQueryBuilder boolQueryBuilder = QueryBuilders.boolQuery();
         if (!stationBasic.getStationType().equals("FDZ")) {
@@ -1303,6 +1302,8 @@ public class MonitorFanIdxController extends BaseController {
                             break;
                         case "年发电量":
                             map.put("yearNum", String.format(CommonConstans.Fourdecimalplaces, Double.valueOf(value) * CommonConstans.pvGenPoweActorCurrentData));
+                        case "有功功率":
+                            map.put("yggl",  String.format(CommonConstans.Fourdecimalplaces,Double.valueOf(value)));
                     }
 
                 }else{
@@ -1315,6 +1316,8 @@ public class MonitorFanIdxController extends BaseController {
                             break;
                         case "年发电量":
                             map.put("yearNum", value);
+                        case "有功功率":
+                            map.put("yggl",  String.format(CommonConstans.Fourdecimalplaces,Double.valueOf(value)));
 //                        case CommonConstans.taiHeGenIndicatorDay:
 //                            map.put("dayNum", value);
 //                            break;