Commit 5b53556cd4a91173452b2b643167bf9591c39076
1 parent
ea998651
用户切换角色
Showing
1 changed file
with
54 additions
and
20 deletions
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
| @@ -341,46 +341,80 @@ public class GarUserServiceImpl extends ServiceImpl<GarUserMapper, GarUser> | @@ -341,46 +341,80 @@ public class GarUserServiceImpl extends ServiceImpl<GarUserMapper, GarUser> | ||
| 341 | public LoginVo queryRole() { | 341 | public LoginVo queryRole() { |
| 342 | LoginVo vo = new LoginVo(); | 342 | LoginVo vo = new LoginVo(); |
| 343 | String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber(); | 343 | String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber(); |
| 344 | - DriverVo driver = new DriverVo(); | ||
| 345 | - driver.setPhoneNo(tel); | ||
| 346 | - List<DriverVo> driverList = driverService.selectDriverList(driver); | 344 | + GarUserReq userReq = reqGarUser(tel); |
| 345 | + | ||
| 347 | LoginVo.RuleVo ruleVo = new LoginVo.RuleVo(); | 346 | LoginVo.RuleVo ruleVo = new LoginVo.RuleVo(); |
| 348 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription()); | 347 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription()); |
| 349 | vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo))); | 348 | vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo))); |
| 350 | // 运输驾驶员 | 349 | // 运输驾驶员 |
| 351 | - if (CollectionUtil.isNotEmpty(driverList)) { | ||
| 352 | - DriverVo driverVo = driverList.get(0); | ||
| 353 | - TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId()); | 350 | + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getDrivers())) { |
| 351 | + GarUserReqDetail detail = userReq.getDrivers().get(0); | ||
| 352 | +// TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId()); | ||
| 354 | ruleVo = new LoginVo.RuleVo(); | 353 | ruleVo = new LoginVo.RuleVo(); |
| 355 | - ruleVo.setTransportCompanyName(enterprise.getName()); | 354 | + ruleVo.setTransportCompanyName(detail.getCompanyName()); |
| 356 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()); | 355 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()); |
| 357 | vo.getRuleVos().add(ruleVo); | 356 | vo.getRuleVos().add(ruleVo); |
| 357 | + vo.setName(detail.getName()); | ||
| 358 | } | 358 | } |
| 359 | 359 | ||
| 360 | // 企业负责人 TODO | 360 | // 企业负责人 TODO |
| 361 | - TransportationEnterprise transportationEnterprise = new TransportationEnterprise(); | ||
| 362 | - transportationEnterprise.setServicePhone(tel); | ||
| 363 | - List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise); | ||
| 364 | - if (CollectionUtil.isNotEmpty(enterpriseList)) { | ||
| 365 | - TransportationEnterprise enterprise = enterpriseList.get(0); | 361 | + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getCompanies())) { |
| 362 | + GarUserReqDetail detail = userReq.getCompanies().get(0); | ||
| 366 | ruleVo = new LoginVo.RuleVo(); | 363 | ruleVo = new LoginVo.RuleVo(); |
| 367 | - ruleVo.setTransportCompanyName(enterprise.getName()); | 364 | + ruleVo.setTransportCompanyName(detail.getCompanyName()); |
| 368 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()); | 365 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()); |
| 369 | vo.getRuleVos().add(ruleVo); | 366 | vo.getRuleVos().add(ruleVo); |
| 370 | } | 367 | } |
| 371 | 368 | ||
| 372 | // 处理场所 TODO | 369 | // 处理场所 TODO |
| 373 | - // 查询条件 | ||
| 374 | - DisposalSite site = new DisposalSite(); | ||
| 375 | - site.setConstructionUnitPersonPhone(tel); | ||
| 376 | - List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site); | ||
| 377 | - if (CollectionUtil.isNotEmpty(disposalSites)) { | ||
| 378 | - DisposalSite disposalSite = disposalSites.get(0); | 370 | + if (Objects.nonNull(userReq) && CollectionUtil.isNotEmpty(userReq.getEarthsites())) { |
| 371 | + GarUserReqDetail detail = userReq.getEarthsites().get(0); | ||
| 379 | ruleVo = new LoginVo.RuleVo(); | 372 | ruleVo = new LoginVo.RuleVo(); |
| 380 | - ruleVo.setTransportCompanyName(disposalSite.getName()); | 373 | + ruleVo.setTransportCompanyName(detail.getName()); |
| 381 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()); | 374 | ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()); |
| 382 | vo.getRuleVos().add(ruleVo); | 375 | vo.getRuleVos().add(ruleVo); |
| 376 | + | ||
| 383 | } | 377 | } |
| 378 | +// DriverVo driver = new DriverVo(); | ||
| 379 | +// driver.setPhoneNo(tel); | ||
| 380 | +// List<DriverVo> driverList = driverService.selectDriverList(driver); | ||
| 381 | +// LoginVo.RuleVo ruleVo = new LoginVo.RuleVo(); | ||
| 382 | +// ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription()); | ||
| 383 | +// vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo))); | ||
| 384 | +// // 运输驾驶员 | ||
| 385 | +// if (CollectionUtil.isNotEmpty(driverList)) { | ||
| 386 | +// DriverVo driverVo = driverList.get(0); | ||
| 387 | +// TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId()); | ||
| 388 | +// ruleVo = new LoginVo.RuleVo(); | ||
| 389 | +// ruleVo.setTransportCompanyName(enterprise.getName()); | ||
| 390 | +// ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()); | ||
| 391 | +// vo.getRuleVos().add(ruleVo); | ||
| 392 | +// } | ||
| 393 | +// | ||
| 394 | +// // 企业负责人 TODO | ||
| 395 | +// TransportationEnterprise transportationEnterprise = new TransportationEnterprise(); | ||
| 396 | +// transportationEnterprise.setServicePhone(tel); | ||
| 397 | +// List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise); | ||
| 398 | +// if (CollectionUtil.isNotEmpty(enterpriseList)) { | ||
| 399 | +// TransportationEnterprise enterprise = enterpriseList.get(0); | ||
| 400 | +// ruleVo = new LoginVo.RuleVo(); | ||
| 401 | +// ruleVo.setTransportCompanyName(enterprise.getName()); | ||
| 402 | +// ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription()); | ||
| 403 | +// vo.getRuleVos().add(ruleVo); | ||
| 404 | +// } | ||
| 405 | +// | ||
| 406 | +// // 处理场所 TODO | ||
| 407 | +// // 查询条件 | ||
| 408 | +// DisposalSite site = new DisposalSite(); | ||
| 409 | +// site.setConstructionUnitPersonPhone(tel); | ||
| 410 | +// List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site); | ||
| 411 | +// if (CollectionUtil.isNotEmpty(disposalSites)) { | ||
| 412 | +// DisposalSite disposalSite = disposalSites.get(0); | ||
| 413 | +// ruleVo = new LoginVo.RuleVo(); | ||
| 414 | +// ruleVo.setTransportCompanyName(disposalSite.getName()); | ||
| 415 | +// ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()); | ||
| 416 | +// vo.getRuleVos().add(ruleVo); | ||
| 417 | +// } | ||
| 384 | return vo; | 418 | return vo; |
| 385 | } | 419 | } |
| 386 | 420 |