政平站新增点击更新后端

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

@@ -121,6 +121,16 @@ public class CommonPageInfoParam extends CommonPageable {
 
 	private String indexTypeCode;
 
+	private String fireEquipmentSpecificIndexKey;
+
+	public void setFireEquipmentSpecificIndexKey(String fireEquipmentSpecificIndexKey) {
+		this.fireEquipmentSpecificIndexKey = fireEquipmentSpecificIndexKey;
+	}
+
+	public String getFireEquipmentSpecificIndexKey() {
+		return fireEquipmentSpecificIndexKey;
+	}
+
 	public String getIndexTypeCode() {
 		return indexTypeCode;
 	}

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

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

@@ -221,6 +221,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
                                         @RequestParam(value = "isRemovedFire", required = false) String isRemovedFire,
                                         @RequestParam(value = "equipmentCode", required = false) String equipmentCode,
                                         @RequestParam(value = "indexTypeCode", required = false) String indexTypeCode,
+                                        @RequestParam(value = "specificIndexKey", required = false) String specificIndexKey,
                                         CommonPageable commonPageable) {
         List<CommonRequest> queryRequests = new ArrayList<>();
         CommonRequest request = new CommonRequest();
@@ -280,6 +281,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
         request15.setName("indexTypeCode");
         request15.setValue(StringUtil.isNotEmpty(indexTypeCode) ? StringUtils.trimToNull(indexTypeCode) : null);
         queryRequests.add(request15);
+        CommonRequest request16 = new CommonRequest();
+        request16.setName("specificIndexKey");
+        request16.setValue(StringUtil.isNotEmpty(specificIndexKey) ? StringUtils.trimToNull(specificIndexKey) : null);
+        queryRequests.add(request16);
         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

@@ -373,6 +373,9 @@
         <if test="param.indexTypeCode != null and param.indexTypeCode != ''">AND
             AND d.type == #{param.indexTypeCode}
         </if>
+        <if test="param.fireEquipmentSpecificIndexKey != null and param.fireEquipmentSpecificIndexKey != ''">
+            AND d.fireEquipmentSpecificIndexKey like concat(concat("%",#{param.fireEquipmentSpecificIndexKey}),"%")
+        </if>
         </where>
         ORDER BY d.createDate DESC
     </select>