异步处理重点人群导入

ruoyi-admin/src/main/java/com/ruoyi/web/controller/info/UserInfoController.java

@@ -28,6 +28,8 @@ import com.ruoyi.common.utils.poi.ExcelUtil;
 import com.ruoyi.common.core.page.TableDataInfo;
 import org.springframework.web.multipart.MultipartFile;
 
+import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
+
 /**
  * 导入人员信息Controller
  *
@@ -80,8 +82,8 @@ public class UserInfoController extends BaseController {
                 StringUtils.isEmpty(userInfo.getFocusCrowdStyle())) {
             return AjaxResult.error("请将对比参数填写完整后查询（开始时间，结束时间，检测频次（次数），职业类别，重点人群分类）");
         }
-
-        userInfoService.date(userInfo);
+        SysUser user = getLoginUser().getUser();
+        userInfoService.date(userInfo, user);
         return AjaxResult.success("正在处理中,请稍后刷新页面");
     }
 

ruoyi-system/src/main/java/com/ruoyi/system/service/IUserInfoService.java

@@ -71,5 +71,5 @@ public interface IUserInfoService
 
     int deleteUserInfoOneByIds(Long[] ids);
 
-    String date(UserInfo userInfo) throws Exception;
+    String date(UserInfo userInfo,SysUser user) throws Exception;
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/UserInfoServiceImpl.java

@@ -32,6 +32,8 @@ import java.util.*;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
+import static com.ruoyi.common.utils.SecurityUtils.getLoginUser;
+
 /**
  * 导入人员信息Service业务层处理
  *
@@ -70,7 +72,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
      */
     @Override
     public List<UserInfo> selectUserInfoList(UserInfo userInfo) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = getLoginUser().getUser();
         userInfo.setDeptId(String.valueOf(user.getDeptId()));
         return userInfoMapper.selectUserInfoList(userInfo);
     }
@@ -126,14 +128,12 @@ public class UserInfoServiceImpl implements IUserInfoService {
     @Override
     @Transactional(rollbackFor = Exception.class)
     @Async
-    public String date(UserInfo userInfoP) throws Exception {
+    public String date(UserInfo userInfoP,SysUser user) throws Exception {
 
 
         System.out.println("接口开始========");
         long start1 = System.currentTimeMillis();
 
-
-        SysUser user = SecurityUtils.getLoginUser().getUser();
         //获取人员信息
         KeyPeopleInfo keyPeopleInfo = new KeyPeopleInfo();
         keyPeopleInfo.setDeptId(user.getDeptId().toString());
@@ -508,7 +508,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
             return AjaxResult.error("请将参数填写完整后查询");
         }
 
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = getLoginUser().getUser();
 
         String startTime = userInfo.getStartTime();
         String endTime = userInfo.getEndTime();
@@ -634,7 +634,7 @@ public class UserInfoServiceImpl implements IUserInfoService {
 
     @Override
     public List<UserInfoOne> oneDateList(UserInfoOne userInfoOne) {
-        SysUser user = SecurityUtils.getLoginUser().getUser();
+        SysUser user = getLoginUser().getUser();
         userInfoOne.setDeptId(String.valueOf(user.getDeptId()));
         return userInfoOneMapper.selectUserInfoOneList(userInfoOne);
     }