企业设置信息

lift-common/src/main/java/cn.com.ty.lift.common/constants/ApiConstants.java

@@ -135,4 +135,11 @@ public class ApiConstants {
         int COMPANY_USER_FAIL = -1;
     }
 
+    /**
+     * 常见问题常量
+     */
+    public interface GlobalSetConstants{
+        
+    }
+
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/settings/dao/entity/GlobalSet.java

@@ -67,5 +67,12 @@ public class GlobalSet implements Serializable {
     @TableField("company_id")
     private Long companyId;
 
+    public GlobalSet(){}
+
+    public GlobalSet(String name, String value, String description){
+        this.name = name;
+        this.value = value;
+        this.description = description;
+    }
 
 }

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

@@ -13,4 +13,11 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface GlobalSetService extends IService<GlobalSet> {
 
+    /**
+     * @description 团队初始化设置全局设置数据
+     * @date 2019-12-17 16:45
+     * @param
+     * @return
+     */
+    void teamInitSetting(Long companyId);
 }

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

@@ -6,6 +6,9 @@ import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  * 全局设置 服务实现类
@@ -17,4 +20,8 @@ import org.springframework.stereotype.Service;
 @Service
 public class GlobalSetServiceImpl extends ServiceImpl<GlobalSetMapper, GlobalSet> implements GlobalSetService {
 
+    @Override
+    public void teamInitSetting(Long companyId) {
+        List<GlobalSet> globalSetList = new ArrayList<>();
+    }
 }

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

@@ -5,6 +5,7 @@ import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
 import cn.com.ty.lift.system.settings.dao.entity.MtCompanyAttestation;
 import cn.com.ty.lift.system.settings.dao.entity.model.CompanyAttestationRequest;
 import cn.com.ty.lift.system.settings.dao.mapper.MtCompanyAttestationMapper;
+import cn.com.ty.lift.system.settings.service.GlobalSetService;
 import cn.com.ty.lift.system.settings.service.IMaintenanceCompanyService;
 import cn.com.ty.lift.system.settings.service.IMtCompanyAttestationService;
 import cn.com.ty.lift.system.user.dao.entity.model.MenuRequest;
@@ -39,6 +40,9 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
     @Autowired
     private IMenuService menuService;
 
+    @Autowired
+    private GlobalSetService globalSetService;
+
     @Override
     @Transactional
     public RestResponse applyAudit(CompanyAttestationRequest companyAttestationRequest) {
@@ -79,7 +83,7 @@ public class MtCompanyAttestationServiceImpl extends ServiceImpl<MtCompanyAttest
         //5.保存给企业分配的菜单
         menuService.companyMenu(new MenuRequest(companyId, companyAttestationRequest.getMenuIds()));
         //6.生成企业设置数据
-
+        globalSetService.teamInitSetting(companyId);
         maintenanceCompanyService.updateById(maintenanceCompany);
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "操作成功");
     }

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

@@ -21,13 +21,16 @@ public class MtCompanyUserController {
     @Autowired
     private IMtCompanyUserService mtCompanyUserService;
 
-
+    @RequestMapping("/list")
+    public RestResponse list(MtCompanyUserRequest mtCompanyUserRequest) {
+        return mtCompanyUserService.getCompanyUserList(mtCompanyUserRequest);
+    }
 
     /**
-     * @description 企业分配角色
-     * @date 2019/11/27 10:03 AM
      * @param mtCompanyUserRequest userId:用户id, companyId:公司id, job:职业, roleId:角色id
      * @return
+     * @description 企业分配角色
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/assignRole")
     public RestResponse assignRole(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
@@ -35,13 +38,13 @@ public class MtCompanyUserController {
     }
 
     /**
-     * @description 获取团队成员信息
-     * @date 2019/11/27 10:03 AM
      * @param mtCompanyUserRequest 公司id
      * @return
+     * @description 获取团队成员信息
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/getCompanyMembers")
-    public RestResponse getCompanyUser(@RequestBody MtCompanyUserRequest mtCompanyUserRequest){
+    public RestResponse getCompanyUser(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.getCompanyMembers(mtCompanyUserRequest);
     }
 
@@ -52,7 +55,7 @@ public class MtCompanyUserController {
      * @return
      */
     @PostMapping("/kickOutTeam")
-    public RestResponse kickOutTeam(@RequestBody MtCompanyUserRequest mtCompanyUserRequest){
+    public RestResponse kickOutTeam(@RequestBody MtCompanyUserRequest mtCompanyUserRequest) {
         return mtCompanyUserService.kickOutTeam(mtCompanyUserRequest);
     }
 }

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

@@ -25,4 +25,10 @@ public class UserRole {
 		this.userId = userId;
 		this.roleId = roleId;
 	}
+
+	public UserRole(Long userId, Long roleId, Long companyId){
+		this.userId = userId;
+		this.roleId = roleId;
+		this.companyId = companyId;
+	}
 }

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

