feat: 新增处理场所角色

guzijian
1 parent bdac1fed
Showing 2 changed files with 22 additions and 3 deletions
trash-garbage/src/main/java/com/trash/garbage/global/GlobalStatus.java
trash-garbage/src/main/java/com/trash/garbage/service/impl/GarUserServiceImpl.java
@@ -36,9 +36,10 @@ public class GlobalStatus {
          * 普通登录
          */
         NORMAL_LOGIN(0, "普通登录"),
-        NORMAL_USER(0, "居民用户"),
-        DRIVER_USER(1, "运输驾驶员"),
-        RESPONSIBLE_USER(2, "企业负责人");
+        NORMAL_USER(0, "用户"),
+        DISPOSAL_SITE_USER(1, "处理场所负责人"),
+        DRIVER_USER(2, "清运车辆驾驶员"),
+        RESPONSIBLE_USER(3, "运输企业负责人");
         private Integer status;
         private String description;
@@ -15,6 +15,8 @@ import javax.crypto.spec.IvParameterSpec;
 import javax.crypto.spec.SecretKeySpec;
 import javax.servlet.http.HttpServletRequest;
+import com.trash.disposalSite.domain.DisposalSite;
+import com.trash.disposalSite.service.IDisposalSiteService;
 import org.apache.commons.codec.binary.Base64;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -75,6 +77,9 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
     private GarAddressService garAddressService;
     @Autowired
+    private IDisposalSiteService disposalSiteService;
+
+    @Autowired
     private IDriverService driverService;
     @Autowired
@@ -171,6 +176,19 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             ruleVo.setUserType(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription());
             vo.getRuleVos().add(ruleVo);
         }
+
+        // 处理场所 TODO
+        // 查询条件
+        DisposalSite site = new DisposalSite();
+        site.setConstructionUnitPersonPhone(loginDto.getTel());
+        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;
     }