From 307df1ad081c6fefabff79124176623272ddcc10 Mon Sep 17 00:00:00 2001 From: chendonggua <> Date: Thu, 28 Jul 2022 16:20:14 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E3=80=91=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E5=90=88=E5=B9=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/SysEveUserStaffController.java | 14 ---- .../skyeye/eve/dao/SysEveUserStaffDao.java | 2 - .../skyeye/eve/service/SysEveUserService.java | 10 --- .../eve/service/SysEveUserStaffService.java | 2 - .../service/impl/SysEveUserServiceImpl.java | 32 ++------ .../impl/SysEveUserStaffServiceImpl.java | 15 ---- .../mapper/userauth/SysEveUserMapper.xml | 39 +++++----- .../mapper/userauth/SysEveUserStaffMapper.xml | 76 +++++++++---------- 8 files changed, 63 insertions(+), 127 deletions(-) diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveUserStaffController.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveUserStaffController.java index b36da5b1..2ccc3caa 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/controller/SysEveUserStaffController.java +++ b/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); - } - /** * 修改员工剩余年假信息 * diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveUserStaffDao.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveUserStaffDao.java index 90763a05..0e141b88 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveUserStaffDao.java +++ b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/dao/SysEveUserStaffDao.java @@ -32,8 +32,6 @@ public interface SysEveUserStaffDao { Map querySysUserStaffByIdToDetails(@Param("staffId") String staffId); - Map querySysUserStaffDetailsByUserId(@Param("userId") String userId); - int editSysUserStaffState(Map map); /** diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserService.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserService.java index b25c641f..69ed5b94 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserService.java +++ b/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 getUserMationByUserId(String userId); - } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserStaffService.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserStaffService.java index 40befcb8..b62cca6b 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/SysEveUserStaffService.java +++ b/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); diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserServiceImpl.java index 7f2b5d39..d1a48db5 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserServiceImpl.java +++ b/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 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 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); - } - } diff --git a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserStaffServiceImpl.java b/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserStaffServiceImpl.java index 4f8118ba..03cd59e1 100644 --- a/skyeye-promote/skyeye-userauth/src/main/java/com/skyeye/eve/service/impl/SysEveUserStaffServiceImpl.java +++ b/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 map = inputObject.getParams(); - String userId = map.get("userId").toString(); - Map bean = sysEveUserStaffDao.querySysUserStaffDetailsByUserId(userId); - outputObject.setBean(bean); - outputObject.settotal(1); - } - /** * 修改员工剩余年假信息 * diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml index 69a9cd3f..756b6318 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserMapper.xml @@ -325,6 +325,7 @@ diff --git a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffMapper.xml b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffMapper.xml index 254aeab4..2b06b49f 100644 --- a/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffMapper.xml +++ b/skyeye-promote/skyeye-userauth/src/main/resources/mapper/userauth/SysEveUserStaffMapper.xml @@ -202,11 +202,46 @@ - - UPDATE sys_eve_user_staff