修改确警页面后端bug

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageInfoParam.java

@@ -115,6 +115,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String isFireAlarm;
 
+	private String isRemovedFire;
+
+	public void setIsRemovedFire(String isRemovedFire) {
+		this.isRemovedFire = isRemovedFire;
+	}
+
+	public String getIsRemovedFire() {
+		return isRemovedFire;
+	}
+
 	public void setIsFireAlarm(String isFireAlarm) {
 		this.isFireAlarm = isFireAlarm;
 	}

amos-boot-module/amos-boot-module-api/amos-boot-module-equip-api/src/main/java/com/yeejoin/equipmanage/common/utils/CommonPageParamUtil.java

@@ -61,6 +61,8 @@ public class CommonPageParamUtil {
 				param.setCleanStatus(toString(queryRequests.get(i).getValue()));
 			} else if("isRemoveShield".equals(name)){
 				param.setIsRemoveShield(toString(queryRequests.get(i).getValue()));
+			} else if("isRemovedFire".equals(name)){
+				param.setIsRemovedFire(toString(queryRequests.get(i).getValue()));
 			}
 		}
 		if(commonPageable !=null){

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/controller/EquipmentAlarmController.java

@@ -217,6 +217,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
                                         @RequestParam(value = "id", required = false) String id,
                                         @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
+                                        @RequestParam(value = "isRemovedFire", required = false) String isRemovedFire,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
@@ -264,6 +265,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request12.setName("isRemoveShield");
         request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
         queryRequests.add(request12);
+        CommonRequest request13 = new CommonRequest();
+        request13.setName("isRemovedFire");
+        request13.setValue(StringUtil.isNotEmpty(isRemovedFire) ? StringUtils.trimToNull(isRemovedFire) : null);
+        queryRequests.add(request13);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         org.springframework.data.domain.Page<AlarmListDataVO> list = iEquipmentSpecificAlarmService.listAlarmsPage(param);
         return CommonResponseUtil.success(list);

amos-boot-system-equip/src/main/resources/mapper/EquipmentSpecificAlarmMapper.xml

@@ -363,6 +363,9 @@
         <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
             d.type != 'SHIELD'
         </if>
+        <if test="param.isRemovedFire != null and param.isRemovedFire == 1">AND
+            d.type != 'FIREALARM'
+        </if>
         </where>
         ORDER BY d.createDate DESC
     </select>