20241224 bug修改

src/main/java/cn/cslg/pas/common/utils/esDataForm/AddressSplitter.java

@@ -15,11 +15,12 @@ public class AddressSplitter {
 
     public static PersonAddress splitAddress(String address, String provinceStr) {
         PersonAddress personAddress =null;
+
         // 初始化省、市、区
         String province = "";
-
         Pattern pattern = Pattern.compile("\\((.*?)\\)"); // 匹配(文本)形式的括号
         Matcher matcher = pattern.matcher(provinceStr);
+
         while (matcher.find()) {
             province = matcher.group(1);// 输出括号内的文本
         }

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

@@ -820,7 +820,7 @@ public class CustomFieldService extends ServiceImpl<CustomFieldMapper, CustomFie
                         break;
                     case "6":
                         esCustomFieldDTO.setFieldType(Integer.parseInt(type));
-                        values = treeNodeService.getIdByNames(fieldList, fieldId, contionId);
+                        values = treeNodeService.getIdByNames(fieldList, fieldId, Integer.parseInt(type));
                         break;
                 }
                 esCustomFieldDTO.setFieldValue(values);

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

@@ -89,6 +89,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
     private MailSendService mailSendService;
     @Autowired
     private ReportProjectService reportProjectService;
+
     @Override
     public Object queryMessage(QueryRequest queryRequest) throws Exception {
         List<String> sqls = formatQueryService.reSqls(queryRequest, "importTask");
@@ -281,7 +282,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         List<Personnel> personnels = new ArrayList<>();
         List<Product> products = new ArrayList<>();
         List<Project> projects = new ArrayList<>();
-        List<ReportProject> reportProjects =new ArrayList<>();
+        List<ReportProject> reportProjects = new ArrayList<>();
         List<SystemFile> systemFiles = new ArrayList<>();
 
         //查询创建人名称
@@ -297,9 +298,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             queryWrapper.in(Project::getId, projectIds);
             projects = projectService.list(queryWrapper);
 
-            LambdaQueryWrapper<ReportProject> queryWrapper1 =new LambdaQueryWrapper<>();
-            queryWrapper1.in(ReportProject::getProjectId,projectIds);
-            reportProjects=reportProjectService.list(queryWrapper1);
+            LambdaQueryWrapper<ReportProject> queryWrapper1 = new LambdaQueryWrapper<>();
+            queryWrapper1.in(ReportProject::getProjectId, projectIds);
+            reportProjects = reportProjectService.list(queryWrapper1);
         }
 
         //查询产品名称
@@ -334,6 +335,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
             SystemDict systemDict2 = systemDictList.stream()
                     .filter(item -> item.getType().equals("IMPORT_TASk_STATE") && item.getType()
                             .equals(importTaskVO.getState().toString())).findFirst().orElse(null);
+
             if (systemDict1 != null) {
                 importTaskVO.setTypeStr(systemDict1.getLabel());
             }
@@ -364,9 +366,9 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                         } else {
                             importTaskVO.setImportToName("查新检索" + "-报告");
                         }
