From 0915f9c21ee26c3b52a763eed9000d3b165e19ce Mon Sep 17 00:00:00 2001
From: kaiyu <404897439@qq.com>
Date: Fri, 27 Nov 2020 11:22:15 +0800
Subject: [PATCH] BS登陆接口增加返回数据regionCode 开通mapPath接口，通过token获取用户地图
---
src/main/java/com/moral/controller/WebController.java | 34 +++++++++++++++++++++++-----------
1 files changed, 23 insertions(+), 11 deletions(-)
diff --git a/src/main/java/com/moral/controller/WebController.java b/src/main/java/com/moral/controller/WebController.java
index f88d02e..6cdf281 100644
--- a/src/main/java/com/moral/controller/WebController.java
+++ b/src/main/java/com/moral/controller/WebController.java
@@ -6,20 +6,16 @@
import com.moral.common.util.*;
import com.moral.common.webAnno.UserLoginToken;
import com.moral.entity.*;
+import com.moral.mapper.MapPathMapper;
import com.moral.service.*;
import com.moral.util.DateUtil;
import com.moral.util.LatLngTransformation;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import jdk.nashorn.internal.runtime.logging.Logger;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
import javax.annotation.PostConstruct;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import java.text.ParseException;
import java.text.SimpleDateFormat;
import java.util.*;
@@ -65,12 +61,17 @@
SensorService sensorService;
@Resource
OrganizationSensorsService organizationSensorsService;
+ @Resource
+ MapPathService mapPathService;
- @UserLoginToken
@GetMapping("test")
- public String add() {
- return "test success!";
+ public ResultBean<List<WebProvince>> add(HttpServletRequest request) {
+ String token = request.getHeader("token");
+ List<WebProvince> mapPath = mapPathService.getMapPath(token);
+ if(ObjectUtils.isEmpty(mapPath))
+ return new ResultBean<>("������������������������",ResultBean.FAIL);
+ return new ResultBean<>(mapPath);
}
/**
@@ -87,7 +88,7 @@
resultMap.put("msg", "������������������������������������");
resultMap.put("accountId", -1);
} else {
- resultMap = accountService.webLogin(parameters);
+ resultMap = accountService.bsWebLogin(parameters);
String accountId = String.valueOf(resultMap.get("accountId"));
if (!accountId.equals("-1")) {
redisHashUtil.deleteMapVal("webToken", accountId);
@@ -445,6 +446,17 @@
return new ResultBean<Map<String, Object>>(sortDatas);
}
+ @GetMapping("mapPath")
+ public ResultBean<List<WebProvince>> mapPath(HttpServletRequest request) {
+ String token = request.getHeader("token");
+ List<WebProvince> mapPath = mapPathService.getMapPath(token);
+ if(ObjectUtils.isEmpty(mapPath))
+ return new ResultBean<>("������������������������",ResultBean.FAIL);
+ return new ResultBean<>(mapPath);
+ }
+
+
+
/**
* @Description: ���������������������������������������state
@@ -453,7 +465,7 @@
* @Author: ������������
* @Date: 2020/10/19
*/
- public List<Map<String, Object>> insertDeviceInfo(List<Map<String, Object>> datas, List<Device> devices) {
+ private List<Map<String, Object>> insertDeviceInfo(List<Map<String, Object>> datas, List<Device> devices) {
Map<String, Device> map = new HashMap<>();
devices.forEach(p -> {
map.put(p.getMac(), p);
@@ -512,7 +524,7 @@
* @Author: ������������
* @Date: 2020/10/20
*/
- public String getFiveMinuteAgoTime(String time) {
+ private String getFiveMinuteAgoTime(String time) {
try {
SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
Date date = sdf.parse(time);
--
Gitblit v1.8.0