@@ -0,0 +1,15 @@
+package cn.com.ty.lift.system.user.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-17
+ * @description 电梯操作证
+ */
+@Data
+public class LiftCertificate {
+    private Long userId;//用户id
+    private Long mtCompanyId;//公司id
+    private Integer status;//操作这个状态
+}

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

@@ -13,4 +13,6 @@ public class MtCompanyUserRequest {
     private Long companyId;//公司id
     private Long userId;//用户id
     private Long roleId;//角色id
+    private Long pageSize;//每页条数
+    private Long pageNum;//页数
 }

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

@@ -12,4 +12,10 @@ public class MtCompanyUserResponse {
     private Long companyId;//公司id
     private String companyName;//公司名称
     private String companyAddress;//公司地址
+    private Long userId;//用户id
+    private String userName;//用户名称
+    private String userMobile;//用户手机号
+    private String roleName;//角色名称
+    private Integer certificateStatus;//操作证状态
+    private String job;//用户职位
 }

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

@@ -2,6 +2,8 @@ package cn.com.ty.lift.system.user.dao.entity.model;
 
 import lombok.Data;
 
+import java.util.List;
+
 /**
  * @author huangyuan
  * @date 2019-12-17
@@ -20,10 +22,17 @@ public class ProjectUser {
      */
     private Long companyId;//维保公司id
 
+    private List<Long> userIdList;
+
     public ProjectUser(){}
 
     public ProjectUser(Long userId, Long companyId){
         this.userId = userId;
         this.companyId = companyId;
     }
+
+    public ProjectUser(Long companyId, List<Long> userIdList){
+        this.companyId = companyId;
+        this.userIdList = userIdList;
+    }
 }

lift-system-service/src/main/java/cn/com/ty/lift/system/user/dao/mapper/MtCompanyUserMapper.java

@@ -1,29 +1,41 @@
 package cn.com.ty.lift.system.user.dao.mapper;
 
+import cn.com.ty.lift.system.user.dao.entity.model.LiftCertificate;
 import cn.com.ty.lift.system.user.dao.entity.model.ProjectUser;
 import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
 import cn.com.xwy.boot.mybatis.MyBatisMapper;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 
+import java.util.List;
+
 /**
  * MyBatis Mapper 接口 - 表：mt_company_user
+ *
  * @since 2019-12-03 16:55:27
  */
 @MyBatisMapper
 public interface MtCompanyUserMapper extends BaseMapper<MtCompanyUser> {
-    /***
-     * @description 获取用户在该公司关联的项目
-     * @date 2019-12-17 09:26
+    /**
      * @param
      * @return
+     * @description 获取用户在该公司关联的项目
+     * @date 2019-12-17 09:26
      */
     Long getCompanyUserProject(ProjectUser projectUser);
 
-    /***
+    /**
+     * @param
+     * @return
      * @description 获取用户在当前公司有没有正在进行的急修任务
      * @date 2019-12-17 09:56
+     */
+    Long getCompanyUserEmergency(ProjectUser projectUser);
+
+    /**
      * @param
      * @return
+     * @description 获取用户电梯操作证信息
+     * @date 2019-12-17 15:43
      */
-    Long getCompanyUserEmergency(ProjectUser projectUser);
+    List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser);
 }

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

@@ -34,4 +34,12 @@ public interface IMtCompanyUserService extends IService<MtCompanyUser> {
      * @return
      */
     RestResponse kickOutTeam(MtCompanyUserRequest mtCompanyUserRequest);
+
+    /**
+     * @description 获取公司用户列表
+     * @date 2019-12-17 11:22
+     * @param
+     * @return
+     */
+    RestResponse getCompanyUserList(MtCompanyUserRequest mtCompanyUserRequest);
 }

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

@@ -1,7 +1,9 @@
 package cn.com.ty.lift.system.user.service;
 
+import cn.com.ty.lift.system.user.dao.entity.model.LiftCertificate;
 import cn.com.ty.lift.system.user.dao.entity.model.ProjectUser;
 
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -19,4 +21,12 @@ public interface IProjectService {
      */
     Map<String, String> judgeKickOutTeam(ProjectUser projectUser);
 
+    /**
+     * @description 获取用户电梯操作证信息
+     * @date 2019-12-17 15:42
+     * @param
+     * @return
+     */
+    List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser);
+
 }

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

@@ -3,19 +3,14 @@ package cn.com.ty.lift.system.user.service.impl;
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.common.utils.ProjectUtils;
 import cn.com.ty.lift.system.constants.CommonConstants;