-                    } else if(project.getType().equals(2)){
-                        ReportProject reportProject =reportProjects.stream().filter(item -> item.getProjectId().equals(importTaskVO.getProjectId())).findFirst().orElse(null);
-                        if(reportProject!=null){
+                    } else if (project.getType().equals(2)) {
+                        ReportProject reportProject = reportProjects.stream().filter(item -> item.getProjectId().equals(importTaskVO.getProjectId())).findFirst().orElse(null);
+                        if (reportProject != null) {
                             importTaskVO.setReportType(reportProject.getReportType());
                         }
                         importTaskVO.setImportToName(project.getName() + "-报告");
@@ -582,13 +584,14 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         return importTask.getId();
     }
 
-    public void addImportTaskByCondition(ImportTaskCondition importTaskCondition,PatentProject project) {
+    public void addImportTaskByCondition(ImportTaskCondition importTaskCondition, PatentProject project) {
         String condition = importTaskCondition.getSearchCondition();
         String updateCycle = project.getUpdateCycle();
 
         if (updateCycle == null) {
             return;
         }
+
         LocalDate localDate = LocalDate.now();
         List<String> dateRange = new ArrayList<>();
         switch (updateCycle) {
@@ -609,6 +612,7 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
                 dateRange = DateUtils2.getYearRange(localYear);
                 break;
         }
+
         if (dateRange.size() < 2) {
             return;
         }
@@ -618,18 +622,18 @@ public class ImportTaskService extends ServiceImpl<ImportTaskMapper, ImportTask>
         queryWrapper.eq(ImportTask::getImportTaskConditionId, importTaskCondition.getId())
                 .eq(ImportTask::getUpdateToDate, end)
                 .eq(ImportTask::getLastUpdateToDate, start);
+
         ImportTask lastImportTask = this.getOne(queryWrapper, false);
         if (lastImportTask != null) {
             return;
         }
-        ImportTask importTask = new ImportTask();
 
-
-            String fromDateStr = DateUtils2.dateTimeToPatentStr(start);
-            String todateStr = DateUtils2.dateTimeToPatentStr(end);
-            importTask.setLastUpdateToDate(start);
-            importTask.setUpdateToDate(end);
-            condition = condition + " and (PD=" + fromDateStr + "~" + todateStr + " or GD=" + fromDateStr + "~" + todateStr + ")";
+        ImportTask importTask = new ImportTask();
+        String fromDateStr = DateUtils2.dateTimeToPatentStr(start);
+        String todateStr = DateUtils2.dateTimeToPatentStr(end);
+        importTask.setLastUpdateToDate(start);
+        importTask.setUpdateToDate(end);
+        condition = condition + " and (PD=" + fromDateStr + "~" + todateStr + " or GD=" + fromDateStr + "~" + todateStr + ")";
 
         PatentStarListDTO patentStarListDto = new PatentStarListDTO()
                 .setCurrentQuery(condition)

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

@@ -237,7 +237,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
 
-            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
 
         //赋值
         TreeNode treeNode = new TreeNode();
@@ -346,7 +346,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
         //获取登录人信息
         PersonnelVO personnelVO = new PersonnelVO();
 
-            personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
 
         TreeNode treeNode = this.getById(updateTreeNodeDTO.getId());
         //检查名称是否规范
@@ -732,7 +732,10 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
 
 
     public List<String> getIdByNames(List<String> values, Integer fieldId, Integer type) {
-
+        if (type == 6) {
+            type = 4;
+        }
+        Integer newType = type;
         List<String> ids = new ArrayList<>();
         values.forEach(item -> {
             List<String> nodes = cn.cslg.pas.common.utils.StringUtils.changeStringToString(item, "\\\\");
@@ -740,23 +743,36 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
             for (int i = 0; i < nodes.size(); i++) {
                 LambdaQueryWrapper<TreeNode> queryWrapper = new LambdaQueryWrapper<>();
                 queryWrapper.eq(TreeNode::getTypeId, fieldId)
-                        .eq(TreeNode::getType, type)
+                        .eq(TreeNode::getType, newType)
                         .eq(TreeNode::getName, nodes.get(i))
                         .eq(TreeNode::getLevel, i);
+                if (lastTreeNode == null) {
+                    queryWrapper.eq(TreeNode::getParentId, 0);
+                } else {
+                    queryWrapper.eq(TreeNode::getParentId, lastTreeNode.getId());
+                }
                 TreeNode treeNode = this.getOne(queryWrapper);
                 if (treeNode == null) {
                     treeNode = new TreeNode();
                     treeNode.setLevel(i);
                     treeNode.setName(nodes.get(i));
-                    treeNode.setType(type);
+                    treeNode.setType(newType);
+                    treeNode.setTypeId(fieldId);
+                    treeNode.setParentId(0);
+                    treeNode.setPath("");
                     if (lastTreeNode != null) {
                         treeNode.setParentId(lastTreeNode.getId());
-                        treeNode.setPath(lastTreeNode.getPath() + "/" + lastTreeNode.getId());
+                        if (lastTreeNode.getParentId() == 0) {
+                            treeNode.setPath("" + lastTreeNode.getId());
+
+                        } else {
+                            treeNode.setPath(lastTreeNode.getPath() + "/" + lastTreeNode.getId());
+                        }
                     }
                     treeNode.insert();
-                    lastTreeNode = treeNode;
-                }
 
+                }
+                lastTreeNode = treeNode;
                 if (nodes.size() - 1 == i) {
                     ids.add(treeNode.getId().toString());
                 }
@@ -768,7 +784,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     }
 
     //
-    public List<String> getIdByNames2(List<String> values, Integer fieldId,Integer conditionId) {
+    public List<String> getIdByNames2(List<String> values, Integer fieldId, Integer conditionId) {
 
         List<String> valuesIds = new ArrayList<>();
         for (String value : values) {
@@ -776,7 +792,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
             TreeNode treeNode = null;
             for (int i = 0; i < valueQs.length; i++) {
                 String valueQ = valueQs[i];
-                treeNode = this.getTreeNodeByName(valueQ, i, fieldId, treeNode,conditionId);
+                treeNode = this.getTreeNodeByName(valueQ, i, fieldId, treeNode, conditionId);
                 if (i == valueQs.length - 1) {
                     if (!valuesIds.contains(treeNode.getId())) {
                         valuesIds.add(treeNode.getId().toString());
@@ -788,7 +804,7 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
     }
 
 
-    public TreeNode getTreeNodeByName(String value, Integer level, Integer fieldId, TreeNode parentTreeNode,Integer conditionId) {
+    public TreeNode getTreeNodeByName(String value, Integer level, Integer fieldId, TreeNode parentTreeNode, Integer conditionId) {
         Integer parentId = 0;
         if (parentTreeNode != null) {
             parentId = parentTreeNode.getId();
@@ -803,26 +819,26 @@ public class TreeNodeService extends ServiceImpl<TreeNodeMapper, TreeNode> imple
                 .eq(TreeNode::getTypeId, fieldId);
         TreeNode treeNode = this.getOne(queryWrapper, false);
         if (treeNode == null) {
-             treeNode =new TreeNode();
+            treeNode = new TreeNode();
             treeNode.setName(value);
             treeNode.setType(4);
             treeNode.setParentId(parentId);
             treeNode.setLevel(level);
             treeNode.setTypeId(fieldId);
-            if(parentTreeNode!=null) {
-                treeNode.setPath(parentTreeNode.getPath()+"/"+parentTreeNode.getId());
-            }
-            else {
+            if (parentTreeNode != null) {
+                treeNode.setPath(parentTreeNode.getPath() + "/" + parentTreeNode.getId());
+            } else {
                 treeNode.setPath("");
             }
             treeNode.insert();
         }
-        return  treeNode;
+        return treeNode;
     }
 
 
     /**
      * 添加自定义树节点
+     *
      * @param treeNodeDTO
      * @return
      */

src/main/java/cn/cslg/pas/service/test/PermissionService2.java

@@ -60,7 +60,7 @@ public class PermissionService2 {
                 .readTimeout(60, TimeUnit.SECONDS)
                 .build();
         Request request = new Request.Builder()
-                .url("https://xsip.cn/" + "api/permission/api/admin/loginByEncryption")
+                .url("http://8879/" + "api/permission/qiaoBi/admin/loginByEncryption")
                 .post(requestBody)
                 .build();
         return Objects.requireNonNull(okHttpClient.newCall(request).execute().body()).string();