预警监测bug修改

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

@@ -338,7 +338,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
 
-			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			List<PvHealthIndexDay> fanHealthIndexDays = pvHealthIndexDayMapper.selectData(station, requiredType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size);
 
 			Map<String,Object> map = new HashMap<>();
 
@@ -360,7 +360,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			} catch (ParseException e) {
 				e.printStackTrace();
 			}
-			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			List<PvHealthIndexHour> fanHealthIndexHours = pvHealthIndexHourMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
 
 			map.put("value", Double.parseDouble(df.format(fanHealthIndexHours.get(0).getHealthIndex())));
@@ -371,7 +371,7 @@ public class IdxBizPvHealthIndexController extends BaseController {
 			date = DateUtils.dateAddHours(date, -8);
 			SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 			startTimeTop = formatter.format(date);
-			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(healthLevel, area, equipmentName, subarray, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop,(current-1)*size,size);
+			List<PvHealthIndexMoment> fanHealthIndexMoments = pvHealthIndexMomentMapper.selectData(station, analysisType, indexAddress, healthLevel, area, analysisObjType, subarray, pointName, startTimeTop, endTimeTop, equipmentName,(current-1)*size,size);
 			Map<String,Object> map = new HashMap<>();
 
 			map.put("value", Double.parseDouble(df.format(fanHealthIndexMoments.get(0).getHealthIndex())));

amos-boot-system-jxiop/amos-boot-module-jxiop-analyse-biz/src/main/resources/mapper/tdengine2/PvWarningRecord.xml

@@ -152,7 +152,8 @@
 
 
     <select id="selectWarningPointTotal"  resultType="int">
-        SELECT
+        select count(1) from
+        (SELECT
         a.station,
         a.warning_name,
         a.content,
@@ -178,7 +179,7 @@
         point_name,
         rec_date ,
         content,
-        warning_name
+        warning_name) b
     </select>
 
     <select id="selectEquipWarningTotal" resultType="map">
@@ -204,7 +205,7 @@
         `z`.`warning_name` as `WARNING_NAME`,
         count( 1 ) as `num`
         from
-        analysis_data.fan_warning_record z where
+        analysis_data.pv_warning_record z where
         ( `z`.`status` = 0 )
         <if test="STATION != null and  STATION != '' ">
             AND z.station = #{STATION}