Merge branch 'huangyuan-user' of lift-manager/lift-server into develop

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/MtCompanyUserService.java

@@ -275,10 +275,11 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
     @Override
     public RestResponse appGetCompanyMembers(MtCompanyUserRequest mtCompanyUserRequest) {
         IPage companyUserPage = new Page<>(mtCompanyUserRequest.getPageNum(), mtCompanyUserRequest.getPageSize());
-        //分页获取团队信息
+        //分页获取团队成员信息
         companyUserPage = this.page(companyUserPage, new QueryWrapper<MtCompanyUser>()
                 .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
                 .eq("delete_flag", ApiConstants.DELETE_NO)
+                .eq("status", ApiConstants.ApplicationConstants.APPLY_PASS)
         );
         List<MtCompanyUser> mtCompanyUserList = companyUserPage.getRecords();
         if (mtCompanyUserList != null && mtCompanyUserList.size() > 0) {

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, "新增用户失败");
         }

lift-system-service/src/main/java/cn/com/ty/lift/system/utils/CommonUtil.java

@@ -1,11 +1,13 @@
 package cn.com.ty.lift.system.utils;
 
 import cn.com.ty.lift.common.utils.PojoUtils;
+import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
 import cn.com.ty.lift.system.homepage.dao.dto.request.PlatformCalendarRequest;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.servlet.http.HttpServletRequest;
+import java.lang.reflect.Method;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -161,23 +163,22 @@ public class CommonUtil {
     public static Map getKeyToDataModel(List dataList, String dateAttrName) {
         Map dayToDataModel = new HashMap();
         if (dataList != null && dataList.size() > 0) {
-            dayToDataModel = (Map) dataList.stream()
-                    .collect(Collectors.groupingBy(obj -> {
-                        try {
-                            Object value = obj.getClass()
-                                    .getMethod(PojoUtils.attrGetMethodName(dateAttrName)).invoke(obj, null);
-                            if (value != null) {
-                                if (value instanceof LocalDate) {
-                                    return getDateDayValue((LocalDate) value);
-                                }
-                                return value;
-                            }
-                            return 0;
-                        } catch (Exception e) {
-                            e.printStackTrace();
-                            return null;
+            dayToDataModel = (Map) dataList.stream().collect(Collectors.groupingBy(obj -> {
+                try {
+                    Method method = obj.getClass().getMethod(PojoUtils.attrGetMethodName(dateAttrName));
+                    Object value = method.invoke(obj);
+                    if (value != null) {
+                        if (value instanceof LocalDate) {
+                            return getDateDayValue((LocalDate) value);
                         }
-                    }));
+                        return value;
+                    }
+                    return 0;
+                } catch (Exception e) {
+                    e.printStackTrace();
+                    return null;
+                }
+            }));
         }
         return dayToDataModel;
     }

lift-system-service/src/main/java/cn/com/ty/lift/system/utils/PasswordUtils.java

@@ -1,7 +1,8 @@
 package cn.com.ty.lift.system.utils;
 
-import cn.hutool.core.codec.Base64;
+import cn.com.ty.lift.common.utils.Base64Encoder;
 
+import java.nio.charset.StandardCharsets;
 import java.security.MessageDigest;
 import java.util.Random;
 
@@ -19,14 +20,14 @@ public class PasswordUtils {
      * @date 2019/11/27 10:03 AM
      */
     public static String randomCode() {
-        String checkCode = "";
+        StringBuilder checkCode = new StringBuilder();
         char[] character = {'0', '1', '2', '3', '4', '5', '6', '8', '9'};
         Random random = new Random();
         //生成验证码字符串
         for (int i = 0; i < 16; i++) {
-            checkCode += character[random.nextInt(character.length)];
+            checkCode.append(character[random.nextInt(character.length)]);
         }
-        return checkCode;
+        return checkCode.toString();
     }
 
     /**
@@ -36,18 +37,18 @@ public class PasswordUtils {
      * @description 对密码进行加盐并进行hash加密
      */
     public static String generatePassword(String password, String salt) {
-        try{
+        try {
             String newPassword = password + salt;
             //sha1加密
-            MessageDigest md = MessageDigest.getInstance("SHA1");
+            MessageDigest md = MessageDigest.getInstance("SHA-1");
             //把字符串转为字节数组
-            byte[] bytePassword = newPassword.getBytes();
+            byte[] bytePassword = newPassword.getBytes(StandardCharsets.UTF_16LE);
             //使用指定的字节来更新我们的摘要
             md.update(bytePassword);
             //获取密文  （完成摘要计算）
             bytePassword = md.digest();
-            return Base64.encode(bytePassword);
-        } catch (Exception e){
+            return new Base64Encoder().encode(bytePassword);
+        } catch (Exception e) {
             e.printStackTrace();
         }
         return "";