20250415 dify功能修改

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

@@ -132,7 +132,7 @@ public class CustomOptionService extends ServiceImpl<CustomOptionMapper, CustomO
             queryWrapper.eq(CustomOption::getName, name);
             queryWrapper.eq(CustomOption::getCustomFieldId, updateCustomOptionDTO.getCustomFieldId());
             List<CustomOption> customOptions = this.list(queryWrapper);
-            if (!name.equals(customOption.getName()) && customOptions.size() != 0) {
+            if ((!name.equals(customOption.getName()))&& customOptions.size() != 0) {
                 throw new XiaoShiException("名称重复");
             }
             BeanUtils.copyProperties(updateCustomOptionDTO, customOption);

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

@@ -354,9 +354,11 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //根据名称查询是否重复
         String name = updateTreeNodeDTO.getName();
         LambdaQueryWrapper<TreeNode> queryWrapper = new LambdaQueryWrapper<>();
-        queryWrapper.eq(TreeNode::getName, name);
+        queryWrapper.eq(TreeNode::getName, name)
+                .eq(TreeNode::getLevel, treeNode.getLevel())
+                .eq(TreeNode::getTypeId,treeNode.getTypeId());
         List<TreeNode> treeNodes = this.list(queryWrapper);
-        if (!updateTreeNodeDTO.getName().equals(treeNode.getName()) && treeNodes.size() != 0) {
+        if ((!updateTreeNodeDTO.getName().equals(treeNode.getName())) && treeNodes.size() != 0) {
             throw new XiaoShiException("节点名称重复");
         }
         BeanUtils.copyProperties(updateTreeNodeDTO, treeNode);
@@ -472,7 +474,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                 Integer type = nodeVO.getType();
                 if (type != null) {
                     if (type == 1 || type == 2) {
-                        Long relevantProductNum = esProductPatentService.selectRelevantTreeNodeNum(nodeVO.getId(),type);
+                        Long relevantProductNum = esProductPatentService.selectRelevantTreeNodeNum(nodeVO.getId(), type);
                         nodeVO.setRelevantProductNum(relevantProductNum);
                     }
                 }

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

@@ -117,7 +117,6 @@ public class GetPatentFromExcelThread extends Thread {
         WebVOTransformService webVOTransformService = applicationContext.getBean(WebVOTransformService.class);
 
         Patent patent = uploadParamsVO.getPatent();
-
         this.loadPatentType(patent);
         webVOTransformService.loadGrantNo(patent, patent.getPublicNo(), patent.getGrantNo());
         webVOTransformService.loadCountry(patent, false);
@@ -128,7 +127,6 @@ public class GetPatentFromExcelThread extends Thread {
 
         }
 
-
         //装载标题原文
         if (uploadParamsVO.getTitle() != null) {
             List<Text> texts = new ArrayList<>();
@@ -246,10 +244,12 @@ public class GetPatentFromExcelThread extends Thread {
             List<String> invetorNames = patentInventorList.stream().map(PatentInventor::getName).collect(Collectors.toList());
             webVOTransformService.loadInventor(patent, invetorNames);
         }
-
+        //申请人
         List<String> applicantNames = uploadParamsVO.getPatentApplicantOriginalName();
         webVOTransformService.loadApplicant(patent, applicantNames);
-
+        List<String>  address=uploadParamsVO.getPatentApplicantOriginalAddress();
+        //装载申请人地址
+        webVOTransformService.loadApplicantAddr(patent,address);
         //权利人
         List<String> rightNames = uploadParamsVO.getPatentApplicantCurrentName();
         webVOTransformService.loadRightHolder(patent, rightNames);

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

@@ -1154,4 +1154,18 @@ public class WebVOTransformService {
         System.out.println(reClaim);
         return reClaim;
     }
+
+    /**
+     * 装载申请人地址
+     *
+     * @param patent
+     */
+    public void loadApplicantAddr(Patent patent, List<String> addresses) {
+        //装载申请人地址
+        if (patent.getApplicantAddr() == null&&addresses!=null&&addresses.size()>0) {
+                PersonAddress personAddress = new PersonAddress();
+                personAddress.setAddress(addresses.get(0));
+                patent.setApplicantAddr(personAddress);
+        }
+    }
 }

src/main/resources/jsons/uploadSetting.json

@@ -425,6 +425,13 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
+        "setName": "权利人",
+        "column": "patentApplicantCurrentName",
+        "splitSymbol": "\\|",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
+      {
         "setName": "[标]当前申请(专利权)人",
         "column": "patentApplicantStandardCurrentName",
         "splitSymbol": "\\|",
@@ -432,6 +439,13 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
+        "setName": "申请人",
+        "column": "patentApplicantOriginalName",
+        "splitSymbol": "\\|",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
+      {
         "setName": "原始申请(专利权)人",
         "column": "patentApplicantOriginalName",
         "splitSymbol": "\\|",
@@ -551,6 +565,13 @@
         "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
       },
       {
+        "setName": "申请人地址",
+        "column": "patentApplicantOriginalAddress",
+        "splitSymbol": "\\|",
+        "handler": "cn.cslg.pas.common.utils.handler.StringHandler",
+        "jarOrClassPath": "./Wispro-CodeWarehouse-BackEnd.jar"
+      },
+      {
         "setName": "原始申请(专利权)人国家",
         "column": "patentApplicantOriginalCountry",
         "splitSymbol": "\\|",