Merge remote-tracking branch 'origin/master'

src/main/java/cn/cslg/pas/factorys/EsCountAnalyseBuilderFactory/ChildCountAnalysisBuilder.java

@@ -1,9 +1,11 @@
 package cn.cslg.pas.factorys.EsCountAnalyseBuilderFactory;
 
+import co.elastic.clients.elasticsearch._types.SortOrder;
 import co.elastic.clients.elasticsearch._types.aggregations.*;
 import co.elastic.clients.elasticsearch._types.query_dsl.Query;
 import co.elastic.clients.elasticsearch._types.query_dsl.QueryBuilders;
 import co.elastic.clients.json.JsonData;
+import co.elastic.clients.util.NamedValue;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
@@ -56,7 +58,7 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                             .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
-                Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.stats_value.raw").size(topN));
+                Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.stats_value.raw").order(NamedValue.of("_key",SortOrder.Desc)).size(topN));
                 termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
                         .aggregations(new HashMap() {{
                             put("filterAgg", terms);
@@ -77,7 +79,7 @@ public class ChildCountAnalysisBuilder implements IEsCountAnalysisBuilder {
                             .gte(JsonData.of(valueOne)).lte(JsonData.of(valueTwo)));
                     queryList.add(query);
                 }
-                Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.field_value.raw").size(topN));
+                Aggregation terms = AggregationBuilders.terms(i -> i.field("custom_field.field_value.raw").order(NamedValue.of("_key",SortOrder.Desc)).size(topN));
                 termAgg = new Aggregation.Builder().filter(n -> n.bool(k -> k.must(queryList)))
                         .aggregations(new HashMap() {{
                             put("filterAgg", terms);

src/main/java/cn/cslg/pas/mapper/FinalProofGroupMapper.java

@@ -1,6 +1,7 @@
 package cn.cslg.pas.mapper;
 
 
+import cn.cslg.pas.common.dto.FinalProofGroupDTO;
 import cn.cslg.pas.domain.FinalProofGroup;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import org.apache.ibatis.annotations.Param;
@@ -16,6 +17,8 @@ import java.util.List;
 public interface FinalProofGroupMapper extends BaseMapper<FinalProofGroup> {
 
     List<FinalProofGroup> selectProofList(@Param("invalidStatueIds") List<Integer> invalidStatueIds);
+
+    Integer updateGroup(@Param("vo") FinalProofGroupDTO groupDTO);
 }
 
 

src/main/java/cn/cslg/pas/service/FinalInvalidStatueService.java

@@ -10,6 +10,7 @@ import cn.cslg.pas.common.model.finalInvalid.FinalProfGroupQueryDTO;
 import cn.cslg.pas.common.model.finalInvalid.FinalProfGroupVO;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.LoginUtils;
+import cn.cslg.pas.common.utils.RedisUtil;
 import cn.cslg.pas.common.vo.GetInvalidReasonClaimsVO;
 import cn.cslg.pas.common.vo.invalidVO.PatentClaimHistoryVO;
 import cn.cslg.pas.domain.BaseEntity;
@@ -22,7 +23,9 @@ import cn.cslg.pas.mapper.FinalProofGroupMapper;
 import cn.cslg.pas.service.business.InvalidStatutesService;
 import cn.cslg.pas.service.business.ProofGroupService;
 import cn.cslg.pas.service.business.invalidReport.PatentClaimHistoryService;
+import com.alibaba.fastjson2.JSON;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
@@ -31,6 +34,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Isolation;
 import org.springframework.transaction.annotation.Propagation;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.util.CollectionUtils;
@@ -57,6 +61,8 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
     private CacheUtils cacheUtils;
     @Autowired
     private LoginUtils loginUtils;
+    @Autowired
+    private RedisUtil redisUtil;
 
     public void ImportByProjectId(Integer projectId, Integer statueType) {
 
@@ -237,6 +243,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 添加无效理由
+     *
      * @param vo
      * @return
      */
@@ -279,6 +286,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 查询三性/非三性无效理由
+     *
      * @param vo
      * @return
      */
@@ -308,7 +316,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
                 .in(FinalProofGroup::getFinalInvalidStatueId, invalidStatueIds)
                 .orderByAsc(FinalProofGroup::getFeatureSort));
         for (FinalInvalidStatue statue : statueList) {
-             Integer invalidStatueId = statue.getId();
+            Integer invalidStatueId = statue.getId();
             List<FinalProofGroup> statueGroups = proofGroups.stream().filter(item -> item.getFinalInvalidStatueId().equals(invalidStatueId)).collect(Collectors.toList());
             statueGroups.forEach(item -> {
                 GetInvalidReasonClaimsVO claimsVO = new GetInvalidReasonClaimsVO();
@@ -337,6 +345,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 修改无效理由
+     *
      * @param vo
      * @return
      */
@@ -364,6 +373,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 删除无效理由
+     *
      * @param vo
      */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
@@ -380,11 +390,13 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 添加特征
+     *
      * @param vo
      * @return
      */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
     public Integer addFeature(FinalProofGroupDTO vo) {
+//        proofGroupMapper.updateGroup(vo);
         editProofSort(vo.getInvalidStatueId(), vo.getFeatureSort(), 1);
         FinalProofGroup proofGroup = new FinalProofGroup();
         proofGroup.setFinalInvalidStatueId(vo.getInvalidStatueId());
@@ -398,17 +410,18 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
         proofGroup.setCreateId(personnelVO.getId());
         proofGroup.setCreateTime(new Date());
         proofGroup.insert();
-
         return proofGroup.getId();
     }
 
     /**
      * 修改特征序号
+     *
      * @param invalidStatueId
      * @param featureSort
      * @param type
      */
-    public void editProofSort(Integer invalidStatueId, Integer featureSort, Integer type) {
+    @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)
+    public synchronized void editProofSort(Integer invalidStatueId, Integer featureSort, Integer type) {
         List<FinalProofGroup> proofGroups = proofGroupMapper.selectList(new LambdaQueryWrapper<FinalProofGroup>()
                 .eq(FinalProofGroup::getFinalInvalidStatueId, invalidStatueId)
                 .ge(FinalProofGroup::getFeatureSort, featureSort));
@@ -428,6 +441,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 编辑特征
+     *
      * @param vo
      * @return
      */
@@ -442,6 +456,7 @@ public class FinalInvalidStatueService extends ServiceImpl<FinalInvalidStatueMap
 
     /**
      * 删除特征
+     *
      * @param vo
      */
     @Transactional(propagation = Propagation.REQUIRED, rollbackFor = Throwable.class)

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

@@ -165,6 +165,7 @@ public class CustomOptionService extends ServiceImpl<CustomOptionMapper, CustomO
                 List<String> createIds = new ArrayList<>();
                 LambdaQueryWrapper<CustomOption> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(CustomOption::getCustomFieldId, customFieldId);
+                queryWrapper.orderByDesc(CustomOption::getCreateTime);
                 List<CustomOption> customOptions = this.list(queryWrapper);
                 customOptions.forEach(
                         item -> {

src/main/java/cn/cslg/pas/service/importPatent/WebVOTransformService.java

@@ -464,7 +464,7 @@ public class WebVOTransformService {
      * @param cpcs
      */
     public void loadPatentCPC(Patent patent, String cpcs) {
-        //装载IPC分类号
+        //装载cpc分类号
         if (cpcs != null && !cpcs.equals("")) {
             List<PatentClassify> patentClassifies = new ArrayList<>();
             List<String> cpcArr = Arrays.asList(cpcs.split(";"));
@@ -472,7 +472,7 @@ public class WebVOTransformService {
                 PatentClassify patentClassify = PatentClassifySplitter.split(cpcArr.get(i));
                 patentClassifies.add(patentClassify);
             }
-            patent.setIpc(patentClassifies);
+            patent.setCpc(patentClassifies);
         }
     }
 
@@ -480,13 +480,13 @@ public class WebVOTransformService {
         if (cpcArr == null) {
             return;
         }
-        //装载IPC分类号
+        //装载cpc分类号
         List<PatentClassify> patentClassifies = new ArrayList<>();
         for (int i = 0; i < cpcArr.size(); i++) {
             PatentClassify patentClassify = PatentClassifySplitter.split(cpcArr.get(i));
             patentClassifies.add(patentClassify);
         }
-        patent.setIpc(patentClassifies);
+        patent.setCpc(patentClassifies);
 
     }
 

src/main/resources/mapper/FinalProofGroupMapper.xml

@@ -18,4 +18,12 @@
         </where>
         order by ISNULL(feature_sort) asc
     </select>
+
+
+    <update id="updateGroup" parameterType="cn.cslg.pas.common.dto.FinalProofGroupDTO">
+        update final_proof_group
+        set feature_sort = feature_sort+1
+        where final_invalid_statue_id = #{vo.invalidStatueId}
+        and feature_sort &gt;= #{vo.featureSort}
+    </update>
 </mapper>