【用户信息】用户信息接口合并

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveUserStaffController.java

@@ -185,20 +185,6 @@ public class SysEveUserStaffController {
         sysEveUserStaffService.queryUserNameList(inputObject, outputObject);
     }
 
-    /**
-     * 通过用户id查询一条员工信息
-     *
-     * @param inputObject  入参以及用户信息等获取对象
-     * @param outputObject 出参以及提示信息的返回值对象
-     */
-    @ApiOperation(id = "querySysUserStaffDetailsByUserId", value = "通过用户id查询一条员工信息", method = "GET", allUse = "0")
-    @ApiImplicitParams({
-        @ApiImplicitParam(id = "userId", name = "userId", value = "用户id", required = "required")})
-    @RequestMapping("/post/SysEveUserStaffController/querySysUserStaffDetailsByUserId")
-    public void querySysUserStaffDetailsByUserId(InputObject inputObject, OutputObject outputObject) {
-        sysEveUserStaffService.querySysUserStaffDetailsByUserId(inputObject, outputObject);
-    }
-
     /**
      * 修改员工剩余年假信息
      *

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveUserStaffDao.java

@@ -32,8 +32,6 @@ public interface SysEveUserStaffDao {
 
     Map<String, Object> querySysUserStaffByIdToDetails(@Param("staffId") String staffId);
 
-    Map<String, Object> querySysUserStaffDetailsByUserId(@Param("userId") String userId);
-
     int editSysUserStaffState(Map<String, Object> map);
 
     /**

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserService.java

@@ -7,8 +7,6 @@ package com.skyeye.eve.service;
 import com.skyeye.common.object.InputObject;
 import com.skyeye.common.object.OutputObject;
 
-import java.util.Map;
-
 public interface SysEveUserService {
 
     void querySysUserList(InputObject inputObject, OutputObject outputObject);
@@ -70,12 +68,4 @@ public interface SysEveUserService {
 
     void queryUserMationByUserId(InputObject inputObject, OutputObject outputObject);
 
-    /**
-     * 根据用户id获取用户信息
-     *
-     * @param userId 用户id
-     * @return 用户信息
-     */
-    Map<String, Object> getUserMationByUserId(String userId);
-
 }

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserStaffService.java

@@ -35,8 +35,6 @@ public interface SysEveUserStaffService {
 
     void queryUserNameList(InputObject inputObject, OutputObject outputObject);
 
-    void querySysUserStaffDetailsByUserId(InputObject inputObject, OutputObject outputObject);
-
     void editSysUserStaffAnnualLeaveById(InputObject inputObject, OutputObject outputObject);
 
     void updateSysUserStaffHolidayNumberById(InputObject inputObject, OutputObject outputObject);

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserServiceImpl.java

@@ -7,9 +7,7 @@ package com.skyeye.eve.service.impl;
 import cn.hutool.json.JSONUtil;
 import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
-import com.skyeye.cache.redis.RedisCache;
 import com.skyeye.common.constans.Constants;
-import com.skyeye.common.constans.RedisConstants;
 import com.skyeye.common.constans.SysUserAuthConstants;
 import com.skyeye.common.object.GetUserToken;
 import com.skyeye.common.object.InputObject;
@@ -29,7 +27,10 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.*;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 /**
  * @ClassName: SysEveUserServiceImpl
@@ -53,9 +54,6 @@ public class SysEveUserServiceImpl implements SysEveUserService {
     @Autowired
     private JedisClientService jedisClient;
 
-    @Autowired
-    private RedisCache redisCache;
-
     @Autowired
     private SysAuthorityService sysAuthorityService;
 
@@ -668,28 +666,8 @@ public class SysEveUserServiceImpl implements SysEveUserService {
     @Override
     public void queryUserMationByUserId(InputObject inputObject, OutputObject outputObject) {
         Map<String, Object> map = inputObject.getParams();
-        String userId = map.get("userId").toString();
-        outputObject.setBean(getUserMationByUserId(userId));
+        outputObject.setBean(sysEveUserDao.queryUserDetailsMationByUserId(map.get("userId").toString()));
         outputObject.settotal(1);
     }
 
-    /**
-     * 根据用户id获取用户信息
-     *
-     * @param userId 用户id
-     * @return 用户信息
-     */
-    @Override
-    public Map<String, Object> getUserMationByUserId(String userId) {
-        String cacheKey = String.format(Locale.ROOT, "userMationDetails:%s", userId);
-        return redisCache.getMap(cacheKey, key -> {
-            try {
-                return sysEveUserDao.queryUserDetailsMationByUserId(userId);
-            } catch (Exception ee) {
-                LOGGER.warn("get user details mation by userId error.", ee);
-            }
-            return null;
-        }, RedisConstants.THIRTY_DAY_SECONDS);
-    }
-
 }

skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserStaffServiceImpl.java

@@ -455,21 +455,6 @@ public class SysEveUserStaffServiceImpl implements SysEveUserStaffService {
         outputObject.settotal(beans.size());
     }
 
-    /**
-     * 通过用户id查询一条员工信息
-     *
-     * @param inputObject  入参以及用户信息等获取对象
-     * @param outputObject 出参以及提示信息的返回值对象
-     */
-    @Override
-    public void querySysUserStaffDetailsByUserId(InputObject inputObject, OutputObject outputObject) {
-        Map<String, Object> map = inputObject.getParams();
-        String userId = map.get("userId").toString();
-        Map<String, Object> bean = sysEveUserStaffDao.querySysUserStaffDetailsByUserId(userId);
-        outputObject.setBean(bean);
-        outputObject.settotal(1);
-    }
-
     /**
      * 修改员工剩余年假信息
      *

skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml

@@ -325,6 +325,7 @@
 	<select id="queryUserDetailsMationByUserId" resultType="java.util.Map">
 		SELECT
 			a.user_id id,
+			a.id staffId,
 			CONCAT_WS('_', a.job_number, a.user_name) `name`,
 			a.job_number jobNumber,
 			a.user_name userName,
@@ -336,30 +337,34 @@
 			a.phone userPhone,
 			a.home_phone userHomePhone,
 			a.qq userQq,
-			a.user_sign userSign,
+			a.work_time workTime,
+			a.entry_time entryTime,
+			IFNULL(a.quit_time, '') quitTime,
+			IFNULL(a.quit_reason, '') quitReason,
+			a.annual_leave annualLeave,
+			a.holiday_number holidayNumber,
+			a.retired_holiday_number retiredHolidayNumber,
+			IFNULL(a.user_sign, '暂无签名') userSign,
+			CASE a.state WHEN '1' THEN 'state-up' WHEN '2' THEN 'state-down' END colorClass,
 		    a.company_id companyId,
-			m.company_name companyName,
-			m.department_name departmentName,
-			m.job_name jobName,
+			u.company_name companyName,
+			a.department_id departmentId,
+			q.department_name departmentName,
+			p.job_name jobName,
+			o.name_cn jobScoreName,
 			b.user_code userCode
 		FROM
 			sys_eve_user_staff a
-			LEFT JOIN (SELECT 
-							o.user_id,
-							p.job_name,
-							q.department_name,
-							u.company_name
-						FROM 
-							sys_eve_user_staff o, 
-							company_job p, 
-							company_department q, 
-							company_mation u 
-						WHERE o.company_id = u.id 
-							AND o.department_id = q.id 
-							AND o.job_id = p.id) m ON m.user_id = a.user_id,
+			LEFT JOIN company_job_score o ON a.job_score_id = o.id,
+			company_job p,
+			company_department q,
+			company_mation u,
 			sys_eve_user b
 		WHERE a.user_id = #{userId}
 		AND b.id = a.user_id
+		AND a.company_id = u.id
+		AND a.department_id = q.id
+		AND a.job_id = p.id
 	</select>
 	
 	<update id="editUserDetailsMationByUserId" parameterType="java.util.Map">

skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffMapper.xml

@@ -202,11 +202,46 @@
 	<select id="queryUserNameList" resultType="java.util.Map">
 		SELECT
 			a.user_id id,
+			a.id staffId,
 			CONCAT_WS('_', a.job_number, a.user_name) `name`,
-			a.email
+			a.job_number jobNumber,
+			a.user_name userName,
+			a.user_photo userPhoto,
+			a.user_idcard userIdCard,
+			a.user_sex userSex,
+			a.state,
+			a.email,
+			a.phone userPhone,
+			a.home_phone userHomePhone,
+			a.qq userQq,
+			a.work_time workTime,
+			a.entry_time entryTime,
+			IFNULL(a.quit_time, '') quitTime,
+			IFNULL(a.quit_reason, '') quitReason,
+			a.annual_leave annualLeave,
+			a.holiday_number holidayNumber,
+			a.retired_holiday_number retiredHolidayNumber,
+			IFNULL(a.user_sign, '暂无签名') userSign,
+			CASE a.state WHEN '1' THEN 'state-up' WHEN '2' THEN 'state-down' END colorClass,
+			a.company_id companyId,
+			u.company_name companyName,
+			a.department_id departmentId,
+			q.department_name departmentName,
+			p.job_name jobName,
+			o.name_cn jobScoreName,
+			b.user_code userCode
 		FROM
 			sys_eve_user_staff a
+			LEFT JOIN company_job_score o ON a.job_score_id = o.id,
+			company_job p,
+			company_department q,
+			company_mation u,
+			sys_eve_user b
 		WHERE INSTR(CONCAT(',', #{userIds}, ','), CONCAT(',', a.user_id, ','))
+		AND b.id = a.user_id
+		AND a.company_id = u.id
+		AND a.department_id = q.id
+		AND a.job_id = p.id
 	</select>
 	
 	<select id="querySysUserStaffListToTable" parameterType="java.util.Map" resultType="java.util.Map">
@@ -360,45 +395,6 @@
 		</foreach>
 	</select>
 
-	<select id="querySysUserStaffDetailsByUserId" resultType="java.util.Map">
-		SELECT
-			a.id,
-			a.job_number jobNumber,
-			a.user_name userName,
-			a.user_photo userPhoto,
-			a.user_idcard userIdCard,
-			a.email,
-			a.phone,
-			a.home_phone homePhone,
-			a.qq,
-			a.work_time workTime,
-			a.entry_time entryTime,
-			IFNULL(a.quit_time, '') quitTime,
-			IFNULL(a.quit_reason, '') quitReason,
-			a.annual_leave annualLeave,
-		    a.holiday_number holidayNumber,
-		    a.retired_holiday_number retiredHolidayNumber,
-			IFNULL(a.user_sign, '暂无签名') userSign,
-			CASE a.state WHEN '1' THEN 'state-up' WHEN '2' THEN 'state-down' END colorClass,
-			CASE a.state WHEN '1' THEN '在职' WHEN '2' THEN '离职' END state,
-			CASE a.user_sex WHEN '2' THEN '女' WHEN '1' THEN '男' ELSE '保密' END userSex,
-			u.company_name companyName,
-		    a.department_id departmentId,
-			q.department_name departmentName,
-			p.job_name jobName,
-			o.name_cn jobScoreName
-		FROM
-			sys_eve_user_staff a
-			LEFT JOIN company_job_score o ON a.job_score_id = o.id,
-			company_job p,
-			company_department q,
-			company_mation u
-		WHERE a.user_id = #{userId}
-		  AND a.company_id = u.id
-		  AND a.department_id = q.id
-		  AND a.job_id = p.id
-	</select>
-
 	<update id="editSysUserStaffAnnualLeaveById">
 		UPDATE sys_eve_user_staff
 		<set>