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

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

@@ -89,4 +89,15 @@ public class UserController {
         return userService.changeMobile(changeMobileRequest);
     }
 
+    /**
+     * @param userRequest 请求数据
+     * @return
+     * @description
+     * @date 2020/4/16 10:33 上午
+     */
+    @RequestMapping("/personalCenter")
+    public RestResponse personCenter(@RequestBody UserRequest userRequest) {
+        return userService.personalCenter(userRequest);
+    }
+
 }

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

@@ -41,6 +41,16 @@ public class UserAccount {
 
 	private LocalDateTime createDate;
 
+	/**
+	 * 设备类型
+	 */
+	private Integer deviceModel;
+
+	/**
+	 * 设备标识
+	 */
+	private String deviceFlag;
+
 	private int deleteFlag;
 
 	private int expertFlag;

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

@@ -0,0 +1,40 @@
+package cn.com.ty.lift.system.user.dao.entity.model;
+
+import cn.com.ty.lift.system.settings.dao.entity.MaintenanceCompany;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @author huangyuan
+ * @date 2020/4/16
+ * @description 个人中心响应数据
+ */
+@Data
+public class PersonalCenterResponse {
+    /**
+     * 用户名
+     */
+    private String name;
+    /**
+     * 手机号
+     */
+    private String mobile;
+    /**
+     * 角色名称
+     */
+    private String roleName;
+    /**
+     * 帐号(小梯号)
+     */
+    private String account;
+    /**
+     * 描述
+     */
+    private String remarks;
+    /**
+     * 用户所在团队
+     */
+    private List<MaintenanceCompany> maintenanceCompanyList;
+
+}

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

@@ -80,18 +80,26 @@ public interface IUserService {
     List<Long> getIdListByQueryCondition(String queryCondition);
 
     /**
-     * @description 获取用户信息
-     * @date 2019-12-28 15:41
      * @param
      * @return
+     * @description 获取用户信息
+     * @date 2019-12-28 15:41
      */
     RestResponse getUserInfo(UserRequest userRequest);
 
     /**
-     * @description 更换手机号
-     * @date 2020-01-04 10:31
      * @param
      * @return
+     * @description 更换手机号
+     * @date 2020-01-04 10:31
      */
     RestResponse changeMobile(ChangeMobileRequest changeMobileRequest);
+
+    /**
+     * @param userRequest 用户id
+     * @return 用户信息
+     * @description 获取用户数据
+     * @date 2020/4/16 9:24 上午
+     */
+    RestResponse personalCenter(UserRequest userRequest);
 }

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

@@ -352,4 +352,38 @@ public class UserService implements IUserService {
         return RestResponse.success(ApiConstants.RESULT_SUCCESS, "更换手机号成功");
     }
 
+    @Override
+    public RestResponse personalCenter(UserRequest userRequest) {
+        Long userId = userRequest.getUserId();
+        Long companyId = userRequest.getCompanyId();
+        //获取用户信息
+        UserAccount userAccount = userAccountService.getByUserId(userId);
+        UserInfo userInfo = userInfoService.getByUserId(userId);
+        //获取公司信息
+        List<MtCompanyUser> mtCompanyUserList = mtCompanyUserService.list(new QueryWrapper<MtCompanyUser>()
+                .select("mt_company_id")
+                .eq("user_id", userId)
+                .eq("delete_flag", ApiConstants.DELETE_NO)
+        );
+        //获取角色信息
+        Role role = roleService.getRoleByUserIdAndCompanyId(userId, companyId);
+        List<Long> mtCompanyIdList = ProjectUtils.getAttrList(mtCompanyUserList, "mtCompanyId", null);
+        List<MaintenanceCompany> maintenanceCompanyList = maintenanceCompanyService.list(new QueryWrapper<MaintenanceCompany>()
+                .in(mtCompanyIdList.size() > 0, "id", mtCompanyIdList)
+        );
+        PersonalCenterResponse personalCenterResponse = new PersonalCenterResponse();
+        //设置用户信息
+        personalCenterResponse.setAccount(userAccount.getAccount());
+        personalCenterResponse.setMobile(userAccount.getMobile());
+        personalCenterResponse.setRemarks(userInfo.getRemarks());
+        personalCenterResponse.setName(userInfo.getName());
+        //设置角色信息
+        if (role != null) {
+            personalCenterResponse.setRoleName(role.getName());
+        }
+        //设置团队信息
+        personalCenterResponse.setMaintenanceCompanyList(maintenanceCompanyList);
+        return RestResponse.success(personalCenterResponse,"获取用户信息成功");
+    }
+
 }