Commit 82150338 authored by 高建强's avatar 高建强

item:数字换流站列表分页查询,新增参数

parent 24fce64e
......@@ -68,6 +68,11 @@ public class CommonPageInfoParam extends CommonPageable {
private String equipCode;
/**
* 装备类型编码
*/
private String equipDetailCode;
/**
* 警情是否确认
*/
private String confirmType;
......@@ -189,6 +194,14 @@ public class CommonPageInfoParam extends CommonPageable {
return equipCode;
}
public String getEquipDetailCode() {
return equipDetailCode;
}
public void setEquipDetailCode(String equipDetailCode) {
this.equipDetailCode = equipDetailCode;
}
public String getAlarmType() {
return alarmType;
}
......
......@@ -37,6 +37,8 @@ public class CommonPageParamUtil {
param.setWarehouseStructureName(toString(queryRequests.get(i).getValue()));
}else if("equipCode".equals(name)){
param.setEquipCode(toString(queryRequests.get(i).getValue()));
}else if("equipDetailCode".equals(name)){
param.setEquipDetailCode(toString(queryRequests.get(i).getValue()));
}else if("confirmType".equals(name)){
param.setConfirmType(toString(queryRequests.get(i).getValue()));
}else if("alarmType".equals(name)){
......
......@@ -63,8 +63,7 @@ public class ConfigureController extends AbstractBaseController {
queryRequests.add(request13);
}
CommonPageInfoParam param = CommonPageParamUtil.fillCommonPageInfoParam(queryRequests, commonPageable);
Page<Map<String, Object>> list = equipmentSpecificAlarmService.pageQuery(param);
return CommonResponseUtil.success(list);
return CommonResponseUtil.success(equipmentSpecificAlarmService.pageQuery(param));
}
@RequestMapping(value = "/equipStatusCount", method = RequestMethod.GET)
......
......@@ -226,6 +226,7 @@ public class EquipmentAlarmController extends AbstractBaseController {
@RequestParam(value = "endDate", required = false) String endDate,
@RequestParam(value = "warehouseStructureName", required = false) String warehouseStructureName,
@RequestParam(value = "equipCode", required = false) String equipCode,
@RequestParam(value = "equipDetailCode", required = false) String equipDetailCode,
@RequestParam(value = "confirmType", required = false) String confirmType,
@RequestParam(value = "alarmType", required = false) String alarmType,
@RequestParam(value = "systemCode", required = false) String systemCode,
......@@ -286,6 +287,10 @@ public class EquipmentAlarmController extends AbstractBaseController {
request13.setName("isRemovedFire");
request13.setValue(StringUtil.isNotEmpty(isRemovedFire) ? StringUtils.trimToNull(isRemovedFire) : null);
queryRequests.add(request13);
CommonRequest request15 = new CommonRequest();
request15.setName("equipDetailCode");
request15.setValue(StringUtil.isNotEmpty(equipDetailCode) ? StringUtils.trimToNull(equipDetailCode) : null);
queryRequests.add(request15);
if (equioEnabled){
if (!ValidationUtil.isEmpty(reginParams.getPersonIdentity())){
CommonRequest request14 = new CommonRequest();
......
......@@ -344,7 +344,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,
we.code AS equipDetailCode
FROM
wl_equipment_specific_alarm_log wlesal
LEFT JOIN wl_equipment we ON wlesal.equipment_code = we.code
......@@ -375,6 +376,9 @@
<if test="param.equipCode != null and param.equipCode != ''">AND d.fireEquipmentCode like
concat(concat("%",#{param.equipCode}),"%")
</if>
<if test="param.equipDetailCode != null and param.equipDetailCode != ''">AND d.equipDetailCode like
concat(concat("%",#{param.equipDetailCode}),"%")
</if>
<choose>
<when test="param.confirmType != null and param.confirmType != '' and param.confirmType == 1">
AND d.handleType <![CDATA[<>]]> ''
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment