告警按系统过滤

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

@@ -91,6 +91,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                   @RequestParam(value = "equipCode", required = false) String equipCode,
                                   @RequestParam(value = "handleStatus", required = false) String handleStatus,
                                   @RequestParam(value = "system", required = false) String system,
+                                  @RequestParam(value = "systemCode", required = false) String systemCode,
                                   @RequestParam(value = "alarmType", required = false) String alarmType,
                                   @RequestParam(value = "type", required = false) String type,
                                   @RequestParam(value = "buildIds", required = false) List<String> buildIds,
@@ -155,6 +156,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request12.setName("isRemoveShield");
         request12.setValue(StringUtil.isNotEmpty(isRemoveShield) ? StringUtils.trimToNull(isRemoveShield) : null);
         queryRequests.add(request12);
+        CommonRequest request14 = new CommonRequest();
+        request14.setName("systemCode");
+        request14.setValue(StringUtil.isNotEmpty(systemCode) ? StringUtils.trimToNull(systemCode) : null);
+        queryRequests.add(request14);
         if (equioEnabled) {
             if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())) {
                 CommonRequest request13 = new CommonRequest();

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

@@ -247,6 +247,9 @@
             <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 1">AND
                 wlesal.clean_time IS NOT NULL
             </if>
+            <if test="param.systemCode != null and param.systemCode != ''">AND
+                wlesal.system_codes = #{systemCode}
+            </if>
             <if test="param.cleanStatus != null and param.cleanStatus != '' and param.cleanStatus == 2">AND
                  wlesal.clean_time IS NULL
             </if>