-import cn.com.ty.lift.system.user.dao.entity.MtCompanyUser;
-import cn.com.ty.lift.system.user.dao.entity.UserInfo;
-import cn.com.ty.lift.system.user.dao.entity.UserRole;
-import cn.com.ty.lift.system.user.dao.entity.model.MtCompanyUserRequest;
-import cn.com.ty.lift.system.user.dao.entity.model.ProjectUser;
-import cn.com.ty.lift.system.user.dao.entity.model.UserResponse;
+import cn.com.ty.lift.system.user.dao.entity.*;
+import cn.com.ty.lift.system.user.dao.entity.model.*;
 import cn.com.ty.lift.system.user.dao.mapper.MtCompanyUserMapper;
-import cn.com.ty.lift.system.user.service.IMtCompanyUserService;
-import cn.com.ty.lift.system.user.service.IProjectService;
-import cn.com.ty.lift.system.user.service.IUserInfoService;
-import cn.com.ty.lift.system.user.service.IUserRoleService;
+import cn.com.ty.lift.system.user.service.*;
 import cn.com.xwy.boot.web.dto.RestResponse;
 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.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -42,6 +37,12 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
     @Autowired
     private IProjectService projectService;
 
+    @Autowired
+    private IUserAccountService userAccountService;
+
+    @Autowired
+    private IRoleService roleService;
+
     @Override
     @Transactional
     public RestResponse assignRole(MtCompanyUserRequest mtCompanyUserRequest) {
@@ -109,7 +110,7 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         Map<String, String> judgeMsg = projectService.judgeKickOutTeam(projectUser);
         //获取判断返回的状态码
         String code = judgeMsg.get(CommonConstants.RETURN_CODE_FIELD);
-        if(ApiConstants.RESULT_ERROR.equals(code)){
+        if (ApiConstants.RESULT_ERROR.equals(code)) {
             return RestResponse.error(ApiConstants.RESULT_ERROR, judgeMsg.get(CommonConstants.RETURN_MSG_FIELD));
         }
         MtCompanyUser mtCompanyUser = this.getById(mtCompanyUserRequest.getId());
@@ -118,4 +119,82 @@ public class MtCompanyUserService extends ServiceImpl<MtCompanyUserMapper, MtCom
         return RestResponse.ok(null, ApiConstants.RESULT_SUCCESS, "踢出用户成功");
     }
 
+    @Override
+    public RestResponse getCompanyUserList(MtCompanyUserRequest mtCompanyUserRequest) {
+
+        List<MtCompanyUserResponse> mtCompanyUserResponseList = new ArrayList<>();
+        IPage<MtCompanyUser> mtCompanyUserPage = new Page<>(mtCompanyUserRequest.getPageNum(), mtCompanyUserRequest.getPageSize());
+        mtCompanyUserPage = this.page(mtCompanyUserPage, new QueryWrapper<MtCompanyUser>()
+                .eq("mt_company_id", mtCompanyUserRequest.getCompanyId())
+                .eq("delete_flag", ApiConstants.DELETE_NO)
+        );
+        List<MtCompanyUser> mtCompanyUserList = mtCompanyUserPage.getRecords();
+        if (mtCompanyUserList != null && mtCompanyUserList.size() > 0) {
+
+            /** 用户信息区域 **/
+            //获取用户id集合
+            List<Long> userIdList = ProjectUtils.getAttrList(mtCompanyUserList, "userId", null);
+            //获取用户账号信息
+            List<UserAccount> userAccountList = (List<UserAccount>) userAccountService.listByIds(userIdList);
+            //获取用户基本信息
+            List<UserInfo> userInfoList = (List<UserInfo>) userInfoService.listByIds(userIdList);
+            //将数据转化为userId -> 用户信息的map
+            Map<Long, UserAccount> userIdToUserAccount = ProjectUtils.attrToObjMap(userAccountList, "userId", null);
+            Map<Long, UserInfo> userIdToUserInfo = ProjectUtils.attrToObjMap(userInfoList, "userId", null);
+
+            /** 角色信息区域 **/
+            //获取用户角色关联关系
+            List<UserRole> userRoleList = userRoleService.list(new QueryWrapper<UserRole>()
+                    .in("user_id", userIdList)
+                    .eq("company_id", mtCompanyUserRequest.getCompanyId())
+            );
+            //转化用户id对应用户角色关联关系
+            Map<Long, UserRole> userIdToUserRole = ProjectUtils.attrToObjMap(userRoleList, "userId", null);
+            //获取角色列表
+            List<Long> roleIdList = ProjectUtils.getAttrList(userRoleList, "roleId", null);
+            List<Role> roleList = (List<Role>) roleService.listByIds(roleIdList);
+            Map<Long, Role> idToRole = ProjectUtils.attrToObjMap(roleList, "id", null);
+
+            /** 操作证信息区域 **/
+            //获取用户操作证信息
+            List<LiftCertificate> liftCertificateList = projectService.getLiftCertificateList(new ProjectUser(mtCompanyUserRequest.getCompanyId(), userIdList));
+            Map<Long, LiftCertificate> userIdToLiftCertificate = ProjectUtils.attrToObjMap(liftCertificateList, "userId", null);
+
+            /** 公司用户信息组装区域 **/
+            //组装公司用户信息
+            for (MtCompanyUser mtCompanyUser : mtCompanyUserList) {
+                MtCompanyUserResponse mtCompanyUserResponse = new MtCompanyUserResponse();
+                UserAccount userAccount = userIdToUserAccount.get(mtCompanyUser.getUserId());
+                UserInfo userInfo = userIdToUserInfo.get(mtCompanyUser.getUserId());
+                //设置用户角色信息
+                mtCompanyUserResponse.setJob(mtCompanyUser.getJob());
+                //设置公司用户基础信息
+                if (userAccount != null && userInfo != null) {
+                    mtCompanyUserResponse.setUserId(mtCompanyUser.getUserId());
+                    mtCompanyUserResponse.setUserMobile(userAccount.getMobile());
+                    mtCompanyUserResponse.setUserName(userInfo.getName());
+                }
+                //设置公司用户角色名称
+                UserRole userRole = userIdToUserRole.get(mtCompanyUser.getUserId());
+                if(userRole != null) {
+                    Role role = idToRole.get(userRole.getRoleId());
+                    if(role != null){
+                        mtCompanyUserResponse.setRoleName(role.getName());
+                    }
+                }
+                //设置用户操作证状态 0：无证，1：待审核，2：审核未通过，3：审核通过，4：超期
+                LiftCertificate liftCertificate = userIdToLiftCertificate.get(mtCompanyUser.getUserId());
+                if(liftCertificate != null){
+                    mtCompanyUserResponse.setCertificateStatus(liftCertificate.getStatus());
+                }
+                mtCompanyUserResponseList.add(mtCompanyUserResponse);
+            }
+        }
+        //设置分页数据
+        IPage<MtCompanyUserResponse> mtCompanyUserResponsePage = new Page<>();
+        mtCompanyUserResponsePage.setRecords(mtCompanyUserResponseList);
+        mtCompanyUserResponsePage.setTotal(mtCompanyUserPage.getTotal());
+        return RestResponse.ok(mtCompanyUserResponseList, ApiConstants.RESULT_SUCCESS, "获取公司成员列表成功");
+    }
+
 }

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

