shiyang / regional-platform

Download as
Browse Code »

Commit 5d1ed06068d665eccf27ab2913e609d7c9d2c818

Authored by jiangjiazhi
2 parents 2f4eb0d092 a40dbdb170
Exists in master and in 1 other branch nobuildprocess

Merge remote-tracking branch 'origin/master'

Showing 4 changed files

platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/DepartmentsController.java View file @ 5d1ed06
... ... @@ -4,8 +4,10 @@
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6 6 import com.lyms.platform.common.base.LoginContext;
  7 +import com.lyms.platform.common.constants.ErrorCodeConstants;
7 8 import com.lyms.platform.common.enums.YnEnums;
8 9 import com.lyms.platform.common.utils.ResultUtils;
  10 +import com.lyms.platform.operate.web.result.FrontEndResult;
9 11 import com.lyms.platform.permission.model.*;
10 12 import com.lyms.platform.permission.service.*;
11 13 import org.springframework.beans.factory.annotation.Autowired;
... ... @@ -161,7 +163,7 @@
161 163 @RequestMapping(value = "/departments", method = RequestMethod.GET)
162 164 @ResponseBody
163 165 @TokenRequired
164   - public void getPermissions(HttpServletResponse response,
  166 + public FrontEndResult getPermissions(HttpServletResponse response,
165 167 @RequestParam(value = "keyword", required = false) String keyword,
166 168 @RequestParam(value = "page", required = false) Integer page,
167 169 @RequestParam(value = "limit", required = false) Integer limit,
... ... @@ -185,7 +187,12 @@
185 187 departments.setOrganization(organizationService.getOrganization(departments.getOrgId()));
186 188 }
187 189  
188   - ResultUtils.buildSuccessResultAndWrite(response, departmentses);
  190 + FrontEndResult frontEndResult = new FrontEndResult();
  191 + frontEndResult.setData(departmentses);
  192 + frontEndResult.setPageInfo(departmentsQuery.getPageInfo());
  193 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  194 + return frontEndResult;
  195 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
189 196 }
190 197  
191 198  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/OrganizationController.java View file @ 5d1ed06
... ... @@ -7,8 +7,10 @@
7 7 import com.lyms.platform.common.constants.ErrorCodeConstants;
8 8 import com.lyms.platform.common.enums.YnEnums;
9 9 import com.lyms.platform.common.utils.ResultUtils;
  10 +import com.lyms.platform.operate.web.result.FrontEndResult;
10 11 import com.lyms.platform.permission.model.Organization;
11 12 import com.lyms.platform.permission.model.OrganizationQuery;
  13 +import com.lyms.platform.permission.model.Regions;
12 14 import com.lyms.platform.permission.model.Users;
13 15 import com.lyms.platform.permission.service.*;
14 16 import org.apache.commons.lang.StringUtils;
... ... @@ -32,6 +34,8 @@
32 34 private TokenService tokenService;
33 35 @Autowired
34 36 private OrganizationService organizationService;
  37 + @Autowired
  38 + private RegionsService regionsService;
