7/29 未登录报错全局修改

src/main/java/cn/cslg/pas/service/business/AsInvalidReasonHistoryService.java

@@ -97,11 +97,9 @@ public class AsInvalidReasonHistoryService extends ServiceImpl<AsInvalidReasonHi
         } else {
             BeanUtils.copyProperties(asInvalidReasonHistoryDTO, asInvalidReasonHistory);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
+
             asInvalidReasonHistory.setCreateId(personnelVO.getId());
             asInvalidReasonHistory.setTenantId(personnelVO.getTenantId());
             asInvalidReasonHistory.insert();
@@ -125,11 +123,8 @@ public class AsInvalidReasonHistoryService extends ServiceImpl<AsInvalidReasonHi
             throw new XiaoShiException("入参为空");
         }
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         LambdaQueryWrapper<AsInvalidReasonHistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AsInvalidReasonHistory::getPatentNo, patentNo)
                 .eq(AsInvalidReasonHistory::getTenantId, personnelVO.getTenantId())

src/main/java/cn/cslg/pas/service/business/AssoProjectEventService.java

@@ -27,11 +27,7 @@ public class AssoProjectEventService extends ServiceImpl<AssoProjectEventMapper,
 
     public void addAssoEventProject(List<ProjectEventDTO> events, Integer projectId, Integer type) {
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
         List<AssoProjectEvent> assoProjectEvents = new ArrayList<>();
         //遍历传入的事件集合
         for (ProjectEventDTO projectEventDTO : events) {

src/main/java/cn/cslg/pas/service/business/AssoTaskFileService.java

@@ -57,11 +57,8 @@ public class AssoTaskFileService extends ServiceImpl<AssoTaskFileMapper, AssoTas
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         List<String> fileGuids = assoTaskFileDTO.getFileGuids();
         List<AssoTaskFile> assoTaskFiles = new ArrayList<>();
         for (String item : fileGuids) {

src/main/java/cn/cslg/pas/service/business/AvoidDesignService.java

@@ -56,11 +56,8 @@ public class AvoidDesignService extends ServiceImpl<AvoidDesignMapper, AvoidDesi
     public List<Integer> addAvoidDesign(AvoidDesignInsertDTO avoidDesignInsertDTO) {
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         Integer projectId = avoidDesignInsertDTO.getProjectId();
         if (projectId == null) {
             throw new XiaoShiException("projectId不能为空");

src/main/java/cn/cslg/pas/service/business/AvoidDesignWholeService.java

@@ -65,11 +65,9 @@ public class AvoidDesignWholeService extends ServiceImpl<AvoidDesignWholeMapper,
         BeanUtils.copyProperties(avoidDesignWholeDTO, avoidDesignWhole);
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         avoidDesignWhole.setCreateId(personnelVO.getId());
         avoidDesignWhole.insert();
         return avoidDesignWhole.getId();

src/main/java/cn/cslg/pas/service/business/CustomAnalyseService.java

@@ -63,11 +63,7 @@ public class CustomAnalyseService extends ServiceImpl<CustomAnalysisItemMapper,
     public List<SelectCustomAnalyseListDTO> queryAnalyseGroup(SelectCustomAnalyseVO vo) {
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
 
         SelectAnalyseVO analyseVO = new SelectAnalyseVO();
         analyseVO.setProjectId(vo.getProjectId());
@@ -123,11 +119,8 @@ public class CustomAnalyseService extends ServiceImpl<CustomAnalysisItemMapper,
         String uid = IdUtil.simpleUUID();
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
+
         CustomAnalysisItem item = new CustomAnalysisItem();
         BeanUtils.copyProperties(vo, item);
         item.setUid(uid);
@@ -164,11 +157,8 @@ public class CustomAnalyseService extends ServiceImpl<CustomAnalysisItemMapper,
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
+
 
         CustomAnalysisItem item = customAnalysisItemMapper.selectById(vo.getId());
         BeanUtils.copyProperties(vo, item);

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

@@ -73,12 +73,7 @@ public class CustomAnalysisItemSchemaService extends ServiceImpl<CustomAnalysisI
     public void add(SchemaDimensionDTO dto, String uid) {
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
-
         List<CustomAnalysisItemSchema> customAnalysisItemSchema = new ArrayList<>();
         CustomAnalysisItemSchema d1 = new CustomAnalysisItemSchema();
         CustomAnalysisItemSchema d2 = new CustomAnalysisItemSchema();

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

@@ -61,11 +61,9 @@ public class CustomAnalysisItemSettingService extends ServiceImpl<CustomAnalysis
 
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         CustomAnalysisItemSetting customAnalysisItemSetting = new CustomAnalysisItemSetting();
         BeanUtils.copyProperties(setting, customAnalysisItemSetting);
         customAnalysisItemSetting.setShow1(setting.getShow());

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

@@ -130,11 +130,8 @@ public class CustomAnalysisItemSourceService extends ServiceImpl<CustomAnalysisI
                 .eq(CustomAnalysisItemSource::getDimension, sourceDataVO.getDimension()));
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         List<CustomAnalysisItemSource> list = new ArrayList<>();
         PersonnelVO finalPersonnelVO = personnelVO;
         sourceDataVO.getSource().forEach(source -> {

src/main/java/cn/cslg/pas/service/business/CustomFieldService.java

@@ -163,11 +163,8 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         CustomField customField = new CustomField();
         BeanUtils.copyProperties(customFieldDTO, customField);
         customField.setCreateId(personnelVO.getId());

src/main/java/cn/cslg/pas/service/business/CustomOptionService.java

@@ -88,11 +88,9 @@ public class CustomOptionService extends ServiceImpl<CustomOptionMapper, CustomO
             }
             //获取登录人信息
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new UnLoginException("未登录");
-            }
+
             CustomOption customOption = new CustomOption();
             BeanUtils.copyProperties(customOptionDTO, customOption);
             customOption.setCreateId(personnelVO.getId());

src/main/java/cn/cslg/pas/service/business/EventService.java

@@ -101,11 +101,7 @@ public class EventService extends ServiceImpl<EventMapper, Event> implements Bus
     public Integer addMessage(Object object, List<MultipartFile> files) {
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
         this.checkParameter(object);
         EventDTO eventDTO = (EventDTO) object;
 

src/main/java/cn/cslg/pas/service/business/FTOCompareRecordService.java

@@ -311,11 +311,9 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         }
         // 获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         // 根据taskId查询报告id
         Integer projectId = tortCompareRecordService.getProjectIdByTaskId(taskId);
         // 重新排序
@@ -375,11 +373,8 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         Integer featureId = tortDTO.getFeatureId();
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         if (tortDTO.getCompareResult() != null || StringUtils.isNotBlank(tortDTO.getCompareDescription()) || StringUtils.isNotBlank(tortDTO.getTargetDescription())) {
             //插入对比结果
             FTOCompareRecord ftoCompareRecord = new FTOCompareRecord();
@@ -421,11 +416,8 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         List<TortDTO> tortDTOS = tortCompareRecordDTO.getTortDTOS();
         List<Integer> ids = new ArrayList<>();
         //传入对比结果不为空
@@ -705,11 +697,9 @@ public class FTOCompareRecordService extends ServiceImpl<FTOCompareRecordMapper,
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         try {
             Integer lastTaskId = this.getAssoTaskId(patentNo, taskId);
             //首先是根据projectId，以及ifOriginal为false、ifFinal为true这几个条件删除表中的最终数据（最开始的数据）

src/main/java/cn/cslg/pas/service/business/HightlightTemplateService.java

@@ -55,11 +55,9 @@ public class HightlightTemplateService extends ServiceImpl<HightlightTemplateMap
             throw new XiaoShiException("入参为空");
         }
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         Integer id = hightlightTemplateDTO.getId();
         HightlightTemplate hightlightTemplate = new HightlightTemplate();
         if (id != null) {
@@ -97,11 +95,8 @@ public class HightlightTemplateService extends ServiceImpl<HightlightTemplateMap
             throw new XiaoShiException("入参为空");
         }
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
 
         List<HightlightTemplateVO> hightlightTemplateVOS = new ArrayList<>();
         LambdaQueryWrapper<HightlightTemplate> queryWrapper = new LambdaQueryWrapper<>();

src/main/java/cn/cslg/pas/service/business/ImportTaskService.java

@@ -129,11 +129,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         ImportTaskDTO importTaskDTO = (ImportTaskDTO) object;
 
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
 
         if (importTaskDTO.getType() == null) {
             importTaskDTO.setType(4);

src/main/java/cn/cslg/pas/service/business/InvalidRecordService.java

@@ -113,11 +113,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         } else {
             BeanUtils.copyProperties(invalidRecordDTO, invalidRecord);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
+
             invalidRecord.setCreateId(personnelVO.getId());
             invalidRecord.setTenantId(personnelVO.getTenantId());
             invalidRecord.insert();
@@ -143,11 +141,9 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
         }
         //查询当前登陆人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         Integer tenantId = personnelVO.getTenantId();
 
         LambdaQueryWrapper<InvalidRecord> queryWrapper = new LambdaQueryWrapper<>();
@@ -251,11 +247,8 @@ public class InvalidRecordService extends ServiceImpl<InvalidRecordMapper, Inval
 
     public List<InvalidRecordVO> findInvalidRecord(String patentNo, List<InvalidRecordVO> invalidRecordVOS) {
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         Integer tenantId = personnelVO.getTenantId();
         List<InvalidRecordVO> finalVOS = new ArrayList<>();
         finalVOS.addAll(invalidRecordVOS);

src/main/java/cn/cslg/pas/service/business/LitigationHistoryService.java

@@ -86,11 +86,7 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
         } else {
             BeanUtils.copyProperties(litigationHistoryDTO, litigationHistory);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
             litigationHistory.setCreateId(personnelVO.getId());
             litigationHistory.setTenantId(personnelVO.getTenantId());
             litigationHistory.insert();
@@ -118,11 +114,9 @@ public class LitigationHistoryService extends ServiceImpl<LitigationHistoryMappe
         Integer size = otherPatentInfoDTO.getSize();
         Page<LitigationHistory> page = new Page<>(current, size);
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         LambdaQueryWrapper<LitigationHistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(LitigationHistory::getPatentNo, patentNo)
                 .eq(LitigationHistory::getTenantId, personnelVO.getTenantId())

src/main/java/cn/cslg/pas/service/business/MergePersonService.java

@@ -97,11 +97,8 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         Integer projectId = vo.getProjectId();
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
+
         //判断是否名称重复
         LambdaQueryWrapper<MergePerson> wrapper = new LambdaQueryWrapper<MergePerson>()
                 .eq(MergePerson::getProjectId, vo.getProjectId())
@@ -479,11 +476,9 @@ public class MergePersonService extends ServiceImpl<MergePersonMapper, MergePers
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
         Integer type = vo.getType();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
+
         //判断是否名称重复
         LambdaQueryWrapper<MergePerson> wrapper = new LambdaQueryWrapper<MergePerson>()
                 .eq(MergePerson::getProjectId, vo.getProjectId())

src/main/java/cn/cslg/pas/service/business/OtherReferencesService.java

@@ -84,11 +84,9 @@ public class OtherReferencesService extends ServiceImpl<OtherReferencesMapper, O
         } else {
             BeanUtils.copyProperties(otherReferencesDTO, otherReferences);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
+
             otherReferences.setCreateId(personnelVO.getId());
             otherReferences.setTenantId(personnelVO.getTenantId());
             otherReferences.insert();
@@ -140,11 +138,7 @@ public class OtherReferencesService extends ServiceImpl<OtherReferencesMapper, O
         Integer size = otherPatentInfoDTO.getSize();
         Page<OtherReferences> page = new Page<>(current, size);
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
         LambdaQueryWrapper<OtherReferences> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(OtherReferences::getPatentNo, patentNo)
                 .eq(OtherReferences::getTenantId, personnelVO.getTenantId());

src/main/java/cn/cslg/pas/service/business/PatentDigProjectFilesService.java

@@ -140,11 +140,7 @@ public class PatentDigProjectFilesService extends ServiceImpl<PatentDigProjectFi
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
         List<Integer> ids = new ArrayList<>();
 
         if (patentDigProjectFilesDTO.getFileGuids() != null && !patentDigProjectFilesDTO.getFileGuids().isEmpty()) {

src/main/java/cn/cslg/pas/service/business/PatentDigProjectService.java

@@ -186,11 +186,8 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
     public Object addMessage(Object object) {
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         PatentDigProjectDTO patentDigProjectDTO = (PatentDigProjectDTO) object;
         PatentDigProject patentDigProject = new PatentDigProject();
@@ -339,11 +336,7 @@ public class PatentDigProjectService extends ServiceImpl<PatentDigProjectMapper,
     public Object updateMessage(Object object) {
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
         String userId = personnelVO.getId();
         PatentDigProjectUpdateDTO projectUpdateDTO = (PatentDigProjectUpdateDTO) object;
         PatentDigProject patentDigProject = new PatentDigProject();

src/main/java/cn/cslg/pas/service/business/PatentProjectService.java

@@ -255,11 +255,8 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
         if(patentProjectDTO.getPersonId()==null) {
-            try {
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new UnLoginException("未登录");
-            }
+
         }
         else {
             personnelVO.setId(patentProjectDTO.getPersonId());
@@ -439,11 +436,9 @@ public class PatentProjectService extends ServiceImpl<PatentProjectMapper, Paten
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //TODO 更新基本信息
         //根据传入对象id查询project对象
         Project project = projectService.getById(updatePatentProjectDTO.getId());

src/main/java/cn/cslg/pas/service/business/PermissionRecordService.java

@@ -63,11 +63,9 @@ public class PermissionRecordService extends ServiceImpl<PermissionRecordMapper,
         } else {
             BeanUtils.copyProperties(permissionRecordDTO, permissionRecord);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
+
             permissionRecord.setTenantId(personnelVO.getTenantId());
             permissionRecord.setCreateId(personnelVO.getId());
             permissionRecord.insert();

src/main/java/cn/cslg/pas/service/business/ProductCategoryService.java

@@ -103,11 +103,8 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
     public Object addMessage(Object object, List<MultipartFile> files) {
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //object to productCategoryDTO
         ProductCategoryDTO productCategoryDTO = (ProductCategoryDTO)object;
         //检测名称是否不规范
@@ -245,11 +242,9 @@ public class ProductCategoryService extends ServiceImpl<ProductCategoryMapper, P
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         ProductCategory productCategory = this.getById(updateProductCategoryDTO.getId());
         //检测名称是否不规范
         updateProductCategoryDTO.setName(updateProductCategoryDTO.getName().trim());

src/main/java/cn/cslg/pas/service/business/ProductMarketDataService.java

@@ -124,11 +124,10 @@ public class ProductMarketDataService extends ServiceImpl<ProductMarketDataMappe
         BeanUtils.copyProperties(productMarketDataDTO, productMarketData);
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         productMarketData.setCreateId(personnelVO.getId());
         //数据入表
         productMarketData.insert();

src/main/java/cn/cslg/pas/service/business/ProductMessageService.java

@@ -65,11 +65,9 @@ public class ProductMessageService extends ServiceImpl<ProductMessageMapper, Pro
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //判断产品id是否传入
         if (productMessageDTO.getId() != null) {
             //传入了id，执行更新操作

src/main/java/cn/cslg/pas/service/business/ProductService.java

@@ -149,11 +149,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //产品入库
         Product product = new Product();
         BeanUtils.copyProperties(productDTO, product);
@@ -274,11 +272,9 @@ public class ProductService extends ServiceImpl<ProductMapper, Product> implemen
         }
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         Product product = this.getById(updateProductDTO.getId());
         //检测名称是否不规范
         updateProductDTO.setName(updateProductDTO.getName().trim());

src/main/java/cn/cslg/pas/service/business/ProjectTaskService.java

@@ -206,11 +206,9 @@ import java.util.stream.Collectors;
         projectTask.setStatus(2);
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //设置任务的发起人
         projectTask.setCreateId(personnelVO.getId());
         projectTask.insert();
@@ -853,11 +851,9 @@ import java.util.stream.Collectors;
         tortTaskDTO.setType(4);
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         ProjectTask projectTask = new ProjectTask();
         BeanUtils.copyProperties(tortTaskDTO, projectTask);
         projectTask.setCreateId(personnelVO.getId());
@@ -1112,11 +1108,9 @@ import java.util.stream.Collectors;
         tortTaskDTO.setType(4);
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         ProjectTask projectTask = new ProjectTask();
         BeanUtils.copyProperties(tortTaskDTO, projectTask);
         projectTask.setCreateId(personnelVO.getId());
@@ -1312,11 +1306,9 @@ import java.util.stream.Collectors;
     public void checkProjectPerson(Integer type, String handler, Integer projectId, Integer taskId) {
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         LambdaQueryWrapper<AssoProjectPerson> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(AssoProjectPerson::getProjectId, projectId);
         List<AssoProjectPerson> assoProjectPeople = assoProjectPersonService.list(queryWrapper);

src/main/java/cn/cslg/pas/service/business/ReferencesService.java

@@ -68,11 +68,9 @@ public class ReferencesService extends ServiceImpl<ReferencesMapper, References>
         if (referencesDTO != null) {
             //获取登录人信息
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new UnLoginException("未登录");
-            }
+
             References references = new References();
             if (StringUtils.isEmpty(referencesDTO.getFileGuid())) {
                 throw new XiaoShiException("附件不得为空");

src/main/java/cn/cslg/pas/service/business/ReportProjectService.java

@@ -267,11 +267,9 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
 
         /**
@@ -459,11 +457,9 @@ public class ReportProjectService extends ServiceImpl<ReportProjectMapper, Repor
 
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         /**
          * 装载project

src/main/java/cn/cslg/pas/service/business/ReviewHistoryService.java

@@ -88,11 +88,9 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
         } else {
             BeanUtils.copyProperties(reviewHistoryDTO, reviewHistory);
             PersonnelVO personnelVO = new PersonnelVO();
-            try {
+
                 personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-            } catch (Exception e) {
-                throw new XiaoShiException("未查询到当前登陆人");
-            }
+
             reviewHistory.setCreateId(personnelVO.getId());
             reviewHistory.setTenantId(personnelVO.getTenantId());
             reviewHistory.insert();
@@ -120,11 +118,9 @@ public class ReviewHistoryService extends ServiceImpl<ReviewHistoryMapper, Revie
         Integer size = otherPatentInfoDTO.getSize();
         Page<ReviewHistory> page = new Page<>(current, size);
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未查询到当前登陆人");
-        }
+
         LambdaQueryWrapper<ReviewHistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReviewHistory::getPatentNo, patentNo)
                 .eq(ReviewHistory::getTenantId, personnelVO.getTenantId())

src/main/java/cn/cslg/pas/service/business/TortCompareRecordService.java

@@ -57,74 +57,7 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
 
     @Autowired
     private PatentSplitMessageService patentSplitMessageService;
-//    /**
-//     * 新增侵权对比结果
-//     *
-//     * @param tortCompareRecordDTO
-//     * @return
-//     */
-//    public List<Integer> addTortCompareRecord(TortCompareRecordDTO tortCompareRecordDTO) {
-//        //获取登录人信息
-//        PersonnelVO personnelVO = new PersonnelVO();
-//        try {
-//            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-//        } catch (Exception e) {
-//            throw new UnLoginException("未登录");
-//        }
-//        Integer projectId = tortCompareRecordDTO.getProjectId();
-//        if (projectId == null) {
-//            throw new XiaoShiException("projectId不能为空");
-//        }
-//        //根据projctId查询出专利号
-//        String patentNo = projectTaskService.getPatentNoByProjectId(projectId);
-//        List<TortDTO> tortDTOS = tortCompareRecordDTO.getTortDTOS();
-//        //根据专利号和projectId,删除特征
-//        LambdaQueryWrapper<Feature> deleteWrapper = new LambdaQueryWrapper<>();
-//        deleteWrapper.eq(Feature::getPatentNo, patentNo)
-//                .eq(Feature::getProjectId, projectId);
-//        featureService.remove(deleteWrapper);
-//        //根据报告id删除侵权对比结果数据
-//        LambdaQueryWrapper<FTOCompareRecord> deleteWrapper2 = new LambdaQueryWrapper<>();
-//        deleteWrapper2.eq(FTOCompareRecord::getProjectId, projectId);
-//        this.remove(deleteWrapper2);
-//        //新增侵权对比结果集合
-//        List<FTOCompareRecord> ftoCompareRecords = new ArrayList<>();
-//        //遍历传入集合
-//        if (!tortDTOS.isEmpty()) {
-//            for (TortDTO tortDTO : tortDTOS) {
-//                Feature feature = new Feature();
-//                feature.setRightSort(tortDTO.getRightSort());
-//                feature.setPatentNo(patentNo);
-//                feature.setProjectId(projectId);
-//                feature.setContent(tortDTO.getContent());
-//                feature.setExplainText(tortDTO.getExplainText());
-//                feature.setCreateId(personnelVO.getId());
-//                feature.setRightType(tortDTO.getRightType());
-//                feature.insert();
-//                //获取特征id
-//                Integer featureId = feature.getId();
-//                if (tortDTO.getCompareResult() != null || StringUtils.isNotBlank(tortDTO.getCompareDescription()) || StringUtils.isNotBlank(tortDTO.getTargetDescription())) {
-//                    //插入侵权分析对比结果
-//                    FTOCompareRecord ftoCompareRecord = new FTOCompareRecord();
-//                    ftoCompareRecord.setProjectId(projectId);
-//                    ftoCompareRecord.setFeatureId(featureId);
-//                    ftoCompareRecord.setCompareResult(tortDTO.getCompareResult());
-//                    ftoCompareRecord.setCompareDescription(tortDTO.getCompareDescription());
-//                    ftoCompareRecord.setTargetDescription(tortDTO.getTargetDescription());
-//                    ftoCompareRecord.setCreateId(personnelVO.getId());
-//                    ftoCompareRecords.add(ftoCompareRecord);
-//                }
-//            }
-//            List<Integer> ids = new ArrayList<>();
-//            if (!ftoCompareRecords.isEmpty()) {
-//                this.saveBatch(ftoCompareRecords);
-//                ids = ftoCompareRecords.stream().map(FTOCompareRecord::getId).collect(Collectors.toList());
-//            }
-//            return ids;
-//        } else {
-//            throw new XiaoShiException("未传入特征集合");
-//        }
-//    }
+
 
     /**
      * 新增侵权对比结果
@@ -209,11 +142,9 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         }
         // 获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         // 重新排序
         Integer order = 1;
         List<Integer> ftoIds = new ArrayList<>();
@@ -267,11 +198,9 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         Integer featureId = tortDTO.getFeatureId();
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         if (tortDTO.getCompareResult() != null || StringUtils.isNotBlank(tortDTO.getCompareDescription()) || StringUtils.isNotBlank(tortDTO.getTargetDescription())) {
             //插入对比结果
             FTOCompareRecord ftoCompareRecord = new FTOCompareRecord();
@@ -423,11 +352,10 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
+
         List<TortDTO> tortDTOS = tortCompareRecordDTO.getTortDTOS();
         List<Integer> ids = new ArrayList<>();
         //传入对比结果不为空
@@ -695,11 +623,9 @@ public class TortCompareRecordService extends ServiceImpl<FTOCompareRecordMapper
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         try {
             //首先是根据projectId，以及ifOriginal为false、ifFinal为true这几个条件删除表中的最终数据（最开始的数据）
             LambdaQueryWrapper<FTOCompareRecord> removeWrapper = new LambdaQueryWrapper<>();

src/main/java/cn/cslg/pas/service/business/TreeNodeService.java

@@ -236,11 +236,9 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         //赋值
         TreeNode treeNode = new TreeNode();
         BeanUtils.copyProperties(treeNodeDTO, treeNode);
@@ -347,11 +345,9 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         }
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         TreeNode treeNode = this.getById(updateTreeNodeDTO.getId());
         //检查名称是否规范
         updateTreeNodeDTO.setName(updateTreeNodeDTO.getName().trim());

src/main/java/cn/cslg/pas/service/business/es/EsValueCurveService.java

@@ -96,11 +96,9 @@ public class EsValueCurveService {
         Integer timeType = vo.getTimeType();
         //获取登陆人信息 用于设置创建人
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new XiaoShiException("未登录");
-        }
+
         Integer tenantId = personnelVO.getTenantId();
         Map<String, List<Integer>> map = new HashMap<>();
         if (!CollectionUtils.isEmpty(isAdd) && startNum <= 1 && endNum < 1) {

src/main/java/cn/cslg/pas/service/business/invalidReport/PatentClaimHistoryService.java

@@ -57,11 +57,9 @@ public class PatentClaimHistoryService extends ServiceImpl<PatentClaimHistoryMap
             throw new XiaoShiException("claimId为空");
         }
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         LambdaQueryWrapper<PatentClaimHistory> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(PatentClaimHistory::getIfFirst, alterPatentClaimDTO.getIfFirst())
                 .eq(PatentClaimHistory::getClaimId, claimId)

src/main/java/cn/cslg/pas/service/common/PersonFieldService.java

@@ -53,11 +53,9 @@ public class PersonFieldService {
 
         //根据登录人id和type查询
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = "";
 
@@ -121,11 +119,9 @@ public class PersonFieldService {
 
     public List<PersonSelfFieldVO> setCustomField(AddSelfFieldDTO addSelfFieldDTO) {
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = SecureUtil.md5(addSelfFieldDTO.getTableName() + RedisConf.SYMBOL_COLON + userId);
 
@@ -347,11 +343,9 @@ public class PersonFieldService {
 
     public List<PersonSelfFieldVO> setTableColumns(AddSelfFieldDTO addSelfFieldDTO) {
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String tableName = addSelfFieldDTO.getTableName();
         Integer projectId = addSelfFieldDTO.getProjectId();
@@ -458,11 +452,9 @@ public class PersonFieldService {
         Integer projectId = getAllPatentCountDTO.getProjectId();
         //根据登录人id和type查询
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = "";
 
@@ -504,11 +496,9 @@ public class PersonFieldService {
         Integer projectId = addPatentCountDTO.getProjectId();
         //根据登录人id和type查询
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = "";
 
@@ -540,11 +530,9 @@ public class PersonFieldService {
         }
         //根据登录人id和type查询
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
+
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-            throw new UnLoginException("未登录");
-        }
+
         String userId = personnelVO.getId();
         String key = "";
 
@@ -611,11 +599,7 @@ public class PersonFieldService {
 
     public List<PersonSelfFieldVO> setEvidenceReasonTableColumns(AddSelfFieldDTO addSelfFieldDTO) {
         PersonnelVO personnelVO = new PersonnelVO();
-        try {
             personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
-        } catch (Exception e) {
-        throw new UnLoginException("未登录");
-    }
         String userId = personnelVO.getId();
         String tableName = addSelfFieldDTO.getTableName();
         if (tableName == null||tableName.equals("")) {