| | |
| | | String time1= (String) parameters.get("time"); |
| | | String mac1= (String) parameters.get("mac"); |
| | | List<Map<String, Object>> list=null; |
| | | if (mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){ |
| | | if (mac1!=null && mac1.equals("p5dnd7a0392018") && time1.substring(0,4).equals("2019") ){ |
| | | list=null; |
| | | }else { |
| | | }else { |
| | | parameters.put("monitorPointId", parameters.remove("monitorPoint")); |
| | | Object sensorKey = parameters.remove("sensorKey"); |
| | | parameters.put("sensors", Arrays.asList(sensorKey)); |
| | |
| | | @RequestMapping(value = "/newMap-page", method = RequestMethod.GET) |
| | | public ModelAndView newMap(ModelAndView model, @RequestParam("areaCode") long code, |
| | | @RequestParam("accountId") int accountId) { |
| | | |
| | | Account account = accountService.getAccountById(accountId); |
| | | List<MonitorPoint> monitorPointList = monitorPointService.getMonitorPointListByAccountId(accountId); |
| | | String regionName = areaService.queryFullNameByCode(code); |