Commit 0274b4a5ad679f4ecc680b0baef09f2118a1641b

Authored by yangfei

Merge remote-tracking branch 'origin/master'

Showing 1 changed file

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/PermissionsController.java View file @ 0274b4a
... ... @@ -3,7 +3,6 @@
3 3  
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6   -import com.lyms.platform.common.base.ContextHolder;
7 6 import com.lyms.platform.common.base.LoginContext;
8 7 import com.lyms.platform.common.enums.OptActionEnums;
9 8 import com.lyms.platform.common.enums.PermissionTypeEnums;
10 9  
11 10  
12 11  
... ... @@ -11,19 +10,23 @@
11 10 import com.lyms.platform.common.enums.YnEnums;
12 11 import com.lyms.platform.common.exception.BusinessException;
13 12 import com.lyms.platform.common.result.BaseResponse;
14   -import com.lyms.platform.common.utils.Assert;
15   -import com.lyms.platform.common.utils.JsonUtil;
  13 +import com.lyms.platform.common.result.RespBuilder;
16 14 import com.lyms.platform.common.utils.ResultUtils;
17 15 import com.lyms.platform.operate.web.facade.AccessPermissionFacade;
  16 +import com.lyms.platform.operate.web.facade.AreaCountFacade;
18 17 import com.lyms.platform.operate.web.facade.AutoMatchFacade;
19 18 import com.lyms.platform.operate.web.facade.OperateLogFacade;
20 19 import com.lyms.platform.operate.web.request.AccessPermissionAddRequest;
21   -import com.lyms.platform.permission.model.*;
22   -import com.lyms.platform.permission.service.*;
23   -import com.lyms.platform.pojo.DataPermissionsModel;
  20 +import com.lyms.platform.permission.model.Permissions2;
  21 +import com.lyms.platform.permission.model.Permissions2Query;
  22 +import com.lyms.platform.permission.model.UserRoleMapsQuery;
  23 +import com.lyms.platform.permission.model.Users;
  24 +import com.lyms.platform.permission.service.Permissions2Service;
  25 +import com.lyms.platform.permission.service.RolesService;
  26 +import com.lyms.platform.permission.service.UserRoleMapsService;
  27 +import com.lyms.platform.permission.service.UsersService;
24 28 import org.apache.commons.collections.CollectionUtils;
25 29 import org.apache.commons.lang.StringUtils;
26   -import org.apache.commons.lang.math.NumberUtils;
27 30 import org.springframework.beans.factory.annotation.Autowired;
28 31 import org.springframework.stereotype.Controller;
29 32 import org.springframework.web.bind.annotation.*;
... ... @@ -31,7 +34,10 @@
31 34 import javax.servlet.http.HttpServletRequest;
32 35 import javax.servlet.http.HttpServletResponse;
33 36 import javax.validation.Valid;
34   -import java.util.*;
  37 +import java.util.ArrayList;
  38 +import java.util.HashMap;
  39 +import java.util.List;
  40 +import java.util.Map;
35 41  
36 42 /**
37 43 * Created by Administrator on 2015/9/28 0028.
... ... @@ -56,6 +62,17 @@
56 62  
57 63 @Autowired
58 64 private AutoMatchFacade autoMatchFacade;
  65 +
  66 + @Autowired
  67 + private AreaCountFacade areaCountFacade;
  68 +
  69 + @TokenRequired
  70 + @RequestMapping("/checkPermission")
  71 + public BaseResponse checkPermission(String provinceId, String cityId, String areaId, HttpServletRequest request) {
  72 + List<String> currentUserHospPermissions = areaCountFacade.getCurrentUserHospPermissions(getUserId(request), provinceId,
  73 + cityId, areaId);
  74 + return RespBuilder.buildSuccess(CollectionUtils.isNotEmpty(currentUserHospPermissions));
  75 + }
59 76  
60 77 /**
61 78 * 获取权限列表