提交集成页面确警

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

@@ -117,6 +117,26 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String isRemovedFire;
 
+	private String equipmentCode;
+
+	private String indexTypeCode;
+
+	public String getIndexTypeCode() {
+		return indexTypeCode;
+	}
+
+	public void setIndexTypeCode(String indexTypeCode) {
+		this.indexTypeCode = indexTypeCode;
+	}
+
+	public String getEquipmentCode() {
+		return equipmentCode;
+	}
+
+	public void setEquipmentCode(String equipmentCode) {
+		this.equipmentCode = equipmentCode;
+	}
+
 	public void setIsRemovedFire(String isRemovedFire) {
 		this.isRemovedFire = isRemovedFire;
 	}

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

@@ -63,6 +63,8 @@ public class CommonPageParamUtil {
 				param.setIsRemoveShield(toString(queryRequests.get(i).getValue()));
 			} else if("isRemovedFire".equals(name)){
 				param.setIsRemovedFire(toString(queryRequests.get(i).getValue()));
+			} else if("equipmentCode".equals(name)){
+				param.setEquipmentCode(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

@@ -209,6 +209,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
     public ResponseModel listAlarmsPage(@RequestParam(value = "beginDate", required = false) String beginDate,
                                         @RequestParam(value = "endDate", required = false) String endDate,
                                         @RequestParam(value = "warehouseStructureName", required = false) String warehouseStructureName,
+                                        // 此处equipCode指的是equipmentSpecificCode
                                         @RequestParam(value = "equipCode", required = false) String equipCode,
                                         @RequestParam(value = "confirmType", required = false) String confirmType,
                                         @RequestParam(value = "alarmType", required = false) String alarmType,
@@ -218,6 +219,8 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "id", required = false) String id,
                                         @RequestParam(value = "cleanStatus", required = false) String cleanStatus,
                                         @RequestParam(value = "isRemovedFire", required = false) String isRemovedFire,
+                                        @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
+                                        @RequestParam(value = "indexTypeCode", required = false) String indexTypeCode,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
@@ -269,6 +272,14 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request13.setName("isRemovedFire");
         request13.setValue(StringUtil.isNotEmpty(isRemovedFire) ? StringUtils.trimToNull(isRemovedFire) : null);
         queryRequests.add(request13);
+        CommonRequest request14 = new CommonRequest();
+        request14.setName("equipmentCode");
+        request14.setValue(StringUtil.isNotEmpty(equipmentCode) ? StringUtils.trimToNull(equipmentCode) : null);
+        queryRequests.add(request14);
+        CommonRequest request15 = new CommonRequest();
+        request15.setName("indexTypeCode");
+        request15.setValue(StringUtil.isNotEmpty(indexTypeCode) ? StringUtils.trimToNull(indexTypeCode) : null);
+        queryRequests.add(request15);
         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

@@ -314,7 +314,8 @@
         LEFT JOIN f_equipment AS fet ON fet.id = fefe.equipment_id
         WHERE
         fefe.fire_equipment_id = wlesal.equipment_specific_id
-        ) AS equipmentName
+        ) AS equipmentName,
+        wlesal.equipment_code AS equipmentCode
         FROM
         wl_equipment_specific_alarm_log wlesal
         LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
@@ -366,6 +367,12 @@
         <if test="param.isRemovedFire != null and param.isRemovedFire == 1">AND
             d.type != 'FIREALARM'
         </if>
+        <if test="param.equipmentCode != null and param.equipmentCode != ''">
+            AND d.equipmentCode like concat(concat("%",#{param.equipmentCode}),"%")
+        </if>
+        <if test="param.indexTypeCode != null and param.indexTypeCode != ''">AND
+            AND d.type == #{param.indexTypeCode}
+        </if>
         </where>
         ORDER BY d.createDate DESC
     </select>