35 39  
36 40  
37 41 /**
... ... @@ -177,7 +181,7 @@
177 181 @RequestMapping(value = "/organization", method = RequestMethod.GET)
178 182 @ResponseBody
179 183 @TokenRequired
180   - public void getOrganization(HttpServletResponse response,
  184 + public FrontEndResult getOrganization(HttpServletResponse response,
181 185 @RequestParam(value = "id", required = false) Integer id,
182 186 @RequestParam(value = "keyword", required = false) String keyword,
183 187 @RequestParam(value = "page", required = false) Integer page,
184 188  
185 189  
186 190  
187 191  
188 192  
... ... @@ -187,19 +191,44 @@
187 191 limit = limit == null ? 10 : limit;
188 192 page = page == null ? 1 : page;
189 193  
  194 + Regions regions = null;
  195 + if(null != areaId) {
  196 + regions = regionsService.getRegions(areaId);
  197 + }
190 198  
  199 +
191 200 OrganizationQuery organizationQuery = new OrganizationQuery();
192 201 organizationQuery.setId(id);
193 202 organizationQuery.setNeed("true");
194 203 organizationQuery.setSort("id desc");
195 204 organizationQuery.setYn(YnEnums.YES.getId());
196   - organizationQuery.setName(keyword);
197 205 organizationQuery.setPage(page);
  206 + organizationQuery.setProvinceId(areaId);
198 207 organizationQuery.setLimit(limit);
199 208 organizationQuery.setKeyword(keyword);
200 209  
  210 + if(null != regions && regions.getLevel().equals(1)) {
  211 + organizationQuery.setProvinceId(areaId);
  212 + }
  213 + if(null != regions && regions.getLevel().equals(2)) {
  214 + organizationQuery.setCityId(areaId);
  215 + }
  216 + if(null != regions && regions.getLevel().equals(3)) {
  217 + organizationQuery.setAreaId(areaId);
  218 + }
  219 +
201 220 List<Organization> organizations = organizationService.queryOrganization(organizationQuery);
202   - ResultUtils.buildSuccessResultAndWrite(response, organizations);
  221 +
  222 +
  223 +
  224 +
  225 + FrontEndResult frontEndResult = new FrontEndResult();
  226 + frontEndResult.setData(organizations);
  227 + frontEndResult.setPageInfo(organizationQuery.getPageInfo());
  228 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  229 +
  230 + return frontEndResult;
  231 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
203 232 }
204 233  
205 234  
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/RolesController.java View file @ 5d1ed06
... ... @@ -4,10 +4,12 @@
4 4 import com.lyms.platform.common.annotation.TokenRequired;
5 5 import com.lyms.platform.common.base.BaseController;
6 6 import com.lyms.platform.common.base.LoginContext;
  7 +import com.lyms.platform.common.constants.ErrorCodeConstants;
7 8 import com.lyms.platform.common.enums.YnEnums;
8 9 import com.lyms.platform.common.exception.BusinessException;
9 10 import com.lyms.platform.common.utils.Assert;
10 11 import com.lyms.platform.common.utils.ResultUtils;
  12 +import com.lyms.platform.operate.web.result.FrontEndResult;
11 13 import com.lyms.platform.permission.model.*;
12 14 import com.lyms.platform.permission.service.*;
13 15 import org.apache.commons.lang.StringUtils;
14 16  
... ... @@ -290,12 +292,12 @@
290 292 }
291 293  
292 294 /**
293   - * 获取列表
  295 + * 获取用户角色列表
294 296 */
295 297 @RequestMapping(value = "/userRoles", method = RequestMethod.GET)
296 298 @ResponseBody
297 299 @TokenRequired
298   - public void getUserList(HttpServletResponse response,
  300 + public FrontEndResult getUserList(HttpServletResponse response,
299 301 @RequestParam(value = "keyword",required = false) String keyword,
300 302 @RequestParam(value = "page",required = false) Integer page,
301 303 @RequestParam(value = "limit",required = false) Integer limit,
302 304  
303 305  
... ... @@ -314,17 +316,25 @@
314 316 rolesQuery.setLimit(limit);
315 317  
316 318 List<Roles> roles = rolesService.queryRoles(rolesQuery);
317   - ResultUtils.buildSuccessResultAndWrite(response, roles);
  319 +
  320 + FrontEndResult frontEndResult = new FrontEndResult();
  321 + frontEndResult.setPageInfo(rolesQuery.getPageInfo());
  322 + frontEndResult.setData(roles);
  323 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  324 +
  325 + return frontEndResult;
  326 +
  327 + // ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
318 328 }
319 329  
320 330  
321 331 /**
322   - * 获取列表
  332 + * 获取管理员角色列表
323 333 */
324 334 @RequestMapping(value = "/adminRoles", method = RequestMethod.GET)
325 335 @ResponseBody
326 336 @TokenRequired
327   - public void getAdminList(HttpServletResponse response,
  337 + public FrontEndResult getAdminList(HttpServletResponse response,
328 338 @RequestParam(value = "keyword",required = false) String keyword,
329 339 @RequestParam(value = "page",required = false) Integer page,
330 340 @RequestParam(value = "limit",required = false) Integer limit) {
... ... @@ -342,7 +352,14 @@
342 352 rolesQuery.setLimit(limit);
343 353  
344 354 List<Roles> roles = rolesService.queryRoles(rolesQuery);
345   - ResultUtils.buildSuccessResultAndWrite(response, roles);
  355 +
  356 +
  357 + FrontEndResult frontEndResult = new FrontEndResult();
  358 + frontEndResult.setPageInfo(rolesQuery.getPageInfo());
  359 + frontEndResult.setData(roles);
  360 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  361 + return frontEndResult;
  362 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
346 363 }
347 364 }
platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/UsersController.java View file @ 5d1ed06
... ... @@ -8,6 +8,7 @@
8 8 import com.lyms.platform.common.constants.ErrorCodeConstants;
9 9 import com.lyms.platform.common.enums.YnEnums;
10 10 import com.lyms.platform.common.utils.*;
  11 +import com.lyms.platform.operate.web.result.FrontEndResult;
11 12 import com.lyms.platform.permission.model.*;
12 13 import com.lyms.platform.permission.service.*;
13 14 import org.apache.commons.lang.StringUtils;
... ... @@ -60,7 +61,7 @@
60 61 @RequestMapping(value = "/admins", method = RequestMethod.GET)
61 62 @ResponseBody
62 63 @TokenRequired
63   - public void getAdminList(HttpServletResponse response,
  64 + public FrontEndResult getAdminList(HttpServletResponse response,
64 65 @RequestParam(value = "keyword", required = false) String keyword,
65 66 @RequestParam(value = "rolesId", required = false) Integer rolesId,
66 67 @RequestParam(value = "page", required = false) Integer page,
... ... @@ -88,8 +89,12 @@
88 89 user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
89 90 }
90 91  
91   -
92   - ResultUtils.buildSuccessResultAndWrite(response, users);
  92 + FrontEndResult frontEndResult = new FrontEndResult();
  93 + frontEndResult.setPageInfo(usersQuery.getPageInfo());
  94 + frontEndResult.setData(users);
  95 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
  96 + return frontEndResult;
  97 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
93 98 }
94 99  
95 100  
... ... @@ -100,7 +105,7 @@
100 105 @RequestMapping(value = "/users", method = RequestMethod.GET)
101 106 @TokenRequired
102 107 @ResponseBody
103   - public void getPermissions(HttpServletResponse response,
  108 + public FrontEndResult getPermissions(HttpServletResponse response,
104 109 @RequestParam(value = "keyword", required = false) String keyword,
105 110 @RequestParam(value = "rolesId", required = false) Integer rolesId,
106 111 @RequestParam(value = "page", required = false) Integer page,
107 112  
... ... @@ -133,8 +138,13 @@
133 138 user.setDepartmentses(departmentsService.getDepartments(user.getDeptId()));
134 139 }
135 140  
  141 + FrontEndResult frontEndResult = new FrontEndResult();
  142 + frontEndResult.setPageInfo(usersQuery.getPageInfo());
  143 + frontEndResult.setData(users);
  144 + frontEndResult.setErrorcode(ErrorCodeConstants.SUCCESS);
136 145  
137   - ResultUtils.buildSuccessResultAndWrite(response, users);
  146 + return frontEndResult;
  147 +// ResultUtils.buildSuccessResultAndWrite(response, frontEndResult);
138 148 }
139 149  
140 150 //获取用户角色信息