全部获取登录Id修改 2022/8/31

PAS/src/main/java/cn/cslg/pas/common/config/InnerInterceptor/LizzMybatisIntercepts.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.common.config.InnerInterceptor;
 import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.RedisUtil;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.SecurityUtils;
 import cn.cslg.pas.common.utils.auth.TreeUtils;
 import cn.cslg.pas.common.model.DataSource;
@@ -39,10 +40,9 @@ public class LizzMybatisIntercepts implements InnerInterceptor {
     @Lazy//懒加载，当调用时注入
     @Autowired
     private  CacheUtils cacheUtils ;
-
     @Lazy//懒加载，当调用时注入
     @Autowired
-    private RedisUtil redisUtil ;
+    private LoginUtils loginUtils ;
 
     @Value("${authorUrl}")
     private String url;
@@ -96,7 +96,7 @@ public class LizzMybatisIntercepts implements InnerInterceptor {
             List<DataSource> dataSources=jsonArray1.toJavaList(DataSource.class);
              //拼接所有角色的限制条件
             if(jsonArray.size()>0){
-                PersonnelVO personnelVO =cacheUtils.getLoginUserPersonnel(3);
+                PersonnelVO personnelVO =cacheUtils.getLoginUserPersonnel(loginUtils.getId());
             for(int i=0;i<jsonArray.size();i++){
                 String sql1= TreeUtils.reSql(JSONObject.parseObject( jsonArray.get(i).toString()) ,dataSources,personnelVO);
                 sqls += jsonArray.size()!=i+1 ?  sql1+" OR ":sql1;

PAS/src/main/java/cn/cslg/pas/common/core/annotation/PermissionAspect.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.common.core.annotation;
 
 import cn.cslg.pas.common.core.base.RequestHolder;
 import cn.cslg.pas.common.core.exception.PermissionException;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectUser;
 import cn.cslg.pas.domain.User;
@@ -35,7 +36,8 @@ public class PermissionAspect {
     private ProjectService projectService;
     @Autowired
     private CacheUtils cacheUtils;
-
+    @Autowired
+    private LoginUtils loginUtils;
     @Pointcut("execution(public * cn.cslg.pas.controller.*.*(..))")
     public void privilege() {
     }
@@ -51,7 +53,7 @@ public class PermissionAspect {
             HttpServletRequest request = RequestHolder.getRequest();
             if (request != null) {
                 String projectId = request.getHeader("x-project-id");
-                Integer userId = StpUtil.getLoginIdAsInt();
+                Integer userId = loginUtils.getId();
                 if (StringUtils.isNotEmpty(projectId)) {
                     Project project = projectService.getById(projectId);
                     User user = cacheUtils.getLoginUser(userId);

PAS/src/main/java/cn/cslg/pas/common/utils/SecurityUtils/LoginUtils.java

@@ -2,17 +2,22 @@ package cn.cslg.pas.common.utils.SecurityUtils;
 
 import cn.cslg.pas.common.utils.RedisUtil;
 import cn.hutool.core.io.FileUtil;
+import io.swagger.v3.oas.models.security.SecurityScheme;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.system.ApplicationHome;
+import org.springframework.stereotype.Component;
 import org.springframework.web.context.request.RequestAttributes;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
+import org.thymeleaf.expression.Ids;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import java.io.File;
-
+@Component
 public class LoginUtils {
-     @Autowired
+    @Resource
      private RedisUtil redisUtil;
     public static String getToken() {
         RequestAttributes ra = RequestContextHolder.getRequestAttributes();
@@ -21,10 +26,11 @@ public class LoginUtils {
         String tem =httpRequest.getHeader("Cookie");
         return tem;
     }
-    public  String getId() {
+    public  Integer getId() {
     String oriToken=LoginUtils.getToken();
         String q= "token:login:"+oriToken.replace("=",":");
-        String Id= redisUtil.get(q);
-           return Id;
+        String IdS= redisUtil.get(q);
+        Integer id =Integer.parseInt(IdS);
+           return id;
     }
 }

PAS/src/main/java/cn/cslg/pas/common/utils/SecurityUtils/SecurityUtils.java

@@ -4,7 +4,7 @@ import org.springframework.stereotype.Component;
 
 import java.util.Map;
 
-@Component
+    @Component
 public class SecurityUtils {
 
     protected static final ThreadLocal<Map<String,Object>> threadLocal = new ThreadLocal();

PAS/src/main/java/cn/cslg/pas/controller/PatentController.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.Patent;
 import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.JsonUtils;
@@ -41,6 +42,7 @@ public class PatentController {
     private final TaskService taskService;
     private final CacheUtils cacheUtils;
     private final ProjectFieldPatentLinkService projectFieldPatentLinkService;
+    private final LoginUtils loginUtils;
 
     @GetMapping("/read/total")
     @Operation(summary = "专利阅读状态统计")
@@ -100,7 +102,7 @@ public class PatentController {
         taskParams.setIds(StringUtils.join(ids, ","));
         taskParams.setProjectId(params.getProjectId());
         taskParams.setSelected(JsonUtils.objectToJson(params.getSelected()));
-        taskParams.setUserId(String.valueOf(StpUtil.getLoginIdAsInt()));
+        taskParams.setUserId(String.valueOf(loginUtils.getId()));
         patentService.exportPatent(taskParams);
         return Response.success(true);
     }

PAS/src/main/java/cn/cslg/pas/controller/PatentInstructionController.java

@@ -3,6 +3,7 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.PatentInstruction;
 import cn.cslg.pas.service.PatentInstructionService;
 import cn.cslg.pas.service.TaskService;
@@ -44,6 +45,7 @@ public class PatentInstructionController {
     private final PatentInstructionService patentInstructionService;
     private final TaskService taskService;
     private final FileUtils fileUtils;
+    private final LoginUtils loginUtils;
 
     @GetMapping("list")
     @Operation(summary = "说明书列表")
@@ -55,7 +57,7 @@ public class PatentInstructionController {
     @PostMapping("/batch/upload")
     @Operation(summary = "批量上传说明书")
     public String batchUpload(String url, Integer type, String remark) throws IOException {
-        patentInstructionService.batchUpload(url, type, remark, StpUtil.getLoginIdAsInt());
+        patentInstructionService.batchUpload(url, type, remark, loginUtils.getId());
         return Response.success(true);
     }
 

PAS/src/main/java/cn/cslg/pas/controller/PatentKeywordsHighlightController.java

@@ -4,6 +4,7 @@ package cn.cslg.pas.controller;
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.PatentKeywordsHighlight;
 import cn.cslg.pas.common.model.vo.PatentKeywordsHighlightVO;
 import cn.cslg.pas.service.PatentKeywordsHighlightService;
@@ -27,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
 @RequestMapping(Constants.API_VERSION_V2 + "/patent/keywords/highlight")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentKeywordsHighlightController {
-
+    private final LoginUtils loginUtils;
     private final PatentKeywordsHighlightService patentKeywordsHighlightService;
 
     @GetMapping("list")
@@ -48,7 +49,7 @@ public class PatentKeywordsHighlightController {
     @PostMapping("default")
     @Operation(summary = "创建默认模板")
     public String getDefault(Integer projectId) {
-        PatentKeywordsHighlight patentKeywordsHighlight = patentKeywordsHighlightService.initPatentKeywordsHighlight(projectId, StpUtil.getLoginIdAsInt(), false, "新模板");
+        PatentKeywordsHighlight patentKeywordsHighlight = patentKeywordsHighlightService.initPatentKeywordsHighlight(projectId, loginUtils.getId(), false, "新模板");
         patentKeywordsHighlight.setConfig(null);
         return Response.success(patentKeywordsHighlight);
     }

PAS/src/main/java/cn/cslg/pas/controller/ProjectController.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.core.exception.PermissionException;
 import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.ProjectExport;
 import cn.cslg.pas.domain.User;
@@ -43,6 +44,7 @@ public class ProjectController {
     private final CacheUtils cacheUtils;
     private final ProjectExportService projectExportService;
     private final ProjectPatentLinkService projectPatentLinkService;
+    private final LoginUtils loginUtils;
 
     @checkAuth(FunId = 8)
     @PostMapping("list")
@@ -55,7 +57,7 @@ public class ProjectController {
     @PostMapping("add")
     @Operation(summary = "新增专题库")
     public String add(@RequestBody Project project) {
-        PersonnelVO user = cacheUtils.getLoginUserPersonnel(StpUtil.getLoginIdAsInt());
+        PersonnelVO user = cacheUtils.getLoginUserPersonnel(loginUtils.getId());
 //        if (user.getUserType().equals(0)) {
 //            throw new PermissionException("用户创建专题库拦截");
 //        }

PAS/src/main/java/cn/cslg/pas/controller/ProjectExportController.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.model.vo.ProjectExportVO;
 import cn.cslg.pas.common.model.vo.ProjectVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectExport;
@@ -39,6 +40,7 @@ public class ProjectExportController {
 
     private final ProjectService projectService;
     private final ProjectExportService projectExportService;
+    private final LoginUtils loginUtils;
 
     @Permission(roles = {2})
     @PostMapping
@@ -48,7 +50,7 @@ public class ProjectExportController {
         projectExport.setProjectId(params.getProjectId());
         projectExport.setStatus(0);
         Integer exportId = projectExportService.add(projectExport);
-        projectService.export(params, exportId, StpUtil.getLoginIdAsInt());
+        projectService.export(params, exportId, loginUtils.getId());
         return Response.success(true);
     }
 

PAS/src/main/java/cn/cslg/pas/controller/ProjectFieldController.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.model.dto.ProjectFieldOrderDTO;
 import cn.cslg.pas.common.model.vo.ProjectFieldOrderVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.service.ProjectFieldService;
 import cn.cslg.pas.domain.ProjectField;
@@ -35,6 +36,7 @@ public class ProjectFieldController {
 
     private final ProjectFieldService projectFieldService;
     private final CacheUtils cacheUtils;
+    private final LoginUtils loginUtils;
 
     @GetMapping("list")
     @Operation(summary = "自定义字段列表")
@@ -101,13 +103,13 @@ public class ProjectFieldController {
     @PostMapping("order")
     @Operation(summary = "用户更新字段的顺序")
     public String setProjectFieldOrder(@RequestBody ProjectFieldOrderVO params) {
-        cacheUtils.setProjectFieldOrder(params.getProjectId(), StpUtil.getLoginIdAsInt(), params.getData());
+        cacheUtils.setProjectFieldOrder(params.getProjectId(), loginUtils.getId(), params.getData());
         return Response.success(true);
     }
 
     @GetMapping("order")
     @Operation(summary = "获取用户的自定义字段排序")
     public String getProjectFieldOrder(Integer projectId) {
-        return Response.success(cacheUtils.getProjectFieldOrder(projectId, StpUtil.getLoginIdAsInt()));
+        return Response.success(cacheUtils.getProjectFieldOrder(projectId, loginUtils.getId()));
     }
 }

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.model.vo.ProjectImportPatentVO;
 import cn.cslg.pas.common.model.vo.ProjectImportVO;
 import cn.cslg.pas.common.model.vo.TaskParams;
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.service.ProjectImportService;
 import cn.cslg.pas.service.ProjectImportStatusService;
 import cn.cslg.pas.service.ProjectService;
@@ -39,7 +40,7 @@ public class ProjectImportController {
     private final CacheUtils cacheUtils;
     private final ProjectImportService projectImportService;
     private final ProjectImportStatusService projectImportStatusService;
-
+    private final LoginUtils loginUtils;
     private final UploadPatentBatchService uploadPatentBatchService;
 
 
@@ -81,7 +82,7 @@ public class ProjectImportController {
     @PostMapping
     @Operation(summary = "数据导入")
     public String importData(String url, ProjectImportVO params) {
-        Integer userId = StpUtil.getLoginIdAsInt();
+        Integer userId = loginUtils.getId();
         String tempId = cacheUtils.getUserImportId(userId);
         if (StringUtils.isNotEmpty(tempId)) {
             return Response.error("有导入任务在进行中");
@@ -95,7 +96,7 @@ public class ProjectImportController {
     @GetMapping("ongoing")
     @Operation(summary = "获取用户是否存在导入中的任务")
     public String getProjectImportOngoing() {
-        Integer userId = StpUtil.getLoginIdAsInt();
+        Integer userId = loginUtils.getId();
         String tempId = cacheUtils.getUserImportId(userId);
         if (StringUtils.isNotEmpty(tempId)) {
             return Response.success(tempId);

PAS/src/main/java/cn/cslg/pas/controller/ReportController.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.core.base.Constants;
 import cn.cslg.pas.common.utils.JsonUtils;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.ResponseEnum;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Report;
 import cn.cslg.pas.common.model.vo.ReportVO;
@@ -27,6 +28,7 @@ public class ReportController {
 
     private final ReportService reportService;
     private final CacheUtils cacheUtils;
+    private final LoginUtils loginUtils;
 
     @GetMapping("list")
     @Operation(summary = "报告列表")
@@ -49,7 +51,7 @@ public class ReportController {
             return Response.error(ResponseEnum.QUERY_CACHE_ERROR);
         }
         report.setStatus(0);
-        report.setCreateBy(StpUtil.getLoginIdAsInt());
+        report.setCreateBy(loginUtils.getId());
         report.setCfg(JsonUtils.objectToJson(report.getPatentList()));
         report.setCreateTime(new Date());
         report.insert();

PAS/src/main/java/cn/cslg/pas/service/ClientService.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.core.base.EStatus;
 import cn.cslg.pas.common.model.vo.ClientVO;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StpAdminUtil;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Client;
@@ -31,7 +32,7 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class ClientService extends ServiceImpl<ClientMapper, Client> {
-
+    private final LoginUtils loginUtils;
     public IPage<Client> getPageList(ClientVO params) {
         LambdaQueryWrapper<Client> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(params.getName())) {
@@ -49,7 +50,7 @@ public class ClientService extends ServiceImpl<ClientMapper, Client> {
     }
 
     public String add(Client client) {
-        client.setCreateBy(StpUtil.getLoginIdAsInt());
+        client.setCreateBy(loginUtils.getId());
         client.setCreateTime(DateUtils.getDateTime());
         client.setStatus(1);
         client.insert();

PAS/src/main/java/cn/cslg/pas/service/CustomAnalysisItemSchemaService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.dto.analysis.SchemaDimensionDTO;
 import cn.cslg.pas.common.utils.CacheUtils;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.cslg.pas.domain.CustomAnalysisItemSchema;
 import cn.cslg.pas.common.model.dto.analysis.SchemaDataDTO;
@@ -29,7 +30,7 @@ import java.util.List;
 public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisItemSchemaMapper, CustomAnalysisItemSchema> {
 
     private final CacheUtils cacheUtils;
-
+    private final LoginUtils loginUtils;
     public List<CustomAnalysisItemSchema> getListByUid(String uid) {
         LambdaQueryWrapper<CustomAnalysisItemSchema> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(CustomAnalysisItemSchema::getUid, uid);
@@ -69,7 +70,7 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
         d1.setPtype(dto.getX().getPtype());
         d1.setType(dto.getX().getType());
         d1.setNum(dto.getX().getNum());
-        d1.setCreateBy(StpUtil.getLoginIdAsInt());
+        d1.setCreateBy(loginUtils.getId());
         d2.setUid(uid);
         d2.setDimension("y");
         d2.setField(dto.getY().getField());
@@ -77,7 +78,7 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
         d2.setPtype(dto.getY().getPtype());
         d2.setType(dto.getY().getType());
         d2.setNum(dto.getY().getNum());
-        d2.setCreateBy(StpUtil.getLoginIdAsInt());
+        d2.setCreateBy(loginUtils.getId());
         customAnalysisItemSchema.add(d1);
         customAnalysisItemSchema.add(d2);
         this.saveBatch(customAnalysisItemSchema);

PAS/src/main/java/cn/cslg/pas/service/CustomAnalysisItemService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.core.base.EStatus;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.CustomAnalysisItem;
 import cn.cslg.pas.mapper.CustomAnalysisItemMapper;
@@ -35,7 +36,7 @@ public class CustomAnalysisItemService extends ServiceImpl<CustomAnalysisItemMap
     private final CustomAnalysisItemSettingService customAnalysisItemSettingService;
     private final CustomAnalysisItemSchemaService customAnalysisItemSchemaService;
     private final CustomAnalysisItemSourceService customAnalysisItemSourceService;
-
+    private final LoginUtils loginUtils;
     public List<CustomAnalysisItem> getTreeList(Integer projectId) {
         LambdaQueryWrapper<CustomAnalysisItem> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.and(Wrapper -> Wrapper.eq(CustomAnalysisItem::getProjectId, projectId).or().eq(CustomAnalysisItem::getPermissions, 2));
@@ -72,7 +73,7 @@ public class CustomAnalysisItemService extends ServiceImpl<CustomAnalysisItemMap
         group.setProjectId(customAnalysisItem.getProjectId());
         group.setPermissions(2);
         group.setSort((int) this.count(Wrappers.<CustomAnalysisItem>lambdaQuery().eq(CustomAnalysisItem::getParentId, 0)) + 1);
-        group.setCreateBy(StpUtil.getLoginIdAsInt());
+        group.setCreateBy(loginUtils.getId());
         group.insert();
         return group.getId();
     }
@@ -95,7 +96,7 @@ public class CustomAnalysisItemService extends ServiceImpl<CustomAnalysisItemMap
             customAnalysisItem.setParentId(this.addGroupItem(customAnalysisItem));
         }
         customAnalysisItem.setUid(uid);
-        customAnalysisItem.setCreateBy(StpUtil.getLoginIdAsInt());
+        customAnalysisItem.setCreateBy(loginUtils.getId());
         customAnalysisItem.insert();
         if (customAnalysisItem.getType().equals(1)) {
             customAnalysisItemSettingService.add(customAnalysisItem.getSetting(), uid);

PAS/src/main/java/cn/cslg/pas/service/CustomAnalysisItemSettingService.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.utils.JsonUtils;
 import cn.cslg.pas.common.model.dto.analysis.CustomSettingConfigDTO;
 import cn.cslg.pas.common.model.dto.analysis.CustomSettingLineConfigDTO;
 import cn.cslg.pas.common.model.dto.analysis.CustomSettingTableConfigDTO;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.CustomAnalysisItemSetting;
 import cn.cslg.pas.mapper.CustomAnalysisItemSettingMapper;
 import cn.dev33.satoken.stp.StpUtil;
@@ -25,7 +26,7 @@ import org.springframework.stereotype.Service;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class CustomAnalysisItemSettingService extends ServiceImpl<CustomAnalysisItemSettingMapper, CustomAnalysisItemSetting> {
-
+    private final LoginUtils loginUtils;
     public CustomAnalysisItemSetting getItemSettingByUid(String uid) {
         CustomAnalysisItemSetting temp = this.getOne(Wrappers.<CustomAnalysisItemSetting>lambdaQuery().eq(CustomAnalysisItemSetting::getUid, uid));
         if (temp == null) {
@@ -49,7 +50,7 @@ public class CustomAnalysisItemSettingService extends ServiceImpl<CustomAnalysis
 
     public CustomAnalysisItemSetting add(CustomAnalysisItemSetting customAnalysisItemSetting, String uid) {
         customAnalysisItemSetting.setUid(uid);
-        customAnalysisItemSetting.setCreateBy(StpUtil.getLoginIdAsInt());
+        customAnalysisItemSetting.setCreateBy(loginUtils.getId());
         customAnalysisItemSetting.setColorConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getColor()));
         customAnalysisItemSetting.setTableConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getTable()));
         customAnalysisItemSetting.setLineConfig(JsonUtils.objectToJson(customAnalysisItemSetting.getConfig().getLine()));

PAS/src/main/java/cn/cslg/pas/service/CustomAnalysisItemSourceService.java

@@ -10,6 +10,7 @@ import cn.cslg.pas.common.model.vo.PatentQueryFieldSourceVO;
 import cn.cslg.pas.common.model.vo.SearchSourceDataVO;
 import cn.cslg.pas.common.model.vo.SourceDataVO;
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.CustomAnalysisItem;
 import cn.cslg.pas.domain.CustomAnalysisItemSource;
 import cn.cslg.pas.domain.ProjectFieldExpand;
@@ -47,6 +48,7 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
     private final ProjectFieldTreeService projectFieldTreeService;
     private final ProjectFieldService projectFieldService;
     private final FileUtils fileUtils;
+    private final LoginUtils loginUtils;
 
     public SourceDataDTO getItemSourceData(CustomAnalysisItem customAnalysisItem) {
         SourceDataDTO sourceDataDTO = new SourceDataDTO();
@@ -226,7 +228,7 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
             }
             source.setFieldId(sourceDataVO.getFieldId());
             source.setExpandId(sourceDataVO.getExpandId());
-            source.setCreateBy(StpUtil.getLoginIdAsInt());
+            source.setCreateBy(loginUtils.getId());
             source.setDimension(sourceDataVO.getDimension());
             source.setUid(sourceDataVO.getUid());
             list.add(source);

PAS/src/main/java/cn/cslg/pas/service/OAuth2Service.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.core.base.RedisConf;
 import cn.cslg.pas.common.model.PersonnelVO;
 import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.Project;
 import cn.cslg.pas.domain.ProjectUser;
 import cn.cslg.pas.domain.User;
@@ -37,12 +38,13 @@ public class OAuth2Service {
     private final RedisUtil redisUtil;
     private final ProjectUserService projectUserService;
     private final ProjectService projectService;
+    private final LoginUtils loginUtils;
     @Value("${authorUrl}")
     private String url;
     public static final MediaType JSON = MediaType.parse("application/json; charset=utf-8");
 
     public User getUserinfo() {
-        Integer userId = StpUtil.getLoginIdAsInt();
+        Integer userId = loginUtils.getId();
         User user = cacheUtils.getLoginUser(userId);
         user.setPassword(null);
         return user;
@@ -166,7 +168,7 @@ public class OAuth2Service {
     }
 
     public String changePwd(String oldPassword, String newPassword) {
-        Integer userId = StpUtil.getLoginIdAsInt();
+        Integer userId = loginUtils.getId();
         User user = userService.getById(userId);
         boolean isPassword = SecureUtil.md5(oldPassword).equals(user.getPassword());
         if (!isPassword) {

PAS/src/main/java/cn/cslg/pas/service/PatentAnnotationService.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.mapper.PatentAnnotationMapper;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.Response;
@@ -24,6 +25,7 @@ import org.springframework.stereotype.Service;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentAnnotationService extends ServiceImpl<PatentAnnotationMapper, PatentAnnotation> {
+    private final LoginUtils loginUtils;
 
     public IPage<PatentAnnotation> getPageList(PatentAnnotationVO params) {
         IPage<PatentAnnotation> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
@@ -31,7 +33,7 @@ public class PatentAnnotationService extends ServiceImpl<PatentAnnotationMapper,
     }
 
     public String add(PatentAnnotation patentAnnotation) {
-        patentAnnotation.setCreateBy(StpUtil.getLoginIdAsInt());
+        patentAnnotation.setCreateBy(loginUtils.getId());
         patentAnnotation.setCreateTime(DateUtils.getDateTime());
         patentAnnotation.insert();
         return Response.success(patentAnnotation.getId());

PAS/src/main/java/cn/cslg/pas/service/PatentApplicantService.java

@@ -6,6 +6,7 @@ import cn.cslg.pas.common.model.vo.PatentApplicantVO;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.PatentUtils;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.PatentApplicant;
 import cn.cslg.pas.domain.PatentApplicantLink;
@@ -43,6 +44,7 @@ public class PatentApplicantService extends ServiceImpl<PatentApplicantMapper, P
     private final PatentApplicantMergeLinkService patentApplicantMergeLinkService;
     private final AreaService areaService;
     private final SystemDictService systemDictService;
+    private final LoginUtils loginUtils;
 
     public List<PatentApplicant> getPatentApplicantByIds(List<Integer> ids) {
         if (ids == null || ids.size() == 0) {
@@ -171,7 +173,7 @@ public class PatentApplicantService extends ServiceImpl<PatentApplicantMapper, P
         if (temp != null) {
             return Response.error("名称已存在");
         }
-        patentApplicant.setCreateBy(StpUtil.getLoginIdAsInt());
+        patentApplicant.setCreateBy(loginUtils.getId());
         patentApplicant.setUpdateTime(DateUtils.getDateTime());
         patentApplicant.insert();
         return Response.success(true);

PAS/src/main/java/cn/cslg/pas/service/PatentInstructionService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.Patent;
 import cn.cslg.pas.domain.PatentImage;
 import cn.cslg.pas.domain.PatentInstruction;
@@ -48,7 +49,7 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
     private final FileUtils fileUtils;
     private final PatentService patentService;
     private final ProjectFileService projectFileService;
-
+    private final LoginUtils loginUtils;
     public IPage<PatentInstruction> getPageList(PatentInstructionVO params) {
         LambdaQueryWrapper<PatentInstruction> queryWrapper = new LambdaQueryWrapper<>();
         if (StringUtils.isNotEmpty(params.getPatentNo())) {
@@ -137,7 +138,7 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
 
     public String add(MultipartFile file, PatentInstruction patentInstruction) {
         UploadFileDTO fileDTO = fileUtils.uploadFile(file);
-        patentInstruction.setCreateBy(StpUtil.getLoginIdAsInt());
+        patentInstruction.setCreateBy(loginUtils.getId());
         patentInstruction.setUrl(fileDTO.getPath());
         patentInstruction.setFileName(fileDTO.getFileName());
         patentInstruction.insert();
@@ -151,7 +152,7 @@ public class PatentInstructionService extends ServiceImpl<PatentInstructionMappe
             FileUtil.del(fileUtils.getSystemPath(patentInstruction.getUrl()));
         }
         UploadFileDTO fileDTO = fileUtils.uploadFile(file);
-        patentInstruction.setCreateBy(StpUtil.getLoginIdAsInt());
+        patentInstruction.setCreateBy(loginUtils.getId());
         patentInstruction.setUrl(fileDTO.getPath());
         patentInstruction.setFileName(fileDTO.getFileName());
         patentInstruction.setSize(fileDTO.getFileSize());

PAS/src/main/java/cn/cslg/pas/service/PatentInventorService.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.model.vo.PatentInventorVO;
 import cn.cslg.pas.common.model.params.PatentInventorAddressParams;
 import cn.cslg.pas.common.utils.DateUtils;
 import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.mapper.PatentInventorMapper;
@@ -41,7 +42,7 @@ public class PatentInventorService extends ServiceImpl<PatentInventorMapper, Pat
     private final PatentInventorLinkService patentInventorLinkService;
     private final PatentService patentService;
     private final PatentInventorMergeService patentInventorMergeService;
-
+    private final LoginUtils loginUtils;
     public List<Integer> getInventorIdsByProjectId(Integer projectId) {
         List<ProjectPatentLink> projectPatentLinkList = projectPatentLinkService.getProjectPatentsByProjectId(projectId);
         List<PatentInventorLink> patentInventorLinkList = patentInventorLinkService.getPatentInventorLinkByPatentIds(projectPatentLinkList.stream().map(ProjectPatentLink::getPatentId).collect(Collectors.toList()));
@@ -81,7 +82,7 @@ public class PatentInventorService extends ServiceImpl<PatentInventorMapper, Pat
             return Response.error("名称已存在");
         }
         patentInventor.setUpdateTime(DateUtils.getDateTime());
-        patentInventor.setCreateBy(StpUtil.getLoginIdAsInt());
+        patentInventor.setCreateBy(loginUtils.getId());
         patentInventor.insert();
         if (patentInventor.getMerge()) {
             patentInventorMergeService.updatePatentInventorMergeLink(patentInventor.getId(), patentInventor.getProjectId(), patentInventor.getInventorIds());

PAS/src/main/java/cn/cslg/pas/service/PatentKeywordsHighlightService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.vo.PatentKeywordsHighlightVO;
 import cn.cslg.pas.common.utils.JsonUtils;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.mapper.PatentKeywordsHighlightMapper;
 import cn.cslg.pas.domain.PatentKeywordsHighlight;
 import cn.dev33.satoken.stp.StpUtil;
@@ -25,7 +26,7 @@ import java.util.List;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentKeywordsHighlightService extends ServiceImpl<PatentKeywordsHighlightMapper, PatentKeywordsHighlight> {
-
+    private final LoginUtils loginUtils;
     public PatentKeywordsHighlight initPatentKeywordsHighlight(Integer projectId, Integer userId, Boolean _default, String name) {
         List<PatentKeywordsHighlight.Config> configs = new ArrayList<>();
         List<String> colors = new ArrayList<String>() {{
@@ -56,10 +57,10 @@ public class PatentKeywordsHighlightService extends ServiceImpl<PatentKeywordsHi
     public List<PatentKeywordsHighlight> getPatentKeywordsHighlight(PatentKeywordsHighlightVO params) {
         LambdaQueryWrapper<PatentKeywordsHighlight> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentKeywordsHighlight::getProjectId, params.getProjectId());
-        queryWrapper.eq(PatentKeywordsHighlight::getUserId, StpUtil.getLoginIdAsInt());
+        queryWrapper.eq(PatentKeywordsHighlight::getUserId, loginUtils.getId());
         List<PatentKeywordsHighlight> dataList = this.list(queryWrapper);
         if (dataList.size() == 0) {
-            dataList.add(this.initPatentKeywordsHighlight(params.getProjectId(), StpUtil.getLoginIdAsInt(), true, "默认模板"));
+            dataList.add(this.initPatentKeywordsHighlight(params.getProjectId(), loginUtils.getId(), true, "默认模板"));
         }
         dataList.forEach(item -> {
             item.setConfigs(JsonUtils.jsonToList(item.getConfig(), PatentKeywordsHighlight.Config.class));
@@ -70,7 +71,7 @@ public class PatentKeywordsHighlightService extends ServiceImpl<PatentKeywordsHi
 
     public void updatePatentKeywordsHighlight(PatentKeywordsHighlight patentKeywordsHighlight) {
         patentKeywordsHighlight.setConfig(JsonUtils.objectToJson(patentKeywordsHighlight.getConfigs()));
-        patentKeywordsHighlight.setUserId(StpUtil.getLoginIdAsInt());
+        patentKeywordsHighlight.setUserId(loginUtils.getId());
         patentKeywordsHighlight.insertOrUpdate();
     }
 

PAS/src/main/java/cn/cslg/pas/service/ProjectExportService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.vo.ProjectExportVO;
 import cn.cslg.pas.common.utils.FileUtils;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.ProjectExport;
 import cn.cslg.pas.domain.User;
@@ -32,7 +33,7 @@ public class ProjectExportService extends ServiceImpl<ProjectExportMapper, Proje
 
     private final FileUtils fileUtils;
     private final UserService userService;
-
+    private final LoginUtils loginUtils;
     public IPage<ProjectExport> getPageList(ProjectExportVO params) {
         LambdaQueryWrapper<ProjectExport> queryWrapper = new LambdaQueryWrapper<>();
         if (params.getProjectId() != null) {
@@ -48,7 +49,7 @@ public class ProjectExportService extends ServiceImpl<ProjectExportMapper, Proje
     }
 
     public Integer add(ProjectExport projectExport) {
-        projectExport.setCreateBy(StpUtil.getLoginIdAsInt());
+        projectExport.setCreateBy(loginUtils.getId());
         projectExport.setCreateTime(new Date());
         projectExport.insert();
         return projectExport.getId();

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldPatentLinkService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.model.dto.CustomFieldLabelDTO;
 import cn.cslg.pas.common.model.dto.LabelDTO;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.common.model.vo.PatentIndexSettingVO;
@@ -37,6 +38,7 @@ public class ProjectFieldPatentLinkService extends ServiceImpl<ProjectFieldPaten
     private final ProjectFieldOptionService projectFieldOptionService;
     private final ProjectFieldTreeService projectFieldTreeService;
     private final ProjectFieldService projectFieldService;
+    private final LoginUtils loginUtils;
 
     public List<ProjectFieldPatentLink> getProjectPatentLinkByPatentAndProId(Integer patentId, Integer projectId) {
         LambdaQueryWrapper<ProjectFieldPatentLink> queryWrapper = new LambdaQueryWrapper<>();
@@ -195,7 +197,7 @@ public class ProjectFieldPatentLinkService extends ServiceImpl<ProjectFieldPaten
                 projectFieldPatentLink.setFieldId(field.getId());
                 projectFieldPatentLink.setProjectId(projectId);
                 projectFieldPatentLink.setType(field.getType());
-                projectFieldPatentLink.setCreateBy(StpUtil.getLoginIdAsInt());
+                projectFieldPatentLink.setCreateBy(loginUtils.getId());
                 projectFieldPatentLink.setOptionId(optionId);
                 projectFieldPatentLink.setPatentId(patentId);
                 dataList.add(projectFieldPatentLink);
@@ -290,7 +292,7 @@ public class ProjectFieldPatentLinkService extends ServiceImpl<ProjectFieldPaten
                     projectFieldPatentLink.setPatentId(params.getId());
                     projectFieldPatentLink.setType(params.getType());
                     projectFieldPatentLink.setFieldId(params.getFieldId());
-                    projectFieldPatentLink.setCreateBy(StpUtil.getLoginIdAsInt());
+                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
                     projectFieldPatentLink.setOptionId(projectFieldText.getId());
                     projectFieldPatentLinkList.add(projectFieldPatentLink);
                 }
@@ -305,7 +307,7 @@ public class ProjectFieldPatentLinkService extends ServiceImpl<ProjectFieldPaten
                     projectFieldPatentLink.setPatentId(params.getId());
                     projectFieldPatentLink.setType(params.getType());
                     projectFieldPatentLink.setFieldId(params.getFieldId());
-                    projectFieldPatentLink.setCreateBy(StpUtil.getLoginIdAsInt());
+                    projectFieldPatentLink.setCreateBy(loginUtils.getId());
                     projectFieldPatentLink.setOptionId(optionId);
                     projectFieldPatentLinkList.add(projectFieldPatentLink);
                 }

PAS/src/main/java/cn/cslg/pas/service/ProjectFieldService.java

@@ -4,6 +4,7 @@ import cn.cslg.pas.common.model.dto.PatentDTO;
 import cn.cslg.pas.common.model.vo.ProjectFieldVO;
 import cn.cslg.pas.common.model.vo.UploadSettingVO;
 import cn.cslg.pas.common.utils.*;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.*;
 import cn.cslg.pas.mapper.ProjectFieldMapper;
 import cn.dev33.satoken.stp.StpUtil;
@@ -40,6 +41,7 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
     private final ProjectFieldPatentLinkService projectFieldPatentLinkService;
     private final PatentService patentService;
     private final FileUtils fileUtils;
+    private final LoginUtils loginUtils;
 
     public List<PatentDTO.Field> getPatentFieldByPatentIdAndProjectId(Integer projectId, Integer patentId) {
         List<PatentDTO.Field> dataList = new ArrayList<>();
@@ -282,7 +284,7 @@ public class ProjectFieldService extends ServiceImpl<ProjectFieldMapper, Project
             return Response.error("字段名称已存在");
         }
         projectField.setPtype(projectField.getType() == 6 ? 2 : 1);
-        projectField.setCreateBy(StpUtil.getLoginIdAsInt());
+        projectField.setCreateBy(loginUtils.getId());
         projectField.setCreateTime(DateUtils.getDateTime());
         projectField.setProjectId(projectField.getProjectId());
         projectField.insert();

PAS/src/main/java/cn/cslg/pas/service/ProjectFileService.java

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.model.BaseEntity;
 import cn.cslg.pas.common.model.vo.ProjectFileVO;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.model.dto.UploadFileDTO;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.ProjectFile;
 import cn.cslg.pas.mapper.ProjectFileMapper;
 import cn.dev33.satoken.stp.StpUtil;
@@ -41,7 +42,7 @@ import java.util.List;
 public class ProjectFileService extends ServiceImpl<ProjectFileMapper, ProjectFile> {
 
     private final FileUtils fileUtils;
-
+    private final LoginUtils loginUtils;
     public IPage<ProjectFile> getPageList(ProjectFileVO params) {
         IPage<ProjectFile> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
 
@@ -135,7 +136,7 @@ public class ProjectFileService extends ServiceImpl<ProjectFileMapper, ProjectFi
         projectFile.setUrl(fileDTO.getPath());
         projectFile.setFileName(fileDTO.getFileName());
         projectFile.setCreateTime(DateUtils.getDateTime());
-        projectFile.setCreateBy(StpUtil.getLoginIdAsInt());
+        projectFile.setCreateBy(loginUtils.getId());
         projectFile.setSuffix(fileDTO.getExtName());
         projectFile.insert();
         return Response.success(projectFile.getId());

PAS/src/main/java/cn/cslg/pas/service/ProjectService.java

@@ -35,6 +35,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import org.apache.poi.ss.usermodel.PictureData;
 import org.springframework.beans.BeanUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -116,51 +117,51 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         m.put("token", params.getToken());
         m.put("loginId", 4);
         m.put("functionId", 8);
-        PersonnelVO user = cacheUtils.getLoginUserPersonnel(3);
+        PersonnelVO user = cacheUtils.getLoginUserPersonnel(loginUtils.getId());
         List<Integer> projectIds = new ArrayList<Integer>() {{
             add(-1);
         }};
         if (params.getMyself()) {
-            projectIds.addAll(projectUserService.getProIdByUserId(3));
+            projectIds.addAll(projectUserService.getProIdByUserId(loginUtils.getId()));
         }
         if (user.getUsername().equals(Constants.ADMIN_USERNAME)) {
             projectIds.addAll(projectService.list().stream().map(Project::getId).collect(Collectors.toList()));
         }
         params.setProIds(projectIds);
-        params.setCreateBy(3);
+        params.setCreateBy(loginUtils.getId());
         SecurityUtils.startDataScope(m);
         IPage<Project> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
         List<Project> dataList = pageList.getRecords();
 
-        try {
-            Map<String, Object> map = new HashMap<>();
-            map.put("departmentId", dataList.stream().map(Project::getDepartmentId).collect(Collectors.toList()));
-            String jsonObject = apiUtils.invokeApi(new JSONObject(map), "/permission/api/system/getDepartmentById", "post", "data");
-            JSONArray jsonArray1 = JSON.parseArray(jsonObject);
-            List<ProjectVO.Department> departmentList = jsonArray1.toJavaList(ProjectVO.Department.class);
-            for (Project project : dataList) {
-                for (ProjectVO.Department department : departmentList) {
-                    if (project.getDepartmentId().equals(department.getId())) {
-                        project.setDepartmentName(department.getDepartmentName());
-                    }
-                }
-            }
-
-            Map<String, Object> map1 = new HashMap<>();
-            map1.put("personnelId", dataList.stream().map(Project::getPersonnelId).collect(Collectors.toList()));
-            String jsonObject1 = apiUtils.invokeApi(new JSONObject(map1), "/permission/api/system/getPersonnelById", "post", "data");
-            JSONArray jsonArray = JSON.parseArray(jsonObject1);
-            List<ProjectVO.Personnel> personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
-            for (Project project : dataList) {
-                for (ProjectVO.Personnel personnel : personnelList) {
-                    if (project.getPersonnelId().equals(personnel.getId())) {
-                        project.setPersonnelName(personnel.getPersonnelName());
-                    }
-                }
-            }
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+//        try {
+//            Map<String, Object> map = new HashMap<>();
+//            map.put("departmentId", dataList.stream().map(Project::getDepartmentId).collect(Collectors.toList()));
+//            String jsonObject = apiUtils.invokeApi(new JSONObject(map), "/permission/api/system/getDepartmentById", "post", "data");
+//            JSONArray jsonArray1 = JSON.parseArray(jsonObject);
+//            List<ProjectVO.Department> departmentList = jsonArray1.toJavaList(ProjectVO.Department.class);
+//            for (Project project : dataList) {
+//                for (ProjectVO.Department department : departmentList) {
+//                    if (project.getDepartmentId().equals(department.getId())) {
+//                        project.setDepartmentName(department.getDepartmentName());
+//                    }
+//                }
+//            }
+//
+//            Map<String, Object> map1 = new HashMap<>();
+//            map1.put("personnelId", dataList.stream().map(Project::getPersonnelId).collect(Collectors.toList()));
+//            String jsonObject1 = apiUtils.invokeApi(new JSONObject(map1), "/permission/api/system/getPersonnelById", "post", "data");
+//            JSONArray jsonArray = JSON.parseArray(jsonObject1);
+//            List<ProjectVO.Personnel> personnelList = jsonArray.toJavaList(ProjectVO.Personnel.class);
+//            for (Project project : dataList) {
+//                for (ProjectVO.Personnel personnel : personnelList) {
+//                    if (project.getPersonnelId().equals(personnel.getId())) {
+//                        project.setPersonnelName(personnel.getPersonnelName());
+//                    }
+//                }
+//            }
+//        } catch (IOException e) {
+//            e.printStackTrace();
+//        }
 
         this.setDataList(dataList);
         pageList.setRecords(dataList);
@@ -208,12 +209,12 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     }
 
     public List<Project> getAllProjectByMySelf() {
-        User user = cacheUtils.getLoginUser(3);
+        PersonnelVO user = cacheUtils.getLoginUserPersonnel(loginUtils.getId());
         LambdaQueryWrapper<Project> queryWrapper = new LambdaQueryWrapper<>();
         List<Integer> proIds = new ArrayList<>();
         if (!user.getUsername().equals(Constants.ADMIN_USERNAME)) {
             proIds.addAll(projectUserService.getProIdByUserId(user.getId()));
-            proIds.addAll(this.getProjectByCreateId(3).stream().map(Project::getId).collect(Collectors.toList()));
+            proIds.addAll(this.getProjectByCreateId(loginUtils.getId()).stream().map(Project::getId).collect(Collectors.toList()));
             if (proIds.size() != 0) {
                 queryWrapper.in(Project::getId, proIds);
             } else {
@@ -354,7 +355,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         }
         project.setScenario(StringUtils.join(project.getScenarioList(), ","));
         project.setType(StringUtils.join(project.getTypeList(), ","));
-        project.setCreateBy(StpUtil.getLoginIdAsInt());
+        project.setCreateBy(loginUtils.getId());
         project.setCreateTime(DateUtils.getDateTime());
         project.insert();
         this.addProjectUser(project.getId());
@@ -379,7 +380,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
     @Transactional
     public String delete(Integer id) {
         this.removeById(id);
-        this.deleteProjectUser(id, StpUtil.getLoginIdAsInt());
+        this.deleteProjectUser(id, loginUtils.getId());
         projectPatentLinkService.deleteByProjectId(id);
         projectFolderService.deleteByProjectId(id);
         projectFieldService.deleteByProjectId(id);
@@ -395,7 +396,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
             client = new Client();
             client.setName(name);
             client.setStatus(1);
-            client.setCreateBy(StpUtil.getLoginIdAsInt());
+            client.setCreateBy(loginUtils.getId());
             client.setCreateTime(DateUtils.getDateTime());
             client.insert();
         }
@@ -404,7 +405,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
 
     private void addProjectUser(Integer projectId) {
         ProjectUser user = new ProjectUser();
-        user.setUserId(StpUtil.getLoginIdAsInt());
+        user.setUserId(loginUtils.getId());
         user.setProjectId(projectId);
         user.setCreateTime(DateUtils.getDateTime());
         user.insert();
@@ -427,7 +428,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
                 project.setName(row.get("专题库名称").toString());
                 project.setClientId(this.getNewClientId(row.get("委托方").toString()));
                 project.setRemark(row.get("备注").toString());
-                project.setCreateBy(StpUtil.getLoginIdAsInt());
+                project.setCreateBy(loginUtils.getId());
                 project.setCreateTime(DateUtils.getDateTime());
                 List<String> typeName = StringUtils.changeStringToString(row.get("调查类型").toString(), ";");
                 List<Integer> typeList = systemDictList.stream().filter(item -> item.getType().equals(Constants.INVESTIGATION_TYPE) && typeName.contains(item.getLabel())).map(SystemDict::getValue).map(Integer::parseInt).collect(Collectors.toList());
@@ -498,7 +499,7 @@ public class ProjectService extends ServiceImpl<ProjectMapper, Project> {
         taskParams.setPath(path);
         taskParams.setTaskType(1);
         taskParams.setRowList(mapList);
-        taskParams.setUserId(String.valueOf(StpUtil.getLoginIdAsInt()));
+        taskParams.setUserId(String.valueOf(loginUtils.getId()));
         taskParams.setOldName(file.getOriginalFilename());
         return taskParams;
     }

PAS/src/main/java/cn/cslg/pas/service/ReportTemplateService.java

@@ -2,6 +2,7 @@ package cn.cslg.pas.service;
 
 import cn.cslg.pas.common.core.base.DocFlag;
 import cn.cslg.pas.common.model.dto.report.KeyWordModel;
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.ReportTemplate;
 import cn.cslg.pas.domain.ReportTemplateLabel;
 import cn.cslg.pas.common.model.vo.TemplateConditionVO;
@@ -47,6 +48,7 @@ public class ReportTemplateService extends ServiceImpl<ReportTemplateMapper, Rep
 
     private final ReportTemplateLabelService reportTemplateLabelService;
     private final FileUtils fileUtils;
+    private final LoginUtils loginUtils;
 
     public IPage<ReportTemplate> getPageList(TemplateConditionVO params) {
         IPage<ReportTemplate> pageList = baseMapper.getPageList(new Page<>(params.getCurrent(), params.getSize()), params);
@@ -85,7 +87,7 @@ public class ReportTemplateService extends ServiceImpl<ReportTemplateMapper, Rep
             KeyWordModel keyWordModel = this.searchKeyWordFromDoc(file);
             if (keyWordModel != null) {
                 reportTemplate.setPath(keyWordModel.getFileUrl());
-                reportTemplate.setCreateBy(StpUtil.getLoginIdAsInt());
+                reportTemplate.setCreateBy(loginUtils.getId());
                 reportTemplate.setCreateTime(new Date());
                 reportTemplate.insert();
                 List<TemplateVO> labelList = keyWordModel.getList();
@@ -95,7 +97,7 @@ public class ReportTemplateService extends ServiceImpl<ReportTemplateMapper, Rep
                 List<ReportTemplateLabel> reportTemplateLabelList = new ArrayList<>();
                 for (TemplateVO vo : labelList) {
                     ReportTemplateLabel reportTemplateLabel = new ReportTemplateLabel();
-                    reportTemplateLabel.setCreateBy(StpUtil.getLoginIdAsInt());
+                    reportTemplateLabel.setCreateBy(loginUtils.getId());
                     reportTemplateLabel.setCreateTime(new Date());
                     reportTemplateLabel.setTemplateId(reportTemplate.getId());
                     reportTemplateLabel.setLabel(vo.getKey());
@@ -130,7 +132,7 @@ public class ReportTemplateService extends ServiceImpl<ReportTemplateMapper, Rep
                         List<ReportTemplateLabel> reportTemplateLabelList = new ArrayList<>();
                         for (TemplateVO vo : labelList) {
                             ReportTemplateLabel reportTemplateLabel = new ReportTemplateLabel();
-                            reportTemplateLabel.setCreateBy(StpUtil.getLoginIdAsInt());
+                            reportTemplateLabel.setCreateBy(loginUtils.getId());
                             reportTemplateLabel.setCreateTime(new Date());
                             reportTemplateLabel.setTemplateId(reportTemplate.getId());
                             reportTemplateLabel.setLabel(vo.getKey());

PAS/src/main/java/cn/cslg/pas/service/TaskService.java

@@ -1,5 +1,6 @@
 package cn.cslg.pas.service;
 
+import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.StringUtils;
 import cn.cslg.pas.domain.Task;
 import cn.cslg.pas.common.model.vo.TaskVO;
@@ -34,6 +35,7 @@ import java.util.List;
 public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
     private final FileUtils fileUtils;
+    private final LoginUtils loginUtils;
 
     public String getFileUrl(Integer id) {
         Task task = this.getById(id);
@@ -51,7 +53,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         task.setFileSize(fileDTO.getFileSize());
         task.setType(type);
         task.setFieldNum(fieldNum);
-        task.setCreateBy(StpUtil.getLoginIdAsInt());
+        task.setCreateBy(loginUtils.getId());
         task.setOldName(oldName);
         task.insert();
         return task.getId();
@@ -81,7 +83,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
 
     public List<Task> getQueueList(Integer type, Integer projectId) {
         LambdaQueryWrapper<Task> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(Task::getCreateBy, StpUtil.getLoginIdAsInt());
+        queryWrapper.eq(Task::getCreateBy, loginUtils.getId());
         queryWrapper.eq(Task::getType, type);
         queryWrapper.in(Task::getStatus, new ArrayList<Integer>() {{ add(0); add(1); }});
         queryWrapper.eq(Task::getProjectId, projectId);
@@ -96,7 +98,7 @@ public class TaskService extends ServiceImpl<TaskMapper, Task> {
         task.setType(2);
         task.setTotal(total);
         task.setFieldNum(fieldNum.intValue());
-        task.setCreateBy(StpUtil.getLoginIdAsInt());
+        task.setCreateBy(loginUtils.getId());
         task.setStartTime(DateUtils.getDateTime());
         task.insert();
         return task.getId();