bug修改

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

@@ -642,7 +642,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexDay> fanHealthIndexDays = fanHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexDays.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexDays.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else if (requiredType.equals("按小时")){
 
@@ -666,7 +666,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexHour> fanHealthIndexHours = fanHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexHours.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexHours.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}else {
 //			if (null != type && type.equals("0")){
@@ -683,7 +683,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 //			}
 			List<FanHealthIndexMoment> fanHealthIndexMoments = fanHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
-			map.put("value",fanHealthIndexMoments.get(0).getValue());
+			map.put("value",Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));
 			return 	ResponseHelper.buildResponse(map);
 		}
 	}

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/java/com/yeejoin/amos/boot/module/jxiop/biz/tdMapper2/PvHealthIndexDayMapper.java

@@ -7,6 +7,7 @@ import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 
 import java.util.List;
+import java.util.Map;
 
 public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
     @Select("<script>"+
@@ -24,7 +25,17 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "order by health_index "+
             "<if test='current != null and size != null'>limit ${current},${size} </if>" +
             "</script>")
-    List<PvHealthIndexDay> selectData(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName
+    List<PvHealthIndexDay> selectData(@Param("station")String station,
+                                      @Param("analysisType")String analysisType,
+                                      @Param("indexAddress")String indexAddress,
+                                      @Param("healthLevel")String healthLevel,
+                                      @Param("area")String area,
+                                      @Param("analysisObjType")String analysisObjType,
+                                      @Param("subarray")String subarray,
+                                      @Param("pointName")String pointName,
+                                      @Param("startTimeTop") String startTimeTop,
+                                      @Param("endTimeTop")String endTimeTop,
+                                      @Param("equipmentName")String equipmentName
             , @Param("current")Integer current, @Param("size")Integer size);
 
 
@@ -43,4 +54,12 @@ public interface PvHealthIndexDayMapper extends BaseMapper<PvHealthIndexDay> {
             "</script>")
     int selectDataTotal(@Param("station")String station,@Param("analysisType")String analysisType,@Param("indexAddress")String indexAddress,@Param("healthLevel")String healthLevel,@Param("area")String area,@Param("analysisObjType")String analysisObjType, @Param("subarray")String subarray, @Param("pointName")String pointName,@Param("startTimeTop") String startTimeTop, @Param("endTimeTop")String endTimeTop, @Param("equipmentName")String equipmentName);
 
+    @Select("<script>"+
+            "SELECT  station, health_level as healthlevel,( CASE HEALTH_LEVEL WHEN '危险' THEN 4 WHEN '警告' THEN 3 WHEN '注意' THEN 2 ELSE 1 END ) AS sort, count( 1 ) AS `value` FROM analysis_data.pv_health_index_day WHERE analysis_obj_type = #{analysisObjType} AND ts >= TODAY()-8h" +
+            "<if test='area!= null'> AND area = #{area} </if> " +
+            "<if test='station!= null'>AND station = #{station} </if>" +
+            " GROUP BY station,health_level  order by sort"+
+            "</script>")
+    List<Map<String,Object>> selectEquipStatusByStationPv(@Param("area")String area, @Param("analysisObjType")String analysisObjType, @Param("station")String station);
+
 }