1、报警列表页面显示所有数据bug修复;2、忽略和确认时报错
parent
057ac23f9f
commit
f7b28773d6
|
@ -51,7 +51,7 @@ public class DwController extends BaseController {
|
||||||
if (mapGet.getPage() == null){
|
if (mapGet.getPage() == null){
|
||||||
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
|
mapGet.setPage(new com.zcloud.service.dw.dto.Page());
|
||||||
}
|
}
|
||||||
mapGet.getPage().setCurrent(String.valueOf(page.getCurrentPage()));
|
mapGet.getPage().setCurrent(String.valueOf(page.getUrlCurrentPage()));
|
||||||
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
|
mapGet.getPage().setSize(String.valueOf(page.getShowCount()));
|
||||||
return dwService.getAlarmList(mapGet);
|
return dwService.getAlarmList(mapGet);
|
||||||
}
|
}
|
||||||
|
@ -60,6 +60,7 @@ public class DwController extends BaseController {
|
||||||
public Object manageAlarm() throws Exception {
|
public Object manageAlarm() throws Exception {
|
||||||
PageData pd = this.getPageData();
|
PageData pd = this.getPageData();
|
||||||
AlarmManageDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmManageDto.class);
|
AlarmManageDto mapGet = JSONObject.parseObject(JSONObject.toJSONString(pd), AlarmManageDto.class);
|
||||||
|
mapGet.setAlarmId(pd.getString("DW_ALARM_ID"));
|
||||||
return dwService.manageAlarm(mapGet);
|
return dwService.manageAlarm(mapGet);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue