添加自动获取当前登录人的方法

amos-boot-module/amos-boot-module-biz/amos-boot-module-jcs-biz/src/main/java/com/yeejoin/amos/boot/module/jcs/biz/service/impl/ExcelServiceImpl.java

@@ -26,17 +26,22 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.util.StringUtils;
 import org.springframework.web.multipart.MultipartFile;
+import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.utils.Bean;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
 import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 
 import com.alibaba.excel.support.ExcelTypeEnum;
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Sequence;
 import com.google.common.collect.Lists;
+import com.yeejoin.amos.boot.biz.common.bo.ReginParams;
 import com.yeejoin.amos.boot.biz.common.entity.BaseEntity;
 import com.yeejoin.amos.boot.biz.common.utils.DateUtils;
 import com.yeejoin.amos.boot.biz.common.utils.QRCodeUtil;
+import com.yeejoin.amos.boot.biz.common.utils.RedisKey;
+import com.yeejoin.amos.boot.biz.common.utils.RedisUtils;
 import com.yeejoin.amos.boot.module.common.api.dto.CompanyPerson;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyCarDto;
 import com.yeejoin.amos.boot.module.common.api.dto.DutyFireFightingDto;
@@ -1436,16 +1441,17 @@ if (excelDtoList != null && excelDtoList.size() > 0) {
 			break;
 		}
 	}
-	
+	 @Autowired
+	private RedisUtils redisUtils;
 	public BaseEntity getCurrentInfo() {
 		BaseEntity userModel= new BaseEntity();
-	/*		String keyString=	RequestContext.getExeUserId();
+			String keyString=	RequestContext.getExeUserId();
 	String token=RequestContext.getToken();
 		ReginParams params = JSONObject.parseObject(redisUtils
 				.get(RedisKey.buildReginKey(keyString, token)).toString(),
-				ReginParams.class);*/
-		userModel.setRecUserId("3141675");		
-		userModel.setRecUserName("admin_jcs");
+				ReginParams.class);
+		userModel.setRecUserId(params.getUserModel().getUserId());		
+		userModel.setRecUserName(params.getUserModel().getUserName());
 		userModel.setRecDate( new Date());
 		return userModel;
 	}