app端获取用户信息

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

@@ -145,7 +145,7 @@ public class LoginController {
             //校验同一号码两次获取间隔是否有一分钟
             Object timeStampCode = redisTemplate.opsForValue().get(mobile);
             if (timeStampCode != null) {
-                return RestResponse.fail(ApiConstants.RESULT_ERROR, "请一分钟后重复获取");
+                return RestResponse.fail(ApiConstants.RESULT_ERROR, "请一分钟后重新获取");
             }
             //校验通过获取短信验证码
             String smsCode = AliyunSmsUtil.sendSmsCode(mobile, AliConstants.SmsConstants.TEST_TEMPLATE_CODE);

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

@@ -25,47 +25,58 @@ public class UserController {
     private IUserService userService;
 
     /**
-     * @description
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求类
      * @return
+     * @description
+     * @date 2019/11/27 10:03 AM
      */
     @RequestMapping("/list")
-    public RestResponse list(UserRequest userRequest){
+    public RestResponse list(UserRequest userRequest) {
         IPage<UserAccount> userAccountPage = userService.list(userRequest);
         return RestResponse.success(userAccountPage, ApiConstants.RESULT_SUCCESS, "获取用户信息成功");
     }
 
     /**
-     * @description 添加用户
-     * @date 2019/11/27 10:03 AM
+     * @param
+     * @return
+     * @description app获取用户信息
+     * @date 2019-12-28 15:41
+     */
+    @RequestMapping("/info")
+    public RestResponse info(UserRequest userRequest) {
+        return userService.getUserInfo(userRequest);
+    }
+
+    /**
      * @param userRequest 用户请求参数
      * @return
+     * @description 添加用户
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/add")
-    public RestResponse addUser(@RequestBody UserRequest userRequest){
+    public RestResponse addUser(@RequestBody UserRequest userRequest) {
         return userService.addUser(userRequest);
     }
 
     /**
-     * @description 更新用户信息
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数
      * @return
+     * @description 更新用户信息
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/update")
-    public RestResponse updateUser(@RequestBody UserRequest userRequest){
+    public RestResponse updateUser(@RequestBody UserRequest userRequest) {
         return userService.updateUser(userRequest);
     }
 
     /**
-     * @description 删除用户信息
-     * @date 2019/11/27 10:03 AM
      * @param userRequest 用户请求参数
      * @return
+     * @description 删除用户信息
+     * @date 2019/11/27 10:03 AM
      */
     @PostMapping("/delete")
-    public RestResponse deleteUser(@RequestBody UserRequest userRequest){
+    public RestResponse deleteUser(@RequestBody UserRequest userRequest) {
         return userService.deleteUser(userRequest);
     }
 

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

@@ -0,0 +1,19 @@
+package cn.com.ty.lift.system.user.dao.entity.model;
+
+import lombok.Data;
+
+/**
+ * @author huangyuan
+ * @date 2019-12-28
+ * @description 用户信息
+ */
+@Data
+public class UserInfoResponse {
+    private String companyName;//公司名
+    private String roleName;//角色名
+    private String userName;//用户名
+    private String avatarUrl;//用户头像路径
+    private String mobile;//用户手机号
+    private String remarks;//描述
+    private Integer certificateStatus;//操作证状态
+}

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

@@ -38,4 +38,12 @@ public interface MtCompanyUserMapper extends BaseMapper<MtCompanyUser> {
      * @date 2019-12-17 15:43
      */
     List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser);
+
+    /**
+     * @param
+     * @return
+     * @description 获取用户操作证信息
+     * @date 2019-12-28 16:34
+     */
+    LiftCertificate getLiftCertificateByUserIdAndCompanyId(ProjectUser projectUser);
 }

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

@@ -29,4 +29,11 @@ public interface IProjectService {
      */
     List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser);
 
+    /**
+     * @description 获取用户在指定公司的操作证
+     * @date 2019-12-28 16:33
+     * @param
+     * @return
+     */
+    LiftCertificate getLiftCertificateByUserIdAndCompanyId(ProjectUser projectUser);
 }

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

@@ -78,4 +78,12 @@ public interface IUserService {
      * @date 2019-12-23 16:17
      */
     List<Long> getIdListByQueryCondition(String queryCondition);
+
+    /**
+     * @description 获取用户信息
+     * @date 2019-12-28 15:41
+     * @param
+     * @return
+     */
+    RestResponse getUserInfo(UserRequest userRequest);
 }

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

@@ -50,4 +50,9 @@ public class ProjectService implements IProjectService {
     public List<LiftCertificate> getLiftCertificateList(ProjectUser projectUser) {
         return mtCompanyUserMapper.getLiftCertificateList(projectUser);
     }
+
+    @Override
+    public LiftCertificate getLiftCertificateByUserIdAndCompanyId(ProjectUser projectUser) {
+        return mtCompanyUserMapper.getLiftCertificateByUserIdAndCompanyId(projectUser);
+    }
 }

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

@@ -143,6 +143,7 @@ public class RoleService extends ServiceImpl<RoleMapper, Role> implements IRoleS
         UserRole userRole = userRoleService.getOne(new QueryWrapper<UserRole>()
                 .eq("user_id", userId)
                 .eq("company_id", companyId)
+                .eq("delete_flag", ApiConstants.DELETE_NO)
         );
         if (userRole != null) {
             return getById(userRole.getRoleId());

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

@@ -5,8 +5,8 @@ import cn.com.ty.lift.common.utils.ProjectUtils;
 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.*;
-import cn.com.ty.lift.system.user.dao.entity.model.UserRequest;
-import cn.com.ty.lift.system.user.dao.entity.model.UserResponse;
+import cn.com.ty.lift.system.user.dao.entity.model.*;
+import cn.com.ty.lift.system.user.service.IProjectService;
 import cn.com.ty.lift.system.user.service.IUserAccountService;
 import cn.com.ty.lift.system.user.service.IUserInfoService;
 import cn.com.ty.lift.system.user.service.IUserService;
@@ -52,6 +52,9 @@ public class UserService implements IUserService {
     @Autowired
     private IMaintenanceCompanyService maintenanceCompanyService;
 
+    @Autowired
+    private IProjectService projectService;
+
     @Override
     public UserAccount saveUserInfo(UserRequest userRequest) {
         String password = userRequest.getPassword();
@@ -226,4 +229,39 @@ public class UserService implements IUserService {
         return accountUserIdList;
     }
 
+    @Override
+    public RestResponse getUserInfo(UserRequest userRequest) {
+        Long userId = userRequest.getUserId();
+        Long companyId = userRequest.getCompanyId();
+        if(userId == null){
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "获取用户信息失败");
+        }
+        UserInfoResponse userInfoResponse = new UserInfoResponse();
+        //设置用户基础信息
+        UserAccount account = userAccountService.getByUserId(userId);
+        UserInfo info = userInfoService.getByUserId(userId);
+        if(account == null || info == null){
+            return RestResponse.fail(ApiConstants.RESULT_ERROR, "用户信息不存在");
+        }
+        userInfoResponse.setUserName(info.getName());
+        userInfoResponse.setAvatarUrl(info.getAvatarUrl());
+        userInfoResponse.setRemarks(info.getRemarks());
+        //设置角色信息
+        Role role = roleService.getRoleByUserIdAndCompanyId(userId, companyId);
+        if(role != null){
+            userInfoResponse.setRoleName(role.getName());
+        }
+        //设置公司信息
+        MaintenanceCompany maintenanceCompany = maintenanceCompanyService.getById(companyId);
+        if(maintenanceCompany != null){
+            userInfoResponse.setCompanyName(maintenanceCompany.getName());
+        }
+        //设置操作证信息
+        LiftCertificate liftCertificate = projectService.getLiftCertificateByUserIdAndCompanyId(new ProjectUser(userId, companyId));
+        if(liftCertificate != null){
+            userInfoResponse.setCertificateStatus(liftCertificate.getStatus());
+        }
+        return RestResponse.success(userInfoResponse, ApiConstants.RESULT_SUCCESS, "获取用户信息成功");
+    }
+
 }

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

@@ -60,4 +60,10 @@
 		and mt_company_id = #{companyId,jdbcType=BIGINT}
 	</select>
 
+	<select id="getLiftCertificateByUserIdAndCompanyId" 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 owner_id = #{userId,jdbcType=BIGINT}
+		and mt_company_id = #{companyId,jdbcType=BIGINT}
+	</select>
+
 </mapper>