feat: 用户指南，查询角色

guzijian
1 parent 512f0495
Showing 5 changed files with 60 additions and 1 deletions
trash-admin/src/main/resources/static/user-guide.png
trash-framework/src/main/java/com/trash/framework/config/SecurityConfig.java
trash-garbage/src/main/java/com/trash/garbage/controller/GarbageUserController.java
trash-garbage/src/main/java/com/trash/garbage/service/GarUserService.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -104,6 +104,7 @@ public class SecurityConfig extends WebSecurityConfigurerAdapter
                         "/*.html",
                         "/**/*.html",
                         "/**/*.css",
+                        "/**/*.png",
                         "/**/*.js"
                 ).permitAll()
                 .antMatchers("/processDefinition/**").permitAll()
@@ -127,6 +127,15 @@ public class GarbageUserController {
     }
  
     /**
+     * 查询用户角色
+     */
+    @PreAuthorize("@ss.hasPermi('GarUser:GarUser:query')")
+    @GetMapping(value = "/queryRole")
+    public Result<?> queryRole() {
+        return Result.OK(garUserService.queryRole());
+    }
+
+    /**
      * 获取建筑垃圾-用户详细信息
      */
     @PreAuthorize("@ss.hasPermi('GarUser:GarUser:query')")
@@ -136,7 +145,7 @@ public class GarbageUserController {
     }
  
     @PostMapping
-    public AjaxResult addGarUser(GarUser garUser) {
+    public AjaxResult exportUser(GarUser garUser) {
         List<GarUser> list = garUserService.queryListByUser(garUser);
         ExcelUtil<GarUser> util = new ExcelUtil<GarUser>(GarUser.class);
         return util.exportExcel(list, "GarUser");
@@ -38,4 +38,6 @@ public interface GarUserService extends IService&lt;GarUser&gt; {
     PageInfo queryListByUserPages(GarUser garUser);
  
     List<GarUser> queryListByUser(GarUser garUser);
+
+    LoginVo queryRole();
 }
@@ -313,6 +313,53 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         return list(qw);
     }
  
+    @Override
+    public LoginVo queryRole() {
+        LoginVo vo = new LoginVo();
+        String tel = SecurityUtils.getLoginUser().getUser().getPhonenumber();
+        DriverVo driver = new DriverVo();
+        driver.setPhoneNo(tel);
+        List<DriverVo> driverList = driverService.selectDriverList(driver);
+        LoginVo.RuleVo ruleVo = new LoginVo.RuleVo();
+        ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
+        vo.setRuleVos(new ArrayList<>(Arrays.asList(ruleVo)));
+        // 运输驾驶员
+        if (CollectionUtil.isNotEmpty(driverList)) {
+            DriverVo driverVo = driverList.get(0);
+            TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setTransportCompanyName(enterprise.getName());
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
+            vo.getRuleVos().add(ruleVo);
+        }
+
+        // 企业负责人 TODO
+        TransportationEnterprise transportationEnterprise = new TransportationEnterprise();
+        transportationEnterprise.setServicePhone(tel);
+        List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);
+        if (CollectionUtil.isNotEmpty(enterpriseList)) {
+            TransportationEnterprise enterprise = enterpriseList.get(0);
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setTransportCompanyName(enterprise.getName());
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
+            vo.getRuleVos().add(ruleVo);
+        }
+
+        // 处理场所 TODO
+        // 查询条件
+        DisposalSite site = new DisposalSite();
+        site.setConstructionUnitPersonPhone(tel);
+        List<DisposalSite> disposalSites = disposalSiteService.selectDisposalSiteList(site);
+        if (CollectionUtil.isNotEmpty(disposalSites)) {
+            DisposalSite disposalSite = disposalSites.get(0);
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setTransportCompanyName(disposalSite.getName());
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription());
+            vo.getRuleVos().add(ruleVo);
+        }
+        return vo;
+    }
+
     private LambdaQueryWrapper<GarUser> createQueryWrapperByUser(GarUser garUser) {
         return new LambdaQueryWrapper<GarUser>()
                 .eq(StringUtils.isNotEmpty(garUser.getGarUserId()), GarUser::getGarUserId, garUser.getGarUserId())