提交预警确认状态分页

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

@@ -590,7 +590,9 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 			@RequestParam(value = "warningName", required = false) String warningName,
 			@RequestParam(value = "stationId", required = false) String stationId,
 			@RequestParam(value = "startDate", required = false) String startDate,
-			@RequestParam(value = "endDate", required = false) String endDate) {
+			@RequestParam(value = "endDate", required = false) String endDate,
+			@RequestParam(value = "disposotionState", required = false) String disposotionState
+			) {
         String syzGatewayId="";
 		if (StrUtil.isNotEmpty(stationId)) {
 			StationBasic stationBasic = stationBasicMapper.selectById(stationId);
@@ -601,7 +603,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 			arae = "%" + arae + "%";
 		}
 		Integer count = fanWaringRecordMapper.getEquipWarningInfoByPageCount(arae, station, stationType, warningName,
-				stationId, startDate, endDate,syzGatewayId);
+				stationId, startDate, endDate,syzGatewayId,disposotionState);
 		// 前端存在分页bug 此处限制分页后筛选导致页面超出问题
 		if (count > 0 && current > (count / 10 + 1)) {
 			current = 1;
@@ -611,7 +613,7 @@ public class TDBigScreenAnalyseController extends BaseController implements Appl
 		// stationType, (current - 1) * size, size, warningName, stationId, startDate,
 		// endDate);
 		List<FanWarningRecord> idxBizFanWarningRecordIPage = fanWaringRecordMapper.getEquipWarningInfoByPage(arae,
-				station, stationType, (current - 1) * size, size, warningName, stationId, startDate, endDate,syzGatewayId);
+				station, stationType, (current - 1) * size, size, warningName, stationId, startDate, endDate,syzGatewayId,disposotionState);
 
 		Page<FanWarningRecord> idxBizFanWarningRecordPage = new Page<>(current, size);
 		idxBizFanWarningRecordPage.setRecords(idxBizFanWarningRecordIPage);

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

@@ -41,9 +41,10 @@ public interface FanWaringRecordMapper  extends BaseMapper<FanWarningRecord> {
                                         @Param("warningName") String warningName,
                                         @Param("stationId") String stationId,
                                         @Param("startDate") String startDate,
-                                        @Param("endDate") String endDate,@Param("syzGatewayId") String syzGatewayId);
+                                        @Param("endDate") String endDate,@Param("syzGatewayId") String syzGatewayId,
+                                        @Param("disposotionState")String disposotionState);
 
- List<FanWarningRecord> getEquipWarningInfoByPage(String arae, String station, String stationType, Integer current, Integer size, String warningName, String stationId, String startDate, String endDate,@Param("syzGatewayId") String syzGatewayId);
+ List<FanWarningRecord> getEquipWarningInfoByPage(String arae, String station, String stationType, Integer current, Integer size, String warningName, String stationId, String startDate, String endDate,@Param("syzGatewayId") String syzGatewayId,@Param("disposotionState")String disposotionState);
 
  List<Map<String, Object>> getAllEquipAlarmInfoAnalysisByArea(String araeCode, String stationType);
 

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

@@ -381,6 +381,9 @@
             <if test="endDate != '' and endDate != null">
                 and concat(#{endDate}, ' 23:59:59') >= a.recdate
             </if>
+            <if test="disposotionState != '' and disposotionState != null">
+                and a.disposotionstate = #{disposotionState}
+            </if>
         </where>
         order by recDate desc
         limit #{current}, #{size}
@@ -446,7 +449,9 @@
             <if test="endDate != '' and endDate != null">
                 and concat(#{endDate}, ' 23:59:59') >= a.recdate
             </if>
-
+            <if test="disposotionState != '' and disposotionState != null">
+                and a.disposotionstate = #{disposotionState}
+            </if>
 
     </where>) b
     </select>