修改4-27日脚本记录bug

RMS/src/main/java/cn/cslg/report/common/config/MailConstants.java

@@ -17,7 +17,6 @@ public class MailConstants {
     public static final Integer MSG_TIMEOUT = 1;
 
     //队列
-    public static final String MAIL_QUEUE_NAME = "mail.queue";
 
     //交换机
     public static final String MAIL_EXCHANGE_NAME = "mail.exchange";

RMS/src/main/java/cn/cslg/report/entity/PatentRight.java

@@ -2,11 +2,13 @@ package cn.cslg.report.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
+import lombok.experimental.Accessors;
 
 /**
  * 专利权利要求
  * @TableName os_patent_right
  */
+@Accessors(chain = true)
 @Data
 public class PatentRight {
 

RMS/src/main/java/cn/cslg/report/entity/ReportField.java

@@ -89,6 +89,10 @@ public class ReportField extends BaseEntity<ReportField> {
     @TableField("REPORT_TYPE")
     @Schema(description ="字段类型")
     private Integer reportType;
+
+    @TableField("TENANT_ID")
+    @Schema(description ="租户id")
+    private Integer tenantId;
     /**
      * 拓展类型
      */

RMS/src/main/java/cn/cslg/report/service/business/CompareMessageService.java

@@ -132,7 +132,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //处理权要
-        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin,patentNo);
         //查询特征
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         if (reportId != null && reportId != 0) {
@@ -264,7 +264,7 @@ public class CompareMessageService extends ServiceImpl<CompareMessageMapper, Com
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //处理权要
-        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin,patentNo);
         //查询特征
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
             queryWrapper.eq(Features::getReportId, reportId);
@@ -380,7 +380,7 @@ List<Integer> Ids =features.stream().map(Features::getId).collect(Collectors.toL
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //处理权要
-        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin,patentNo);
         //查询特征
         LambdaQueryWrapper<Features> queryWrapper = new LambdaQueryWrapper<>();
         if (reportId != null && reportId != 0) {

RMS/src/main/java/cn/cslg/report/service/business/FeatureService.java

@@ -1,10 +1,12 @@
 package cn.cslg.report.service.business;
 
+import cn.cslg.report.common.model.PatentRightParams;
 import cn.cslg.report.common.model.vo.PatentRightVo;
 import cn.cslg.report.common.model.vo.PatentVO;
 import cn.cslg.report.common.model.vo.PersonnelVO;
 import cn.cslg.report.common.model.vo.SplitVO;
 import cn.cslg.report.common.utils.CacheUtils;
+import cn.cslg.report.common.utils.PatentRightUtils;
 import cn.cslg.report.common.utils.Response;
 import cn.cslg.report.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.report.entity.*;
@@ -47,6 +49,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
     private final AssoTaskPatentSplitService assoTaskPatentSplitService;
     private final TaskService taskService;
     private final CompareMessageService compareMessageService;
+    private final PatentRightUtils patentRightUtils;
 
     /**
      * @param patentRights(专利权利要求)
@@ -54,21 +57,16 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
      * @function 对权要进行合并操作
      */
 
-    public List<PatentRight> FormatPatentRights(List<PatentRight> patentRights) {
-        List<PatentRight> retList = new ArrayList<>();
-        if(patentRights==null){
-            patentRights=new ArrayList<>();
-        }
-        for (int i = 0; i < patentRights.size(); i++) {
-           String str = patentRights.get(i).getContent();
-            str = str.replace("\r", "");
-            str =str.replace("\n","");
-            if(str.replace(" ","").equals("")){
-                patentRights.remove(i);
-            }
-            else{patentRights.get(i).setContent(str);
-            }
-        }
+    public List<PatentRight> FormatPatentRights(List<PatentRight> patentRights,String patentNo) {
+        StringBuilder stringBuilder =new StringBuilder();
+    patentRights.forEach(item->{
+        stringBuilder.append(item.getContent());
+    });
+        PatentRightParams params =new PatentRightParams();
+        params.setPatentNo(patentNo);
+        params.setPatentId(-1);
+        params.setContent(stringBuilder.toString());
+        patentRightUtils.formatPatentRight(params);
         return patentRights;
     }
 
@@ -156,7 +154,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //给权要进行格式更改
-        List<PatentRight> patentRights = FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = FormatPatentRights(patentRightsOrgin,patentNo);
         List<Integer> partRightIds = new ArrayList<>();
         List<String> flags = new ArrayList<>();
         // 当splitType=0仅拆解主权要
@@ -302,7 +300,7 @@ public class FeatureService extends ServiceImpl<FeatureMapper, Features> {
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //处理权要
-        List<PatentRight> patentRights = FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = FormatPatentRights(patentRightsOrgin,patentNo);
         Features featureTO = new Features();
         featureTO.setReportId(reportId);
         featureTO.setSignPatentNo(patentNo);

RMS/src/main/java/cn/cslg/report/service/business/ReportDocumentService.java

@@ -1045,7 +1045,7 @@ public class ReportDocumentService extends ServiceImpl<ReportDocumentMapper, Rep
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject2.getString("data"), PatentRight.class);
         List<Map<String, Object>> rights = new ArrayList<>();
         //给权要进行格式更改
-        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin,patentNo);
         patentRights.forEach(item -> {
             Map<String, Object> temMap = new HashMap<>();
             temMap.put("rightName", "权" + (item.getSort() + 1));

RMS/src/main/java/cn/cslg/report/service/business/ReportFieldService.java

@@ -1,9 +1,7 @@
 package cn.cslg.report.service.business;
 
-import cn.cslg.report.common.model.vo.PatentField;
-import cn.cslg.report.common.model.vo.PatentQueryFieldSourceVO;
-import cn.cslg.report.common.model.vo.ReportFieldVO;
-import cn.cslg.report.common.model.vo.SourceVO;
+import cn.cslg.report.common.model.vo.*;
+import cn.cslg.report.common.utils.CacheUtils;
 import cn.cslg.report.common.utils.DataUtils;
 import cn.cslg.report.common.utils.PatentUtils;
 import cn.cslg.report.common.utils.Response;
@@ -55,7 +53,7 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
     private final ReportFieldService reportFieldService;
     private final CompareFilesService compareFilesService;
     private final OutInterfaceService outInterfaceService;
-
+    private final CacheUtils cacheUtils;
     public List<ReportField> getProjectFieldByProjectId(Integer projectId) {
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getReportId, projectId);
@@ -68,8 +66,10 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
         if (temp != null) {
             return Response.error("字段名称已存在");
         }
+        PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
         reportField.setPtype(reportField.getType() == 6 ? 2 : 1);
         reportField.setCreateBy(loginUtils.getId());
+        reportField.setTenantId(personnelVO.getTenantId());
         reportField.insert();
         return Response.success(reportField.getId());
     }
@@ -126,8 +126,10 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
             queryWrapper.like(ReportField::getName, reportFieldVO.getName());
         }
         if (reportFieldVO.getReportType() != null) {
-            queryWrapper.like(ReportField::getReportType, reportFieldVO.getReportType());
+            PersonnelVO personnelVO =cacheUtils.getLoginUser(loginUtils.getId());
+            queryWrapper.eq(ReportField::getReportType, reportFieldVO.getReportType());
             queryWrapper.isNull((ReportField::getReportId));
+            queryWrapper.eq(ReportField::getTenantId,personnelVO.getTenantId());
         }
         queryWrapper.orderByDesc(ReportField::getId);
         if (reportFieldVO.getSize() != null && reportFieldVO.getCurrent() != null) {
@@ -251,10 +253,13 @@ public class ReportFieldService extends ServiceImpl<ReportFieldMapper, ReportFie
 
     //给报告添加默认自定义字段
     public void addDefaultField(Integer reportId, Integer reportType) {
+        PersonnelVO personnelVO = cacheUtils.getLoginUser(loginUtils.getId());
+        Integer tenantId =personnelVO.getTenantId();
         //根据报告类型添加默认自定义字段
         LambdaQueryWrapper<ReportField> queryWrapper = new LambdaQueryWrapper<>();
         queryWrapper.eq(ReportField::getReportType, reportType);
-        queryWrapper.isNull(ReportField::getReportId);
+        queryWrapper.isNull(ReportField::getReportId)
+                 .eq(ReportField::getTenantId,tenantId);
         //默认自定义字段
         List<ReportField> reportFields = this.list(queryWrapper);
         if (reportFields != null && reportFields.size() != 0) {

RMS/src/main/java/cn/cslg/report/service/business/ReportService.java

@@ -119,7 +119,6 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         return report;
     }
 
-
     /**
      * @param report 报告类
      * @author 沈永艺
@@ -134,6 +133,9 @@ public class ReportService extends ServiceImpl<ReportMapper, Report> {
         }
         //新增报告
         Report report = this.loadReport(reportDto);
+        if (reportDto.getTrack() != null && reportDto.getTrack()) {
+           report.setCronConclusion(null);
+        }
         report.insert();
         if (files != null && files.size() != 0) {
             //当

RMS/src/main/java/cn/cslg/report/service/impl/AvoidDesignDirectionServiceImpl.java

@@ -174,7 +174,7 @@ public class AvoidDesignDirectionServiceImpl implements IAvoidDesignDirectionSer
         //解析jason获得标的专利的权要
         List<PatentRight> patentRightsOrgin = JSON.parseArray(jsonObject.getString("data"), PatentRight.class);
         //给权要进行格式更改
-        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin);
+        List<PatentRight> patentRights = featureService.FormatPatentRights(patentRightsOrgin,signPatentNo);
 
         ArrayList<AvoidDesignRightVO> rights = new ArrayList<>();
         for (PatentRight patentRight : patentRights) {

RMS/src/main/resources/application-dev.yml

@@ -60,5 +60,6 @@ PASFile: http://192.168.1.24:8011
 PCSUrl: http://localhost:8871
 PASUrl: http://localhost:8877
 PCS: http://192.168.1.24:81
+RMSUrl: http://139.224.24.90:82
 #PAS: http://192.168.1.24:80
 PAS: http://192.168.1.9:8086