4/19

PAS/src/main/java/cn/cslg/pas/controller/ProjectImportController.java

@@ -97,6 +97,7 @@ public class ProjectImportController {
         cacheUtils.setUserImportId(userId, importId);
         return Response.success(importId);
     }
+
     @GetMapping("ongoing")
     @Operation(summary = "获取用户是否存在导入中的任务")
     public String getProjectImportOngoing() {
@@ -110,7 +111,7 @@ public class ProjectImportController {
 
     @PostMapping("importByNos")
     @Operation(summary = "根据专利号导入专利到专题库")
-    public String importByNos( @RequestBody  ProjectImportVO patentDTO) {
+    public String importByNos(@RequestBody ProjectImportVO patentDTO) {
         List<String> notQuery = projectImportService.importByNos(patentDTO);
         if (notQuery.size() > 0) {
             return Response.successBut(notQuery);

PAS/src/main/java/cn/cslg/pas/service/PatentRightService.java

@@ -507,12 +507,14 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
             //中文专利的权要拆分 ↓
             if (country.equals("CN") || country.equals("JP")) {
                 String regex;
-                if (content.contains("1.")) {
+                if (content.contains("。2.")) {
                     regex = "。[0-9]+\\.";
-                } else if (content.contains("1、")) {
+                } else if (content.contains("。2、")) {
                     regex = "。[0-9]+[、]";
                 } else if (content.contains("[001]")) {
                     regex = "\\[[0-9]+]";
+                } else if (content.contains("請求項")) {
+                    regex = "。【請求項[0-9]+】";
                 } else {
                     regex = "";
                 }
@@ -522,7 +524,7 @@ public class PatentRightService extends ServiceImpl<PatentRightMapper, PatentRig
                     if (matcher.group().contains(".")) {
                         String matcherGroup = matcher.group().replace(".", "\\.");
                         content = content.replaceFirst(matcherGroup, "。\n" + matcherGroup.substring(matcherGroup.indexOf("。") + 1, matcherGroup.indexOf("\\")) + ".");
-                    } else if (matcher.group().contains("、")) {
+                    } else if (matcher.group().contains("、") || matcher.group().contains("請求項")) {
                         content = content.replaceFirst(matcher.group(), "。\n" + matcher.group().substring(matcher.group().indexOf("。") + 1));
                     }
                 }

PAS/src/main/java/cn/cslg/pas/service/impl/AssoProductPatentServiceImpl.java

@@ -21,9 +21,9 @@ import java.util.List;
 @Service
 public class AssoProductPatentServiceImpl extends ServiceImpl<AssoProductPatentMapper, AssoProductPatent> implements IAssoProductPatentService {
     /**
-     * 新增专利和产品关联
+     * 新增多个专利和多个产品关联
      *
-     * @param assoProductPatentAddNewDTO 新增专利和多个产品关联的DTO类
+     * @param assoProductPatentAddNewDTO 新增多个专利和多个产品关联的DTO类
      */
     @Override
     public void addNewAssoProductPatent(AssoProductPatentAddNewDTO assoProductPatentAddNewDTO) {
@@ -43,7 +43,7 @@ public class AssoProductPatentServiceImpl extends ServiceImpl<AssoProductPatentM
             }
         }
 
-        //先查库中已有的该专利号和产品关联数据
+        //先查库中已有的这些专利和产品的关联数据
         LambdaQueryWrapper<AssoProductPatent> wrapper = new LambdaQueryWrapper<>();
         wrapper.in(AssoProductPatent::getPatentNo, patentNos);
         List<AssoProductPatent> oldAssoProductPatents = this.list(wrapper);
@@ -53,8 +53,10 @@ public class AssoProductPatentServiceImpl extends ServiceImpl<AssoProductPatentM
             }
         }
 
+        //去重
         newAssoProductPatents.removeAll(oldAssoProductPatents);
 
+        //去重后若还有，则为新的关联数据，入库
         if (newAssoProductPatents.size() > 0) {
             //产品和专利关联表插入数据
             log.info("数据入产品和专利关联表");

PAS/src/main/java/cn/cslg/pas/service/impl/ProductCategoryServiceImpl.java

@@ -311,8 +311,7 @@ public class ProductCategoryServiceImpl implements IProductCategoryService {
 
     @Override
     public List<String> getAreaList(GetAreaListDTO dto) {
-        List<String> areaList = new ArrayList<>();
-        areaList = productCategoryMapper.getAreaList(dto);
+        List<String> areaList = productCategoryMapper.getAreaList(dto);
         return areaList;
 
     }

PAS/src/main/java/cn/cslg/pas/service/impl/ProductServiceImpl.java

@@ -7,6 +7,7 @@ import cn.cslg.pas.common.model.vo.*;
 import cn.cslg.pas.common.utils.CacheUtils;
 import cn.cslg.pas.common.utils.FileUtils;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
+import cn.cslg.pas.common.utils.ThrowException;
 import cn.cslg.pas.domain.Product;
 import cn.cslg.pas.domain.ProductMarketData;
 import cn.cslg.pas.domain.Structure;
@@ -279,25 +280,27 @@ public class ProductServiceImpl extends ServiceImpl<ProductMapper, Product> impl
 
     }
 
+    /**
+     * 删除产品
+     *
+     * @param id 产品id
+     */
     @Override
     public void delete(Integer id) {
         log.info("开始处理【删除产品】的业务，参数为：{}", id);
 
         //检查尝试访问的数据是否存在
+        log.info("检查尝试访问的数据是否存在");
         int count = productMapper.countById(id);
         if (count == 0) {
-            String message = "删除产品失败，尝试访问的数据已不存在";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品失败，尝试访问的数据已不存在，请尝试刷新页面");
         }
 
         //检查专题库表中是否有该产品数据，若有则不允许删除
         log.info("检查专题库表中是否有该产品数据，若有则不允许删除");
         count = projectMapper.countByProductId(id);
         if (count > 0) {
-            String message = "删除产品失败，该产品已被专题库使用，请尝试先修改专题库";
-            log.info("{}", message);
-            throw new XiaoShiException(message);
+            ThrowException.throwXiaoShiException("删除产品失败，该产品被专题库使用中，无法删除");
         }
 
         //删除产品架构专利专题库关联表数据