创建团队代码完善

lift-system-service/pom.xml

@@ -29,11 +29,6 @@
             <artifactId>lift-common</artifactId>
             <version>1.0-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>cn.com.ty</groupId>
-            <artifactId>lift-push</artifactId>
-            <version>1.0-SNAPSHOT</version>
-        </dependency>
         <dependency>
             <groupId>com.google.zxing</groupId>
             <artifactId>core</artifactId>

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/service/impl/MaintenanceCompanyServiceImpl.java

@@ -30,6 +30,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.transaction.interceptor.TransactionAspectSupport;
 
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
@@ -103,7 +104,9 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         maintenanceCompany.setIsCertificated(ApiConstants.CompanyConstants.MAINTENANCE_NOT_CERTIFICATE);
         maintenanceCompany.setRemarks(maintenanceCompanyRequest.getRemarks());
         maintenanceCompany.setLogoImg(maintenanceCompanyRequest.getLogoImg());
-        this.save(maintenanceCompany);
+        if (!this.save(maintenanceCompany)) {
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存团队信息失败");
+        }
         //公司id
         Long companyId = maintenanceCompany.getId();
 
@@ -111,25 +114,37 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
         //1.设置申请用户为企业管理员
         UserAccount userAccount = userAccountService.getByUserId(userId);
         userAccount.setType(ApiConstants.UserConstants.TYPE_ENTERPRISE_ADMIN);
-        userAccountService.updateById(userAccount);
+        if (!userAccountService.updateById(userAccount)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "更新用户信息失败");
+        }
         //2.设置用户类型为企业管理员
         MtCompanyUser mtCompanyUser = new MtCompanyUser();
         mtCompanyUser.setCreateUserId(userId);
         mtCompanyUser.setUserId(userId);
         mtCompanyUser.setMtCompanyId(companyId);
-        mtCompanyUserService.save(mtCompanyUser);
+        if (!mtCompanyUserService.save(mtCompanyUser)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存成员关联公司信息失败");
+        }
         //3.创建默认角色-企业管理员
         Role role = new Role();
         role.setName(CommonEnum.DefaultRole.ENTERPRISE_ADMIN.getLabel());
         role.setCompanyId(companyId);
         role.setDescription("企业管理员");
-        roleService.save(role);
+        if (!roleService.save(role)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存角色信息失败");
+        }
         //4.创建用户角色关联关系
         UserRole userRole = new UserRole();
         userRole.setUserId(userId);
         userRole.setRoleId(role.getId());
         userRole.setCompanyId(companyId);
-        userRoleService.save(userRole);
+        if (!userRoleService.save(userRole)) {
+            TransactionAspectSupport.currentTransactionStatus().setRollbackOnly();
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "保存创建者和角色关联关系失败");
+        }
 
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "创建团队成功");
     }
@@ -378,7 +393,7 @@ public class MaintenanceCompanyServiceImpl extends ServiceImpl<MaintenanceCompan
     }
 
     private long getLong(Long longValue) {
-        if(longValue != null) {
+        if (longValue != null) {
             return longValue;
         }
         return 0L;

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

@@ -3,8 +3,6 @@ package cn.com.ty.lift.system.user.service.impl;
 import cn.com.ty.lift.common.aliservice.constants.AliConstants;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.utils.ProjectUtils;
-import cn.com.ty.lift.push.websocket.common.WebSocketConstants;
-import cn.com.ty.lift.push.websocket.dao.entity.TimeyUser;
 import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.user.dao.entity.Menu;
@@ -282,12 +280,6 @@ public class LoginService implements ILoginService {
         HttpSession session = request.getSession();
         //获取用户信息
         UserResponse userResponse = userService.getLoginUserInfo(userRequest.getUserId());
-        //将消息推送的用户信息放入session中
-        TimeyUser timeyUser = new TimeyUser();
-        timeyUser.setUserId(userResponse.getUserId());
-        timeyUser.setUserName(userResponse.getName());
-        userRequest.setMobile(userResponse.getMobile());
-        session.setAttribute(WebSocketConstants.CURRENT_TIMEY_USER, timeyUser);
         //将当前用户id放入session中
         session.setAttribute(ApiConstants.CURRENT_USER_ID, userResponse.getUserId());
         //将当前公司id放入session中

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

@@ -47,9 +47,10 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse apply(UserApplyRequest userApplyRequest, int applyTypeTeam) {
+        long companyId = userApplyRequest.getCompanyId();
         //获取用户原有的申请信息
         UserApplication userApplication = this.getOne(new QueryWrapper<UserApplication>()
-                .eq("mt_company_id", userApplyRequest.getCompanyId())
+                .eq("mt_company_id", companyId)
                 .eq("user_id", userApplyRequest.getUserId())
                 //去掉申请未通过的判断
                 .ne("status", ApiConstants.ApplicationConstants.APPLY_FAIL)
@@ -64,7 +65,7 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         if (userApplication == null) {
             userApplication = new UserApplication();
             userApplication.setUserId(userApplyRequest.getUserId());
-            userApplication.setMtCompanyId(userApplyRequest.getCompanyId());
+            userApplication.setMtCompanyId(companyId);
             userApplication.setType(applyTypeTeam);
             //设置审核描述信息
             userApplication.setDescription(userApplyRequest.getDescription());
@@ -78,7 +79,10 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
         boolean result = this.saveOrUpdate(userApplication);
         if (result) {
             //申请操作成功，推送消息
+            if (ApiConstants.ApplicationConstants.APPLY_TYPE_TEAM == applyTypeTeam) {
+                //申请加入团队成功，给公司所有文员推送信息
 
+            }
         } else {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, "申请失败");
         }