@@ -2,6 +2,7 @@ package cn.com.ty.lift.system.user.service.impl;
 
 import cn.com.ty.lift.common.constants.ApiConstants;
 import cn.com.ty.lift.system.constants.CommonConstants;
+import cn.com.ty.lift.system.user.dao.entity.model.LiftCertificate;
 import cn.com.ty.lift.system.user.dao.entity.model.ProjectUser;
 import cn.com.ty.lift.system.user.dao.mapper.MtCompanyUserMapper;
 import cn.com.ty.lift.system.user.service.IProjectService;
@@ -9,6 +10,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -43,4 +45,9 @@ public class ProjectService implements IProjectService {
         returnMsg.put(CommonConstants.RETURN_CODE_FIELD, ApiConstants.RESULT_SUCCESS);
         return returnMsg;
     }
+
+    @Override
+    public List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser) {
+        return mtCompanyUserMapper.getLiftCertificateList(projectUser);
+    }
 }

lift-system-service/src/main/resources/mapper/MtCompanyUserMapper.xml

@@ -47,4 +47,18 @@
 		and er.status <![CDATA[ <> ]]> 4
 	</select>
 
+	<!-- 获取用户电梯操作证信息 -->
+	<select id="getLiftCertificateList" parameterType="cn.com.ty.lift.system.user.dao.entity.model.ProjectUser" resultType="cn.com.ty.lift.system.user.dao.entity.model.LiftCertificate">
+		select owner_id as userId, mt_company_id as companyId, status as status from lift_certificate
+		where 1=1
+		<!-- 判断用户id是否在集合中 -->
+		<if test="userIdList != null">
+			and owner_id in
+			<foreach item="item" index="index" collection="userIdList" open="(" separator="," close=")">
+				#{item}
+			</foreach>
+		</if>
+		and mt_company_id = #{companyId,jdbcType=BIGINT}
+	</select>
+
 </mapper>