feat: 多角色选择

guzijian
1 parent 0cd0c7a2
Showing 2 changed files with 39 additions and 32 deletions
trash-garbage/src/main/java/com/trash/garbage/pojo/vo/LoginVo.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -3,13 +3,13 @@ package com.trash.garbage.pojo.vo;
 import lombok.EqualsAndHashCode;
 import lombok.ToString;
+import java.util.List;
+
 @ToString
 @EqualsAndHashCode
 public class LoginVo {
     private String token;
-    private String userType;
-    private String parentCompanyName;
-    private String transportCompanyName;
+    private List<RuleVo> ruleVos;
     public String getToken() {
         return token;
@@ -19,27 +19,36 @@ public class LoginVo {
         this.token = token;
     }
-    public String getUserType() {
-        return userType;
+    public List<RuleVo> getRuleVos() {
+        return ruleVos;
     }
-    public void setUserType(String userType) {
-        this.userType = userType;
+    public void setRuleVos(List<RuleVo> ruleVos) {
+        this.ruleVos = ruleVos;
     }
-    public String getParentCompanyName() {
-        return parentCompanyName;
-    }
+    @ToString
+    @EqualsAndHashCode
+    public static class RuleVo {
+        private String userType;
+        private String transportCompanyName;
-    public void setParentCompanyName(String parentCompanyName) {
-        this.parentCompanyName = parentCompanyName;
-    }
+        public String getUserType() {
+            return userType;
+        }
-    public String getTransportCompanyName() {
-        return transportCompanyName;
-    }
+        public void setUserType(String userType) {
+            this.userType = userType;
+        }
-    public void setTransportCompanyName(String transportCompanyName) {
-        this.transportCompanyName = transportCompanyName;
+
+        public String getTransportCompanyName() {
+            return transportCompanyName;
+        }
+
+        public void setTransportCompanyName(String transportCompanyName) {
+            this.transportCompanyName = transportCompanyName;
+        }
     }
+
 }
@@ -86,6 +86,7 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         if (Objects.isNull(loginDto)) {
             throw new UsernameNotFoundException("当前用户不存在!");
         }
+        // 微信登录
         if (loginDto.getLoginType().equals(GlobalStatus.GarUserStatusEnum.WX_LOGIN.getStatus())) {
             String url = "https://api.weixin.qq.com/sns/jscode2session?appid=" + wxConfig.getAppId() + "&secret=" + wxConfig.getSecret() + "&js_code=" + loginDto.getWxCode() + "&grant_type=authorization_code";
             String body = HttpUtil.createGet(url).header("cache-control", "no-cache").execute().body();
@@ -137,17 +138,17 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         DriverVo driver = new DriverVo();
         driver.setPhoneNo(loginDto.getTel());
         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)) {
-            vo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
             DriverVo driverVo = driverList.get(0);
             TransportationEnterprise enterprise = enterpriseService.selectTransportationEnterpriseById(driverVo.getCompanyId());
-            TransportationEnterprise parentEnterprise = enterpriseService.selectTransportationEnterpriseById(enterprise.getParentId());
-            vo.setTransportCompanyName(enterprise.getName());
-            vo.setParentCompanyName(parentEnterprise.getName());
-            vo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
-            return vo;
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setTransportCompanyName(enterprise.getName());
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription());
+            vo.getRuleVos().add(ruleVo);
         }
         // 企业负责人 TODO
@@ -156,14 +157,11 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         List<TransportationEnterprise> enterpriseList = enterpriseService.selectTransportationEnterpriseList(transportationEnterprise);
         if (CollectionUtil.isNotEmpty(enterpriseList)) {
             TransportationEnterprise enterprise = enterpriseList.get(0);
-            String companyName = enterprise.getName();
-            vo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
-            vo.setTransportCompanyName(companyName);
-            return vo;
+            ruleVo = new LoginVo.RuleVo();
+            ruleVo.setTransportCompanyName(enterprise.getName());
+            ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
+            vo.getRuleVos().add(ruleVo);
         }
-
-        // 普通用户 TODO
-        vo.setUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
         return vo;
     }