From 9b3ec7f4985d259a9b0441837ee6c8eb3e51d48f Mon Sep 17 00:00:00 2001
From: cjl <qiankunpingtai@163.com>
Date: Thu, 24 Jan 2019 10:22:34 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=BD=E5=8F=96=E8=8E=B7=E5=8F=96=E5=BD=93?=
 =?UTF-8?q?=E5=89=8D=E7=99=BB=E5=BD=95=E4=BA=BA=E4=BF=A1=E6=81=AF=E4=B8=BA?=
 =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/serialNumber/SerialNumberService.java | 13 +++++--------
 .../com/jsh/erp/service/user/UserService.java     | 15 +++++++++++++++
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
index 308c45fe..ec2a2e0b 100644
--- a/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
+++ b/src/main/java/com/jsh/erp/service/serialNumber/SerialNumberService.java
@@ -10,20 +10,17 @@ import com.jsh.erp.datasource.mappers.SerialNumberMapperEx;
 import com.jsh.erp.exception.BusinessRunTimeException;
 import com.jsh.erp.service.depotItem.DepotItemService;
 import com.jsh.erp.service.material.MaterialService;
+import com.jsh.erp.service.user.UserService;
 import com.jsh.erp.utils.StringUtil;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import org.springframework.web.context.request.RequestContextHolder;
-import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.util.Date;
 import java.util.List;
-import java.util.Objects;
 
 /**
  * Description
@@ -43,6 +40,8 @@ public class SerialNumberService {
     private MaterialMapperEx materialMapperEx;
     @Resource
     private DepotItemService depotItemService;
+    @Resource
+    private UserService userService;
 
 
     public SerialNumber getSerialNumber(long id) {
@@ -180,8 +179,7 @@ public class SerialNumberService {
         Date date=new Date();
         serialNumberEx.setCreateTime(date);
         serialNumberEx.setUpdateTime(date);
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        User userInfo=(User)request.getSession().getAttribute("user");
+        User userInfo=userService.getCurrentUser();
         serialNumberEx.setCreator(userInfo==null?null:userInfo.getId());
         serialNumberEx.setUpdater(userInfo==null?null:userInfo.getId());
         int result=serialNumberMapperEx.addSerialNumber(serialNumberEx);
@@ -199,8 +197,7 @@ public class SerialNumberService {
         serialNumberEx.setMaterialId(getSerialNumberMaterialIdByMaterialName(serialNumberEx.getMaterialName()));
         Date date=new Date();
         serialNumberEx.setUpdateTime(date);
-        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
-        User userInfo=(User)request.getSession().getAttribute("user");
+        User userInfo=userService.getCurrentUser();
         serialNumberEx.setUpdater(userInfo==null?null:userInfo.getId());
         int result = serialNumberMapperEx.updateSerialNumber(serialNumberEx);
         if(result==1){
diff --git a/src/main/java/com/jsh/erp/service/user/UserService.java b/src/main/java/com/jsh/erp/service/user/UserService.java
index c4ce6840..e671251e 100644
--- a/src/main/java/com/jsh/erp/service/user/UserService.java
+++ b/src/main/java/com/jsh/erp/service/user/UserService.java
@@ -10,12 +10,15 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.security.NoSuchAlgorithmException;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 @Service
 public class UserService {
@@ -168,4 +171,16 @@ public class UserService {
         List<User> list = userMapper.selectByExample(example);
         return list.size();
     }
+    /**
+     * create by: cjl
+     * description:
+     *  获取当前用户信息
+     * create time: 2019/1/24 10:01
+     * @Param:
+     * @return com.jsh.erp.datasource.entities.User
+     */
+    public User getCurrentUser(){
+        HttpServletRequest request = ((ServletRequestAttributes) Objects.requireNonNull(RequestContextHolder.getRequestAttributes())).getRequest();
+        return (User)request.getSession().getAttribute("user");
+    }
 }