From a6ea3af4f8e917f1c19204bbaa5a75a4a86716ac Mon Sep 17 00:00:00 2001
From: fengxiang <110431245@qq.com>
Date: Mon, 16 Jul 2018 14:57:38 +0800
Subject: [PATCH] 组织登录后 返回行政区信息 "中国/江苏省/苏州市/昆山市"
---
src/main/java/com/moral/controller/ScreenController.java | 22 +++++++++++++---------
1 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/src/main/java/com/moral/controller/ScreenController.java b/src/main/java/com/moral/controller/ScreenController.java
index 064270e..8fd835e 100644
--- a/src/main/java/com/moral/controller/ScreenController.java
+++ b/src/main/java/com/moral/controller/ScreenController.java
@@ -28,14 +28,7 @@
import org.springframework.data.redis.core.RedisTemplate;
import org.springframework.security.access.prepost.PreAuthorize;
import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.ResponseBody;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.ModelAndView;
import org.xml.sax.InputSource;
import com.alibaba.fastjson.JSONArray;
@@ -58,7 +51,7 @@
*/
@RestController
@RequestMapping("/screen")
-//@CrossOrigin(origins = "*", maxAge = 3600)
+@CrossOrigin(origins = "*", maxAge = 3600)
@SuppressWarnings({ "rawtypes", "unchecked", "unused" })
@Api(tags = "Screen", description = "������������")
public class ScreenController {
@@ -110,6 +103,8 @@
private OrganizationLayoutService orgLayoutService;
@Resource
private DeviceVersionService dviceVersionService;
+ @Resource
+ private OrganizationService organizationService;
/**
* Screen login. ������������
*
@@ -126,6 +121,15 @@
resultMap.put("accountId", -1);
} else {
resultMap = accountService.screenLogin(parameters);
+ Object orgId = resultMap.get("orgId");
+ if(resultMap.get("orgId")!=null && resultMap.get("orgId") instanceof Integer) {
+ Organization organization = organizationService.getOrganizationById((Integer) orgId);
+ if( organization.getAreaNames()!=null){
+ AreaNames areaNames = organization.getAreaNames();
+ resultMap.put("mapPath ","������/"+areaNames.getProvinceName()+"/"
+ +areaNames.getCityName()+"/"+areaNames.getAreaName());
+ }
+ }
}
return resultMap;
}
--
Gitblit v1.8.0