From 788489c7e95352a11cf5ec40a7a9c7277e5cc0f3 Mon Sep 17 00:00:00 2001 From: fengxiang <110431245@qq.com> Date: Fri, 02 Feb 2018 09:19:53 +0800 Subject: [PATCH] 安全跨域设置 --- src/main/java/com/moral/controller/MapController.java | 79 ++++++++++++++++++++++++++++++++++++--- 1 files changed, 73 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/moral/controller/MapController.java b/src/main/java/com/moral/controller/MapController.java index 1bc9ade..88281a4 100644 --- a/src/main/java/com/moral/controller/MapController.java +++ b/src/main/java/com/moral/controller/MapController.java @@ -2,12 +2,25 @@ import com.alibaba.fastjson.JSONObject; +import com.moral.common.bean.Constants; +import com.moral.common.bean.PageBean; +import com.moral.common.bean.PageResult; +import com.moral.common.bean.ResultBean; +import com.moral.entity.Account; +import com.moral.entity.Device; +import com.moral.entity.MapBounds; +import com.moral.entity.MonitorPoint; +import com.moral.service.*; +import lombok.extern.log4j.Log4j; +import org.apache.log4j.Logger; import org.springframework.stereotype.Controller; -import org.springframework.web.bind.annotation.RequestMapping; -import org.springframework.web.bind.annotation.RequestMethod; -import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.ui.Model; +import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; +import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; import java.util.Map; /** @@ -16,9 +29,63 @@ @Controller @RequestMapping("map") public class MapController { + public static Logger log = Logger.getLogger(MapController.class); + @Resource + DeviceService deviceService; + @Resource + AreaService areaService; + @Resource + AccountService accountService; + @Resource + SensorService sensorService; + @Resource + MonitorPointService monitorPointService; + @RequestMapping(value = "/main-page", method = RequestMethod.GET) - public String map(){ - ModelAndView mv = new ModelAndView("map"); - return "map"; + public String map(Model model,@RequestParam("areaCode")int code,@RequestParam("accountId")int accountId){ + Account account = accountService.getAccountById(accountId); + String regionName = areaService.selectFullNameByCode(code); + if(account!=null&®ionName!=null){ + Object sensors = sensorService.queryAll(); + JSONObject params = new JSONObject(); + params.put("regionCode",code); + params.put("regionName",regionName); + params.put("accountId", accountId); + params.put("orgId", account.getOrganizationId()); + params.put("sensors", sensors); + String paramsJson = params.toJSONString(); + model.addAttribute("mapParams",paramsJson); + return "map"; + } else { + StringBuilder msg = new StringBuilder(); + msg.append(" param[0] areaCode:"); + msg.append(code); + msg.append(" param[0] accountId:"); + msg.append(accountId); + log.warn(msg); + return "401"; + } + } + @RequestMapping(value="/get-monitorpoints",method = RequestMethod.GET) + @ResponseBody + public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){ + ResultBean< List<MonitorPoint>> resultBean = new ResultBean(); + Map<String,Object> paramMap = new HashMap<String, Object>(); + paramMap.put("orgId", orgId); + paramMap.put("mapBounds",mapBounds); + List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap); + resultBean.setData(list); + resultBean.setCode(ResultBean.SUCCESS); + return resultBean; + } + @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET) + @ResponseBody + public PageResult getDevicesForPopup( + @RequestParam("orgId")Integer orgId, + String name, + Integer pageSize, + Integer pageNo + ){ + return deviceService.query(orgId,name,pageSize,pageNo); } } -- Gitblit v1.8.0