物业申请审核通过，加入团队

lift-enterprise-service/pom.xml

@@ -22,10 +22,10 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <!--<dependency>-->
-            <!--<groupId>cn.com.xwy</groupId>-->
-            <!--<artifactId>xwy-cloud-dependencies</artifactId>-->
-        <!--</dependency>-->
+        <dependency>
+            <groupId>cn.com.xwy</groupId>
+            <artifactId>xwy-cloud-dependencies</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

lift-enterprise-service/src/main/resources/application.yml

@@ -5,7 +5,7 @@ spring:
   application:
     name: lift-enterprise-service
   profiles:
-    active: test
+    active: prod
 
 #自动添加createTime、isDelete 等字段
 xwy:

lift-push/pom.xml

@@ -35,10 +35,10 @@
             <groupId>cn.com.xwy</groupId>
             <artifactId>xwy-spring-boot</artifactId>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>cn.com.xwy</groupId>-->
-<!--            <artifactId>xwy-cloud-dependencies</artifactId>-->
-<!--        </dependency>-->
+        <dependency>
+            <groupId>cn.com.xwy</groupId>
+            <artifactId>xwy-cloud-dependencies</artifactId>
+        </dependency>
     </dependencies>
 
     <build>

lift-push/src/main/resources/application.yml

@@ -1,13 +1,11 @@
 server:
   port: 20233
-  tomcat:
-    basedir: /Users/huangyuan/application/tomcat/data/tomcat_temp
 
 spring:
   application:
     name: lift-push-service
   profiles:
-    active: test
+    active: prod
   datasource:
     hikari:
       max-lifetime: 1200000 # default: 1800000

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserApplicationService.java

@@ -380,6 +380,9 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         //获取项目所在的区域主管的信息
         ProjectInfo projectInfo = projectService.getProjectById(userApplyRequest.getProjectId());
         if (projectInfo != null) {
+            //将消息推送到app端
+            PushMessage pushMessage = PushMessage.workApplyPermission(applyName, projectInfo.getProjectName(),
+                    permission.get(userApplyRequest.getPowerType()));
             if (projectInfo.getRegionDirectorId() != null) {
                 PushUserInfo regionDirector = pushUserService.getCompanyUserInfoByUserId(companyId,
                         projectInfo.getRegionDirectorId());
@@ -387,20 +390,17 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
                     pushUserInfoList.add(regionDirector);
                 }
             }
-        }
-        if (pushUserInfoList != null && pushUserInfoList.size() > 0) {
-            //将消息推送到app端
-            PushMessage pushMessage = PushMessage.workApplyPermission(applyName, projectInfo.getProjectName(),
-                    permission.get(userApplyRequest.getPowerType()));
-            //消息内容
-            String content = pushMessage.getContent();
-            pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfoList);
-            //将消息推送到pc端
-            List<Long> userIdList = pushUserInfoList.stream().map(PushUserInfo::getUserId)
-                    .collect(Collectors.toList());
-            SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, userIdList, content,
-                    WebSocketConstants.MessageType.TEAM_MSG);
-            return true;
+            if (pushUserInfoList != null && pushUserInfoList.size() > 0) {
+                //消息内容
+                String content = pushMessage.getContent();
+                pushMessage.sendTokenOnPlatform(jmsMessagingTemplate, pushUserInfoList);
+                //将消息推送到pc端
+                List<Long> userIdList = pushUserInfoList.stream().map(PushUserInfo::getUserId)
+                        .collect(Collectors.toList());
+                SendMessageUtil.sendMessageToPC(jmsMessagingTemplate, userIdList, content,
+                        WebSocketConstants.MessageType.TEAM_MSG);
+                return true;
+            }
         }
         return false;
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/service/impl/UserService.java

@@ -70,8 +70,6 @@ public class UserService implements IUserService {
         //设置账号(小梯号)
         userAccount.setAccount(userRequest.getAccount());
         userAccount.setCreateDate(LocalDateTime.now());
-        //设置用户注册时间
-        userAccount.setCreateDate(LocalDateTime.now());
         //设置用户类型
         userAccount.setType(ApiConstants.UserConstants.TYPE_USER);
         //判断用户是否为物管端注册用户
@@ -141,8 +139,15 @@ public class UserService implements IUserService {
 
     @Override
     public RestResponse addUser(UserRequest userRequest) {
+        if(StringUtils.isBlank(userRequest.getMobile())) {
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户手机号为空");
+        }
+        UserAccount userAccount = userAccountService.getByMobile(userRequest.getMobile());
+        if(userAccount != null) {
+            return  RestResponse.fail(ApiConstants.RESULT_ERROR, "手机号已经存在");
+        }
         //保存用户信息，成功返回用户账户信息，失败返回空
-        UserAccount userAccount = this.saveUserInfo(userRequest);
+        userAccount = this.saveUserInfo(userRequest);
         if (userAccount == null) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "新增用户失败");
         }