装修垃圾清运取消普通用户，只让投放点管理员登录

2c2c2c
1 parent 86f7ad9d
Showing 2 changed files with 29 additions and 17 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
@@ -12,6 +12,19 @@ public class LoginVo {
     private String name;
     private List<RuleVo> ruleVos;
+    /**
+     *  是否内测用户
+     */
+    private boolean testUser;
+
+    public boolean getTestUser() {
+        return testUser;
+    }
+
+    public void setTestUser(boolean testUser) {
+        this.testUser = testUser;
+    }
+
     public String getName() {
         return name;
     }
@@ -138,24 +138,17 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
         qw.lambda().eq(GarUser::getGarUserTel, loginDto.getTel());
         GarUser nUser = this.getOne(qw);
         if (Objects.isNull(nUser)) {
-            // 不存在就创建用户,普通用户暂时关闭注册
-//            nUser = new GarUser();
-//            nUser.setGarUserTel(loginDto.getTel());
-//            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
-//            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
-//            this.save(nUser);
-            //不存在，则查询是否是投放点用户
-            List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
-            if (CollectionUtil.isNotEmpty(list)) {
-                nUser = new GarUser();
-                nUser.setGarUserTel(loginDto.getTel());
-                nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
-                nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
-                this.save(nUser);
-            }else{
-                throw new UsernameNotFoundException("当前用户不存在!");
-            }
+            // 不存在就创建用户
+            nUser = new GarUser();
+            nUser.setGarUserTel(loginDto.getTel());
+            nUser.setGarUserDelFlag(GlobalStatus.DEL_FLAG_NO);
+            nUser.setGarUserType(GlobalStatus.GarUserStatusEnum.NORMAL_USER.getDescription());
+            this.save(nUser);
         }
+        //是否是投放点用户
+        List<DropPointInfo> list = dropPointInfoService.selectDropPointInfoListByPhone(loginDto.getTel());
+        vo.setTestUser(CollectionUtil.isNotEmpty(list));
+
         LoginUser loginUser = new LoginUser();
         ArrayList<SimpleGrantedAuthority> authorities = new ArrayList<SimpleGrantedAuthority>();
         loginUser.setAuthorities(authorities);
@@ -225,6 +218,12 @@ public class GarUserServiceImpl extends ServiceImpl&lt;GarUserMapper, GarUser&gt;
             // vo.setName(disposalSite.getConstructionUnitPerson());
         }
+        for (LoginVo.RuleVo r : vo.getRuleVos()){
+            //排除驾驶员、企业负责人、处理场所
+            if(r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DISPOSAL_SITE_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.DRIVER_USER.getDescription()) || r.getUserType().equals(GlobalStatus.GarUserStatusEnum.RESPONSIBLE_USER.getDescription())){
+                vo.setTestUser(true);
+            }
+        }
         return vo;
     }