飞书 bug修改

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

@@ -392,7 +392,7 @@ public class IdxBizFanHealthIndexController extends BaseController {
 		int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
 		page.setRecords(fanHealthIndexDays);
 		page.setTotal(total);
-		page.setTotal(Long.valueOf(fanHealthIndexDays.size()));
+//		page.setTotal(Long.valueOf(fanHealthIndexDays.size()));
 		return ResponseHelper.buildResponse(page);
 	}
 
@@ -549,6 +549,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			Page page = new Page<>();
 			page.setCurrent(current);
 			page.setSize(size);
+			int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			page.setTotal(total);
 			page.setRecords(fanHealthIndexDays);
 			return 	ResponseHelper.buildResponse(page);
 		}else if (requiredType.equals("按小时")){
@@ -578,6 +580,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			Page page = new Page<>();
 			page.setCurrent(current);
 			page.setSize(size);
+			int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			page.setTotal(total);
 			page.setRecords(fanHealthIndexHours);
 			return 	ResponseHelper.buildResponse(page);
 		}else {
@@ -600,6 +604,8 @@ public class IdxBizFanHealthIndexController extends BaseController {
 			Page page = new Page<>();
 			page.setCurrent(current);
 			page.setSize(size);
+			int total = fanHealthIndexDayMapper.selectDataTotal(healthLevel, area, equipmentName, subSystem, analysisType, analysisObjType, station, pointName, indexAddress, startTimeTop, endTimeTop);
+			page.setTotal(total);
 			page.setRecords(fanHealthIndexMoments);
 			return 	ResponseHelper.buildResponse(page);
 		}

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

@@ -111,6 +111,7 @@
     </select>
 
     <select id="selectWarningPoint" resultType="com.yeejoin.amos.boot.module.jxiop.biz.tdengine.FanWarningRecord">
+        select * from (
         SELECT
         a.station,
         a.warning_name,
@@ -134,7 +135,7 @@
         point_name,
         rec_date ,
         content,
-        warning_name
+        warning_name) b
         limit #{current},#{size}
     </select>