更新

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

@@ -111,6 +111,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String status;
 
+	private String isRemoveShield;
+
+	public void setIsRemoveShield(String isRemoveShield) {
+		this.isRemoveShield = isRemoveShield;
+	}
+
+	public String getIsRemoveShield() {
+		return isRemoveShield;
+	}
+
 	public void setCleanStatus(String cleanStatus) {
 		this.cleanStatus = cleanStatus;
 	}

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

@@ -59,6 +59,8 @@ public class CommonPageParamUtil {
 				param.setStatus(toString(queryRequests.get(i).getValue()));
 			} else if("cleanStatus".equals(name)){
 				param.setCleanStatus(toString(queryRequests.get(i).getValue()));
+			} else if("isRemoveShield".equals(name)){
+				param.setIsRemoveShield(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

@@ -96,6 +96,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                   @RequestParam(value = "buildIds", required = false) List<String> buildIds,
                                   @RequestParam(value = "id", required = false) String id,
                                   @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
+                                  @RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
                                   CommonPageable commonPageable) {
         if (commonPageable.getPageNumber() == 0) {
             commonPageable.setPageNumber(1);
@@ -148,7 +149,11 @@ public class EquipmentAlarmController extends AbstractBaseController {
         CommonRequest request11 = new CommonRequest();
         request11.setName("cleanStatus");
         request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
-        queryRequests.add(request11);
+        queryRequests.add(request1);
+        CommonRequest request12 = new CommonRequest();
+        request12.setName("isRemoveShield");
+        request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
+        queryRequests.add(request12);
         CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
         Page<Map<String, Object>> list = iEquipmentSpecificAlarmService.listPage(param);
         return CommonResponseUtil.success(list);
@@ -209,7 +214,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "alarmType", required = false) String alarmType,
                                         @RequestParam(value = "systemCode", required = false) String systemCode,
                                         @RequestParam(value = "buildId", required = false) String buildId,
-//                                        @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
+                                        @RequestParam(value = "isRemoveShield", required = false) String isRemoveShield,
                                         @RequestParam(value = "id", required = false) String id,
                                         @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                         CommonPageable commonPageable) {
@@ -255,6 +260,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request11.setName("cleanStatus");
         request11.setValue(StringUtil.isNotEmpty(cleanStatus) ? StringUtils.trimToNull(cleanStatus) : null);
         queryRequests.add(request11);
+        CommonRequest request12 = new CommonRequest();
+        request12.setName("isRemoveShield");
+        request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
+        queryRequests.add(request12);
         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

@@ -248,6 +248,9 @@
             <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
                 d.cleanStatus = '未消除'
             </if>
+            <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
+                d.type != 'SHIELD'
+            </if>
         </where>
         ORDER BY d.createDate DESC
     </select>
@@ -389,6 +392,9 @@
         <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
             d.cleanStatus = '未消除'
         </if>
+        <if test="param.isRemoveShield != null and param.isRemoveShield != ''">AND
+            d.type != 'SHIELD'
+        </if>
         ORDER BY d.createDate DESC
     </select>
     <select id="getAlarmList" resultType="java.util.HashMap">