对比记录

src/main/java/cn/cslg/pas/common/dto/RetrieveRecordQueryDTO.java

@@ -7,12 +7,12 @@ public class RetrieveRecordQueryDTO {
     /**
      * 每页条数
      */
-    private Integer size;
+    private Long size;
 
     /**
      * 当前页数
      */
-    private Integer current;
+    private Long current;
 
     /**
      * 数据总数

src/main/java/cn/cslg/pas/controller/RetrieveRecordController.java

@@ -0,0 +1,67 @@
+package cn.cslg.pas.controller;
+
+/**
+ * 检索历史的控制层
+ * @Author xiexiang
+ * @Date 2023/7/10
+ */
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.dto.RetrieveRecordDTO;
+import cn.cslg.pas.common.dto.RetrieveRecordDeDTO;
+import cn.cslg.pas.common.dto.RetrieveRecordQueryDTO;
+import cn.cslg.pas.common.model.cronModel.Records;
+import cn.cslg.pas.common.utils.Response;
+
+import cn.cslg.pas.service.common.RetrieveRecordService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@Tag(name = "无效理由和证据管理")
+@Slf4j
+@RequiredArgsConstructor
+@RestController
+@RequestMapping(Constants.API_XiaoSHI + "/retrieveRecord")
+public class RetrieveRecordController {
+    private final RetrieveRecordService retrieveRecordService;
+
+    @Operation(summary = "添加检索历史")
+    @PostMapping("/addRetrieveRecord")
+    public Response addRetrieveRecord(@RequestBody RetrieveRecordDTO retrieveRecordDTO){
+      Integer id=  retrieveRecordService.addRetrieveRecord(retrieveRecordDTO);
+        Records records =new Records();
+        records.setData(id);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "修改检索历史")
+    @PostMapping("/updateRetrieveRecord")
+    public String updateRetrieveRecord(@RequestBody RetrieveRecordDTO retrieveRecordDTO){
+        retrieveRecordService.updateRetrieveRecord(retrieveRecordDTO);
+        return Response.success();
+    }
+
+    @Operation(summary = "查询检索历史")
+    @PostMapping("/queryRetrieveRecord")
+    public Response queryRetrieveRecord(@RequestBody RetrieveRecordQueryDTO retrieveRecordQueryDTO){
+       Records records =retrieveRecordService.queryRetrieveRecord(retrieveRecordQueryDTO);
+        return Response.success(records);
+    }
+
+    @Operation(summary = "删除检索历史")
+    @PostMapping("/deleteRetrieveRecord")
+    public Response deleteRetrieveRecord(@RequestBody RetrieveRecordDeDTO retrieveRecordDeDTO){
+      List<Integer> ids=  retrieveRecordService.deleteRetrieveRecord(retrieveRecordDeDTO);
+      Records records =new Records();
+      records.setData(ids);
+        return Response.success(records);
+    }
+}

src/main/java/cn/cslg/pas/service/business/stabilityReport/CompareRecordService.java

@@ -216,11 +216,13 @@ public class CompareRecordService {
         }
 
         //根据特征id 查询对比记录
-        LambdaQueryWrapper<AssoGroupReason> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoGroupReason::getFeatureId, ids)
-                .isNull(AssoGroupReason::getGroupId);
-        List<AssoGroupReason> assoGroupReasons = assoGroupReasonService.list(queryWrapper);
-
+        List<AssoGroupReason> assoGroupReasons = new ArrayList<>();
+        if (ids.size() > 0) {
+            LambdaQueryWrapper<AssoGroupReason> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(AssoGroupReason::getFeatureId, ids)
+                    .isNull(AssoGroupReason::getGroupId);
+            assoGroupReasons = assoGroupReasonService.list(queryWrapper);
+        }
         //遍历特征获得内容
         for (Feature feature : features) {
 
@@ -276,8 +278,8 @@ public class CompareRecordService {
                 evidenceReason.setCommon(item.getDescription());
                 evidenceReason.setEvidenceId(item.getId());
                 evidenceReason.setFileGuid(item.getFileGuid());
-                AssoGroupReason assoGroupReason =assoGroupReasons1.stream().filter(i->i.getReasonId().equals(item.getId())).findFirst().orElse(null);
-                if(assoGroupReason!=null){
+                AssoGroupReason assoGroupReason = assoGroupReasons1.stream().filter(i -> i.getReasonId().equals(item.getId())).findFirst().orElse(null);
+                if (assoGroupReason != null) {
                     evidenceReason.setConclusion(assoGroupReason.getConclusion());
                 }
 
@@ -315,7 +317,7 @@ public class CompareRecordService {
         //根据ProjectId查询对比组合
         LambdaQueryWrapper<ProofGroup> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ProofGroup::getProjectId, projectId)
-                    .orderByAsc(ProofGroup::getClaimSort);
+                .orderByAsc(ProofGroup::getClaimSort);
         List<ProofGroup> proofGroups = proofGroupService.list(queryWrapper);
 
         //查询标的专利号
@@ -398,12 +400,12 @@ public class CompareRecordService {
                             evidenceReason.setEvidenceText(item.getEvidenceText());
                             evidenceReason.setCommon(item.getDescription());
                             evidenceReason.setEvidenceId(item.getId());
-                            LambdaQueryWrapper<AssoGroupReason> queryWrapper4 =new LambdaQueryWrapper<>();
-                            queryWrapper4.eq(AssoGroupReason::getReasonId,item.getId())
-                                         .eq(AssoGroupReason::getFeatureId,feature.getId())
-                                         .isNull(AssoGroupReason::getGroupId);
-                           AssoGroupReason assoGroupReason= assoGroupReasonService.getOne(queryWrapper4,false);
-                                evidenceReason.setConclusion(assoGroupReason.getConclusion());
+                            LambdaQueryWrapper<AssoGroupReason> queryWrapper4 = new LambdaQueryWrapper<>();
+                            queryWrapper4.eq(AssoGroupReason::getReasonId, item.getId())
+                                    .eq(AssoGroupReason::getFeatureId, feature.getId())
+                                    .isNull(AssoGroupReason::getGroupId);
+                            AssoGroupReason assoGroupReason = assoGroupReasonService.getOne(queryWrapper4, false);
+                            evidenceReason.setConclusion(assoGroupReason.getConclusion());
 
                             //根据无效理由id 查询无效理由和文献关联
                             AssoReasonLiterature assoReasonLiteratureTmp = assoReasonLiteratures.stream()
@@ -428,7 +430,7 @@ public class CompareRecordService {
                             evidenceReasons.add(evidenceReason);
                         }
                         //装载公识
-                        if(reasonIds.contains(0)){
+                        if (reasonIds.contains(0)) {
                             AllCompareGroupVO.EvidenceReason evidenceReason = new AllCompareGroupVO.EvidenceReason();
                             evidenceReason.setEvidenceId(0);
                             evidenceReasons.add(evidenceReason);
@@ -489,9 +491,12 @@ public class CompareRecordService {
         splitVO.setProjectId(projectId);
         List<Feature> features = featureService.getSplitedFeature(splitVO);
         List<Integer> ids = features.stream().map(Feature::getId).collect(Collectors.toList());
-        LambdaQueryWrapper<AssoGroupReason> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.in(AssoGroupReason::getFeatureId, ids);
-        List<AssoGroupReason> assoGroupReasons = assoGroupReasonService.list(queryWrapper);
+        List<AssoGroupReason> assoGroupReasons =new ArrayList<>();
+        if(ids.size()>0) {
+            LambdaQueryWrapper<AssoGroupReason> queryWrapper = new LambdaQueryWrapper<>();
+            queryWrapper.in(AssoGroupReason::getFeatureId, ids);
+            assoGroupReasons = assoGroupReasonService.list(queryWrapper);
+        }
         if (assoGroupReasons != null && assoGroupReasons.size() != 0) {
             List<Integer> reasonIds = assoGroupReasons.stream().map(AssoGroupReason::getReasonId).collect(Collectors.toList());
             //根据reasonIds查询对比文献id

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

@@ -5,6 +5,7 @@ import cn.cslg.pas.common.dto.RetrieveRecordDTO;
 import cn.cslg.pas.common.dto.RetrieveRecordDeDTO;
 import cn.cslg.pas.common.dto.RetrieveRecordQueryDTO;
 import cn.cslg.pas.common.model.cronModel.PersonnelVO;
+import cn.cslg.pas.common.model.cronModel.Records;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
 import cn.cslg.pas.common.utils.Response;
@@ -38,11 +39,13 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
 
     /**
      * 新增检索记录
+     *
      * @param retrieveRecordDTO
      */
-    public Response addRetrieveRecord(RetrieveRecordDTO retrieveRecordDTO){
+    public Integer addRetrieveRecord(RetrieveRecordDTO retrieveRecordDTO) {
+        Integer id = null;
         //判空
-        if(retrieveRecordDTO != null){
+        if (retrieveRecordDTO != null) {
             //新建实体类
             RetrieveRecord retrieveRecord = new RetrieveRecord();
             //复制
@@ -56,68 +59,71 @@ public class RetrieveRecordService extends ServiceImpl<RetrieveRecordMapper, Ret
             retrieveRecord.setTenantId(personnelVO.getTenantId());
             //数据入表
             retrieveRecord.insert();
-            return Response.success("新增成功");
-        } else {
-            return Response.error("传入参数不能为空");
+
         }
+        return retrieveRecordDTO.getId();
     }
 
     /**
      * 更新检索记录表
+     *
      * @param retrieveRecordDTO
      * @return
      */
-    public Response updateRetrieveRecord(RetrieveRecordDTO retrieveRecordDTO){
+    public Integer updateRetrieveRecord(RetrieveRecordDTO retrieveRecordDTO) {
+        Integer id = null;
         //判空
-        if(retrieveRecordDTO != null){
-            Integer id = retrieveRecordDTO.getId();
+        if (retrieveRecordDTO != null) {
+            id = retrieveRecordDTO.getId();
             //根据传入对象的id查询出实体类
             RetrieveRecord retrieveRecord = this.getById(id);
             retrieveRecord.setDbType(retrieveRecordDTO.getDbType());
             retrieveRecord.setConditions(retrieveRecordDTO.getConditions());
             retrieveRecord.setUpdateTime(new Date());
             retrieveRecord.updateById();
-            return Response.success("更新成功");
-        } else {
-            return Response.error("更新失败");
+            return retrieveRecord.getId();
         }
+        return id;
     }
 
     /**
      * 删除检索历史
+     *
      * @return
      */
-    public Response deleteRetrieveRecord(RetrieveRecordDeDTO retrieveRecordDeDTO){
-       List<Integer> ids = retrieveRecordDeDTO.getIds();
-       Boolean isAll =retrieveRecordDeDTO.getIsAll();
-       if(isAll!=null&& isAll){
-           this.remove(new LambdaQueryWrapper<RetrieveRecord>());
-       }
-       else {
-           //判空
-           if (ids != null && ids.size() > 0) {
-               this.removeByIds(ids);
-               return Response.success("删除成功");
-           } else {
-               return Response.error("删除错误");
-           }
-       }
-        return Response.success("删除成功");
+    public List<Integer> deleteRetrieveRecord(RetrieveRecordDeDTO retrieveRecordDeDTO) {
+        List<Integer> ids = retrieveRecordDeDTO.getIds();
+        Boolean isAll = retrieveRecordDeDTO.getIsAll();
+        if (isAll != null && isAll) {
+            this.remove(new LambdaQueryWrapper<RetrieveRecord>());
+        } else {
+            //判空
+            if (ids != null && ids.size() > 0) {
+                this.removeByIds(ids);
+            }
+        }
+        return ids;
     }
 
     /**
      * 查询检索历史
+     *
      * @return
      */
-    public IPage<RetrieveRecord> queryRetrieveRecord(RetrieveRecordQueryDTO retrieveRecordQueryDTO){
+    public Records queryRetrieveRecord(RetrieveRecordQueryDTO retrieveRecordQueryDTO) {
+        Records records = new Records();
         //获取当前登陆人信息
         PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
         String createId = personnelVO.getId();
         LambdaQueryWrapper<RetrieveRecord> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(RetrieveRecord::getCreateId, createId)
-        .orderByDesc(RetrieveRecord::getUpdateTime);
-        IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(retrieveRecordQueryDTO.getCurrent(),retrieveRecordQueryDTO.getSize()),queryWrapper);
-        List<RetrieveRecord> retrieveRecordList =retrieveRecords.getRecords();
-        return retrieveRecords;
+                .orderByDesc(RetrieveRecord::getUpdateTime);
+        IPage<RetrieveRecord> retrieveRecords = this.page(new Page<>(retrieveRecordQueryDTO.getCurrent(), retrieveRecordQueryDTO.getSize()), queryWrapper);
+        List<RetrieveRecord> retrieveRecordList = retrieveRecords.getRecords();
+        records.setData(retrieveRecordList);
+        records.setCurrent(retrieveRecordQueryDTO.getCurrent());
+        records.setSize(retrieveRecordQueryDTO.getSize());
+        records.setTotal(retrieveRecords.getTotal());
+        return records;
     }
 }