Merge branch 'develop' of http://132.232.206.88:3000/lift-manager/lift-server into feature-bieao

lift-common/src/main/java/cn.com.ty.lift.common/utils/ProjectUtils.java

@@ -3,10 +3,7 @@ package cn.com.ty.lift.common.utils;
 import org.apache.commons.lang3.StringUtils;
 
 import java.lang.reflect.Method;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 
 /**
  * @author huangyuan
@@ -124,4 +121,24 @@ public class ProjectUtils {
         return idList;
     }
 
+    /**
+     * 列表去重
+     *@param list void
+     *@throws
+     */
+    public static void removeDuplicateWithOrder(List list) {
+        Set set = new HashSet<>();
+        List newList = new ArrayList<>();
+        if(list != null && list.size() > 0) {
+            for (Iterator<Object> iter = list.iterator(); iter.hasNext();) {
+                Object element = iter.next();
+                if (set.add(element)) {
+                    newList.add(element);
+                }
+            }
+            list.clear();
+            list.addAll(newList);
+        }
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/CompanyAttestationController.java

@@ -28,7 +28,7 @@ public class CompanyAttestationController {
      * @date 2019-12-18 15:44
      */
     @RequestMapping("/list")
-    public RestResponse list(CompanyAttestationRequest companyAttestationRequest) {
+    public RestResponse list(@RequestBody CompanyAttestationRequest companyAttestationRequest) {
         return companyAttestationService.applyList(companyAttestationRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/controller/MaintenanceCompanyController.java

@@ -26,46 +26,46 @@ public class MaintenanceCompanyController {
     private IMaintenanceCompanyService maintenanceCompanyService;
 
     /**
-     * @description 获取公司列表
-     * @date 2019-12-11 11:01
      * @param maintenanceCompanyRequest 请求类
      * @return
+     * @description 获取公司列表
+     * @date 2019-12-11 11:01
      */
     @RequestMapping("/list")
-    public RestResponse list(MaintenanceCompanyRequest maintenanceCompanyRequest){
+    public RestResponse list(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
         return maintenanceCompanyService.list(maintenanceCompanyRequest);
     }
 
     /**
-     * @description 获取用户所在的团队信息
-     * @date 2019-12-23 13:02
      * @param maintenanceCompanyRequest
      * @return
+     * @description 获取用户所在的团队信息
+     * @date 2019-12-23 13:02
      */
     @RequestMapping("/ownList")
-    public RestResponse ownList(MaintenanceCompanyRequest maintenanceCompanyRequest){
+    public RestResponse ownList(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
         return maintenanceCompanyService.ownList(maintenanceCompanyRequest);
     }
 
     /**
-     * @description 创建团队
-     * @date 2019-12-11 14:04
      * @param maintenanceCompanyRequest 请求对象
      * @return
+     * @description 创建团队
+     * @date 2019-12-11 14:04
      */
     @PostMapping("/createTeam")
-    public RestResponse createTeam(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest){
+    public RestResponse createTeam(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
         return maintenanceCompanyService.createTeam(maintenanceCompanyRequest);
     }
 
     /**
-     * @description 更新公司信息
-     * @date 2019-12-13 11:38
      * @param maintenanceCompanyRequest 维保公司请求
      * @return
+     * @description 更新公司信息
+     * @date 2019-12-13 11:38
      */
     @PostMapping("/updateCompany")
-    public RestResponse updateMaintenanceCompany(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest){
+    public RestResponse updateMaintenanceCompany(@RequestBody MaintenanceCompanyRequest maintenanceCompanyRequest) {
         return maintenanceCompanyService.updateMaintenanceCompany(maintenanceCompanyRequest);
     }
 }

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

@@ -148,7 +148,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
      * @return
      */
     private MaintenanceCompany auditHandle(MtCompanyAttestation mtCompanyAttestation, CompanyAttestationRequest companyAttestationRequest, int auditResult) {
-        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyAttestationRequest.getMtCompanyId());
+        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(mtCompanyAttestation.getMtCompanyId());
         //设置认证时间
         mtCompanyAttestation.setDealTime(LocalDateTime.now());
         //设置认证理由

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/MtCompanyUserController.java

@@ -28,7 +28,7 @@ public class MtCompanyUserController {
      * @return
      */
     @RequestMapping("/list")
-    public RestResponse list(MtCompanyUserRequest mtCompanyUserRequest) {
+    public RestResponse list(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.getCompanyUserList(mtCompanyUserRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/RoleController.java

@@ -23,70 +23,81 @@ public class RoleController {
     private IRoleService roleService;
 
     /**
-     * @description 获取角色列表
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求类
      * @return
+     * @description 获取角色列表
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(RoleRequest roleRequest){
+    public RestResponse list(RoleRequest roleRequest) {
         return roleService.list(roleRequest);
     }
 
     /**
-     * @description 添加角色
-     * @date 2019/11/27 10:03 AM
+     * @param
+     * @return
+     * @description 获取用户公司角色列表
+     * @date 2019-12-23 22:54
+     */
+    @RequestMapping("/companyRoleList")
+    public RestResponse companyRoleList(RoleRequest roleRequest) {
+        return roleService.companyRoleList(roleRequest);
+    }
+
+    /**
      * @param roleRequest 角色请求对象
      * @return
+     * @description 添加角色
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/add")
-    public RestResponse addRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse addRole(@RequestBody RoleRequest roleRequest) {
         //设置创建者信息
         return roleService.addRole(roleRequest);
     }
 
     /**
-     * @description 获取角色信息
-     * @date 2019-12-20 15:58
      * @param
      * @return
+     * @description 获取角色信息
+     * @date 2019-12-20 15:58
      */
     @RequestMapping("/info")
-    public RestResponse roleInfo(@RequestBody RoleRequest roleRequest){
+    public RestResponse roleInfo(@RequestBody RoleRequest roleRequest) {
         return roleService.info(roleRequest);
     }
 
     /**
-     * @description 添加角色
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求对象
      * @return
+     * @description 添加角色
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/update")
-    public RestResponse updateRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse updateRole(@RequestBody RoleRequest roleRequest) {
         //设置更新者信息
         return roleService.updateRole(roleRequest);
     }
 
     /**
-     * @description 删除角色信息
-     * @date 2019/11/27 10:03 AM
      * @param roleRequest 角色请求类
      * @return
+     * @description 删除角色信息
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/delete")
-    public RestResponse deleteRole(@RequestBody RoleRequest roleRequest){
+    public RestResponse deleteRole(@RequestBody RoleRequest roleRequest) {
         return roleService.deleteRole(roleRequest);
     }
 
     /**
-     * @description 通过用户id获取用户对应的菜单信息
-     * @date 2019/11/27 10:03 AM
      * @param userRole 用户id和公司id
      * @return
+     * @description 通过用户id获取用户对应的菜单信息
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/getUserMenus")
-    public RestResponse getUserMenus(UserRole userRole){
+    public RestResponse getUserMenus(UserRole userRole) {
         return roleService.getUserMenus(userRole);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/controller/UserApplicationController.java

@@ -32,7 +32,7 @@ public class UserApplicationController {
      * @date 2019-12-23 14:12
      */
     @RequestMapping("/list")
-    public RestResponse list(UserApplyRequest userApplyRequest) {
+    public RestResponse list(@RequestBody UserApplyRequest userApplyRequest) {
         return userApplicationService.applyList(userApplyRequest);
     }
 

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/MtCompanyUserRequest.java

@@ -12,8 +12,10 @@ public class MtCompanyUserRequest {
     private Long id;
     private Long companyId;//公司id
     private Long userId;//用户id
+    private String queryCondition;//查询条件：用户名或手机号
     private Long roleId;//角色id
     private String roleCode;//角色编码
+    private String job;//角色
     private Long pageSize;//每页条数
     private Long pageNum;//页数
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/entity/model/UserApplyRequest.java

@@ -12,8 +12,10 @@ public class UserApplyRequest {
     private Long id;//申请信息id
     private Long companyId;//公司id
     private Long userId;//用户id
+    private String queryCondition;//查询条件：用户名或手机号
     private Long roleId;//角色id
     private Integer status;//审核状态
     private Long pageSize;//每页的条数
     private Long pageNum;//页数
+    private String description;//描述
 }

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

@@ -87,4 +87,12 @@ public interface IRoleService extends IService<Role> {
      * @return
      */
     RestResponse info(RoleRequest roleRequest);
+
+    /**
+     * @param
+     * @return
+     * @description 获取公司角色列表
+     * @date 2019-12-23 22:55
+     */
+    RestResponse companyRoleList(RoleRequest roleRequest);
 }

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

@@ -11,62 +11,71 @@ import java.util.Map;
 
 /**
  * <h1>.</h1><BR>
+ *
  * @author huangyuan - 2019-11-25 18:36:53
  */
-public interface IUserService{
+public interface IUserService {
     /**
-     * @description  用户注册
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求对象
      * @return
+     * @description 用户注册
+     * @date 2019/11/27 10:03 AM
      */
     UserAccount saveUserInfo(UserRequest userRequest);
 
     /**
-     * @description 获取用户列表信息
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数对象
      * @return
+     * @description 获取用户列表信息
+     * @date 2019/11/27 10:03 AM
      */
     IPage<UserAccount> list(UserRequest userRequest);
 
     /**
-     * @description 添加用户
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数对象
      * @return
+     * @description 添加用户
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse addUser(UserRequest userRequest);
 
     /**
-     * @description 更新用户信息
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数对象
      * @return
+     * @description 更新用户信息
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse updateUser(UserRequest userRequest);
 
     /**
-     * @description 删除用户信息
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数对象
      * @return
+     * @description 删除用户信息
+     * @date 2019/11/27 10:03 AM
      */
     RestResponse deleteUser(UserRequest userRequest);
 
     /**
-     * @description 获取登录的用户信息
-     * @date 2019-12-10
      * @param userId 用户id
      * @return
+     * @description 获取登录的用户信息
+     * @date 2019-12-10
      */
     UserResponse getLoginUserInfo(Long userId);
 
     /**
-     * @description 通过用户id集合获取用户基础信息
-     * @date  10:35
      * @param
      * @return
+     * @description 通过用户id集合获取用户基础信息
+     * @date 10:35
      */
     Map<Long, UserResponse> getUserResponseByUserIdList(List<Long> userIdList);
+
+    /**
+     * @param queryCondition:用户名或者手机号
+     * @return
+     * @description 通过手机号或者用户名查询用户信息
+     * @date 2019-12-23 16:17
+     */
+    List<Long> getIdListByQueryCondition(String queryCondition);
 }

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

@@ -68,7 +68,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
                 return RestResponse.fail(ApiConstants.RESULT_ERROR, "删除原有关联关系失败");
             }
         }
-        //保存新的关联关系
+        //2.保存新的关联关系
         userRole = new UserRole();
         userRole.setCompanyId(mtCompanyUserRequest.getCompanyId());
         userRole.setRoleId(mtCompanyUserRequest.getRoleId());
@@ -102,7 +102,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         //获取角色关联的用户信息
         List<Long> userIdList = ProjectUtils.getAttrList(userRoleList, "userId", null);
         //获取用户信息集合
-        if(userIdList != null && userIdList.size() > 0){
+        if (userIdList != null && userIdList.size() > 0) {
             List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
             Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
             if (userIdToUserInfo != null && userIdToUserInfo.size() > 0) {
@@ -123,15 +123,16 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
 
     @Override
     public RestResponse kickOutTeam(MtCompanyUserRequest mtCompanyUserRequest) {
+        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
         //判断用户是否可以踢出团队
-        ProjectUser projectUser = new ProjectUser(mtCompanyUserRequest.getUserId(), mtCompanyUserRequest.getCompanyId());
+        ProjectUser projectUser = new ProjectUser(mtCompanyUser.getUserId(), mtCompanyUser.getMtCompanyId());
         Map<String, String> judgeMsg = projectService.judgeKickOutTeam(projectUser);
         //获取判断返回的状态码
         String code = judgeMsg.get(CommonConstants.RETURN_CODE_FIELD);
         if (ApiConstants.RESULT_ERROR.equals(code)) {
             return RestResponse.fail(ApiConstants.RESULT_ERROR, judgeMsg.get(CommonConstants.RETURN_MSG_FIELD));
         }
-        MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
+        //设置用户为踢出团队状态
         mtCompanyUser.setStatus(ApiConstants.ApplicationConstants.COMPANY_USER_FAIL);
         this.updateById(mtCompanyUser);
         return RestResponse.success(null, ApiConstants.RESULT_SUCCESS, "踢出用户成功");
@@ -140,10 +141,19 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
     @Override
     public RestResponse getCompanyUserList(MtCompanyUserRequest mtCompanyUserRequest) {
 
+        List<Long> userQueryIdList = null;
+        //通过用户名或手机号查找用户id
+        if (StringUtils.isNotBlank(mtCompanyUserRequest.getQueryCondition())) {
+            userQueryIdList = userService.getIdListByQueryCondition(mtCompanyUserRequest.getQueryCondition());
+        }
         List<MtCompanyUserResponse> mtCompanyUserResponseList = new ArrayList<>();
         IPage mtCompanyUserPage = new Page(mtCompanyUserRequest.getPageNum(), mtCompanyUserRequest.getPageSize());
         mtCompanyUserPage = this.page(mtCompanyUserPage, new QueryWrapper<MtCompanyUser>()
+                //判断用户是否在符合查询条件的用户列表中
+                .in(userQueryIdList != null && userQueryIdList.size() > 0, "userId", userQueryIdList)
                 .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
+                //获取在团队中的用户
+                .eq("status", ApiConstants.ApplicationConstants.COMPANY_USER_PASS)
                 .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         List<MtCompanyUser> mtCompanyUserList = mtCompanyUserPage.getRecords();

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

@@ -201,4 +201,11 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         }
         return RestResponse.success(roleResponse, ApiConstants.RESULT_SUCCESS, "获取角色信息成功");
     }
+
+    @Override
+    public RestResponse companyRoleList(RoleRequest roleRequest) {
+        List<Role> roleList = this.list(new QueryWrapper<Role>()
+        .eq("company_id", roleRequest.getCompanyId()));
+        return RestResponse.success(roleList, ApiConstants.RESULT_SUCCESS, "获取角色信息成功");
+    }
 }

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

@@ -18,6 +18,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -131,9 +132,17 @@ public class UserApplicationService extends ServiceImpl<UserApplicationMapper, U
 
     @Override
     public RestResponse applyList(UserApplyRequest userApplyRequest) {
+
+        List<Long> userQueryIdList = null;
+        //通过用户名或手机号查找用户id
+        if(StringUtils.isNotBlank(userApplyRequest.getQueryCondition())){
+            userQueryIdList = userService.getIdListByQueryCondition(userApplyRequest.getQueryCondition());
+        }
+
         List<UserApplyResponse> userApplyResponseList = new ArrayList<>();
         IPage userApplicationPage = new Page(userApplyRequest.getPageNum(), userApplyRequest.getPageSize());
         userApplicationPage = this.page(userApplicationPage, new QueryWrapper<UserApplication>()
+                .in("user_id", userQueryIdList)
                 .eq("mt_company_id", userApplyRequest.getCompanyId())
                 .eq("status", userApplyRequest.getStatus())
         );

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

@@ -144,7 +144,7 @@ public class UserService implements IUserService {
 
     @Override
     public UserResponse getLoginUserInfo(Long userId) {
-        UserResponse userResponse = new  UserResponse();
+        UserResponse userResponse = new UserResponse();
         userResponse.setUserId(userId);
         //获取用户的基本信息
         UserAccount userAccount = userAccountService.getByUserId(userId);
@@ -181,7 +181,7 @@ public class UserService implements IUserService {
     @Override
     public Map<Long, UserResponse> getUserResponseByUserIdList(List<Long> userIdList) {
         Map<Long, UserResponse> userIdToUserResponse = new HashMap<>();
-        if(userIdList != null && userIdList.size() > 0){
+        if (userIdList != null && userIdList.size() > 0) {
             //获取用户账号信息
             List<UserAccount> userAccountList = (List<UserAccount>) userAccountService.listByIds(userIdList);
             //获取用户基本信息
@@ -189,10 +189,10 @@ public class UserService implements IUserService {
             //将数据转化为userId -> 用户信息的map
             Map<Long, UserAccount> userIdToUserAccount = ProjectUtils.attrToObjMap(userAccountList, "userId", null);
             Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
-            for(Long userId:userIdList){
+            for (Long userId : userIdList) {
                 UserAccount userAccount = userIdToUserAccount.get(userId);
                 UserInfo userInfo = userIdToUserInfo.get(userId);
-                if(userAccount != null && userInfo != null){
+                if (userAccount != null && userInfo != null) {
                     UserResponse userResponse = new UserResponse();
                     userResponse.setName(userInfo.getName());
                     userResponse.setMobile(userAccount.getMobile());
@@ -204,4 +204,25 @@ public class UserService implements IUserService {
         return userIdToUserResponse;
     }
 
+    @Override
+    public List<Long> getIdListByQueryCondition(String queryCondition) {
+        List<UserAccount> userAccountList = userAccountService.list(new QueryWrapper<UserAccount>()
+                .select("user_id")
+                //通过手机号模糊查找
+                .like("mobile", queryCondition));
+        List<UserInfo> userInfoList = userInfoService.list(new QueryWrapper<UserInfo>()
+                .select("user_id")
+                //通过用户名模糊查找
+                .like("name", queryCondition)
+        );
+        //获取通过手机号模糊查询出来的用户id
+        List<Long> accountUserIdList = ProjectUtils.getAttrList(userAccountList, "userId", null);
+        //获取通过用户名模糊查询出来的用户id
+        List<Long> infoUserIdList = ProjectUtils.getAttrList(userInfoList, "userId", null);
+        //合并去重
+        accountUserIdList.addAll(infoUserIdList);
+        ProjectUtils.removeDuplicateWithOrder(accountUserIdList);
+        return accountUserIdList;
+    }
+
 }