组织登录后 返回行政区信息 "中国/江苏省/苏州市/昆山市"

fengxiang

2018-07-16 a6ea3af4f8e917f1c19204bbaa5a75a4a86716ac

组织登录后 返回行政区信息 "中国/江苏省/苏州市/昆山市"

 src/main/java/com/moral/controller/OrganizationController.java

@@ -42,7 +42,7 @@
    @GetMapping("get-my-org")
    public ResultBean<Organization> getMyOrganization(JwtAuthenticationToken token){
        UserContext userContext = token.getPrincipal();
        Organization organization = organizationService.getOrganizationsById(userContext.getOrganizationId());
        Organization organization = organizationService.getOrganizationById(userContext.getOrganizationId());
        return new ResultBean<>(organization);
    }
}

 src/main/java/com/moral/controller/ScreenController.java

@@ -103,6 +103,8 @@
    private OrganizationLayoutService orgLayoutService;

    @Resource

    private  DeviceVersionService dviceVersionService;

    @Resource

    private  OrganizationService organizationService;

    /**

     * Screen login. 大屏登录

     * 

@@ -119,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;

    }


 src/main/java/com/moral/controller/TestController.java

@@ -16,7 +16,6 @@

    @RequestMapping("/hello")
    public String hello() {

        return "Hello World";
    }


 src/main/java/com/moral/service/OrganizationService.java

@@ -20,5 +20,5 @@
    public void deleteByIds(Integer... ids);

    

    List<Organization> getOrganizationsByName(String name);

    public Organization getOrganizationsById(int id);

    public Organization getOrganizationById(int id);

}


 src/main/java/com/moral/service/impl/OrganizationServiceImpl.java

@@ -120,7 +120,7 @@
    }



    @Override

    public Organization getOrganizationsById(int id) {

    public Organization getOrganizationById(int id) {

        Example example = new Example(ENTITY_CLASS);

        example.or().andEqualTo("id",id);

        List<Organization> organizationList = organizationMapper.selectWithAreaNameByExample(example);