地图新增信息
parent
b5acd5f91d
commit
0a95da31c7
|
@ -922,7 +922,7 @@ public class MapController extends BaseController {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@RequestMapping(value = "/getAlarmList")
|
@RequestMapping(value = "/getAllDwMessage")
|
||||||
@ResponseBody
|
@ResponseBody
|
||||||
public Object getAlarmList() throws Exception {
|
public Object getAlarmList() throws Exception {
|
||||||
Map<String, Object> map = new HashMap<String, Object>();
|
Map<String, Object> map = new HashMap<String, Object>();
|
||||||
|
@ -934,7 +934,10 @@ public class MapController extends BaseController {
|
||||||
alarmGet.getPage().setCurrent("1");
|
alarmGet.getPage().setCurrent("1");
|
||||||
alarmGet.getPage().setSize("20");
|
alarmGet.getPage().setSize("20");
|
||||||
alarmGet.setCorpId(pd.getString("corpId"));
|
alarmGet.setCorpId(pd.getString("corpId"));
|
||||||
return dwService.getAlarmList(alarmGet);
|
map.put("result", "success");
|
||||||
|
map.put("alarmList",dwService.getAlarmList(alarmGet));
|
||||||
|
map.put("orthermessage",dwService.getAllMessage());
|
||||||
|
return map;
|
||||||
}else {
|
}else {
|
||||||
PageData value = usersService.getPersonByCardNo(pd);
|
PageData value = usersService.getPersonByCardNo(pd);
|
||||||
map.put("result", "success");
|
map.put("result", "success");
|
||||||
|
|
Loading…
Reference in New Issue