From baaff76ba638ac37f5b1dcffb27ba9f5a9fff937 Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 05 Feb 2018 13:30:16 +0800
Subject: [PATCH] token放在get请求参数中

---
 src/main/java/com/moral/controller/MapController.java |   74 +++++++++++++++++++++++++++---------
 1 files changed, 55 insertions(+), 19 deletions(-)

diff --git a/src/main/java/com/moral/controller/MapController.java b/src/main/java/com/moral/controller/MapController.java
index c32d4b5..9d0f0a8 100644
--- a/src/main/java/com/moral/controller/MapController.java
+++ b/src/main/java/com/moral/controller/MapController.java
@@ -2,15 +2,19 @@
 
 
 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.AccountService;
-import com.moral.service.AreaService;
-import com.moral.service.MonitorPointService;
-import com.moral.service.SensorService;
+import com.moral.security.auth.JwtAuthenticationToken;
+import com.moral.security.config.WebSecurityConfig;
+import com.moral.service.*;
+import lombok.extern.log4j.Log4j;
+import org.apache.log4j.Logger;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
@@ -27,6 +31,10 @@
 @Controller
 @RequestMapping("map")
 public class MapController {
+    public  final  static String REFRESH_TOKEN = "_refresh_token";
+    public  static Logger log = Logger.getLogger(MapController.class);
+    @Resource
+    DeviceService deviceService;
     @Resource
     AreaService areaService;
     @Resource
@@ -35,26 +43,44 @@
     SensorService sensorService;
     @Resource
     MonitorPointService monitorPointService;
-    @RequestMapping(value = "/main-page", method = RequestMethod.GET)
-    public String map(Model model,@RequestParam("areaCode")int code,@RequestParam("accountId")int accountId){
-        Account account = accountService.getAccountById(accountId);
+
+    @RequestMapping(value = "/screen-main", method = RequestMethod.GET)
+    public String map(Model model,
+                      @RequestParam("areaCode")int code,
+                      @RequestParam(WebSecurityConfig.AUTHENTICATION_PARAM_NAME)String token,
+                      @RequestParam(REFRESH_TOKEN)String refreshToke,
+                      JwtAuthenticationToken authenticationToken){
+        String accountName = authenticationToken.getPrincipal().getUsername();
+        Account account = accountService.getAccountByAccountName(accountName);
         String regionName = areaService.selectFullNameByCode(code);
-        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";
+        if(account!=null&&regionName!=null){
+            Object sensors = sensorService.queryAll();
+            JSONObject params = new JSONObject();
+            params.put("regionCode",code);
+            params.put("regionName",regionName);
+            //token ������������
+            params.put(WebSecurityConfig.AUTHENTICATION_PARAM_NAME, token);
+            params.put(REFRESH_TOKEN,refreshToke);
+            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] token:");
+            msg.append(token);
+            log.warn(msg);
+            return "401";
+        }
     }
-    @RequestMapping(value="/getmonitorpoints",method = RequestMethod.GET)
+    @RequestMapping(value="get-monitorpoints",method = RequestMethod.GET)
     @ResponseBody
-    public ResultBean getMonitorpointList(@RequestParam("orgId")String orgId,MapBounds mapBounds){
+    public ResultBean getMonitorpointList(JwtAuthenticationToken authenticationToken,MapBounds mapBounds){
         ResultBean< List<MonitorPoint>> resultBean = new ResultBean();
         Map<String,Object> paramMap = new HashMap<String, Object>();
+        Integer orgId = authenticationToken.getPrincipal().getOrganizationId();
         paramMap.put("orgId", orgId);
         paramMap.put("mapBounds",mapBounds);
         List<MonitorPoint> list = monitorPointService.queryWithStateByMap(paramMap);
@@ -62,4 +88,14 @@
         resultBean.setCode(ResultBean.SUCCESS);
         return resultBean;
     }
+    @RequestMapping(value = "get-devices-for-popup",method = RequestMethod.GET)
+    @ResponseBody
+    public PageResult getDevicesForPopup(
+            JwtAuthenticationToken authenticationToken,
+            String name,
+            Integer pageSize,
+            Integer pageNo
+    ){  Integer orgId = authenticationToken.getPrincipal().getOrganizationId();
+        return  deviceService.query(orgId,name,pageSize,pageNo);
+    }
 }

--
Gitblit v1.8.0