瀏覽代碼

20250214 审核任务

lrj 7 月之前
父節點
當前提交
4d3a416f85

+ 4 - 4
src/main/java/cn/cslg/pas/common/config/WebSocketConfig.java

@@ -6,8 +6,8 @@ import org.springframework.web.socket.server.standard.ServerEndpointExporter;
 
 @Configuration
 public class WebSocketConfig {
-    @Bean
-    public ServerEndpointExporter serverEndpointExporter() {
-        return new ServerEndpointExporter();
-    }
+//    @Bean
+//    public ServerEndpointExporter serverEndpointExporter() {
+//        return new ServerEndpointExporter();
+//    }
 }

+ 2 - 0
src/main/java/cn/cslg/pas/factorys/noveltyTemplateFacotry/GetaiqijiTempalte.java

@@ -23,6 +23,7 @@ import java.util.stream.Collectors;
  */
 @Component
 public class GetaiqijiTempalte implements GetTemplateMapsImp {
+
     @Autowired
     private EsPatentService esPatentService;
     public  Map<String,Object> getMap(List<QueryNoveltyProjectVO> queryNoveltyProjectVOs,TechnicalCaseVO technicalCaseVO,List<CompareLiteratureVO> compareLiteratureVOS,List<NoveltyCompareRecordQueryVO> noveltyCompareRecordQueryVOS,List<RetrieveRecordVO> retrieveRecordVOS){
@@ -39,6 +40,7 @@ public class GetaiqijiTempalte implements GetTemplateMapsImp {
         map.put("searchRecord", searchRecordMap);
         return map;
     }
+
     @Override
     public Map<String, Object> getTechnicalCaseMap(TechnicalCaseVO technicalCaseVO) {
         Map<String, Object> technicalMap = new HashMap<>();

+ 2 - 1
src/main/java/cn/cslg/pas/service/novelty/NoveltyExportReportService.java

@@ -36,6 +36,7 @@ import lombok.RequiredArgsConstructor;
 import org.ddr.poi.html.HtmlRenderPolicy;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Value;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.io.File;
@@ -43,7 +44,7 @@ import java.util.*;
 import java.util.stream.Collectors;
 
 @Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class NoveltyExportReportService {
     private final NoveltyReportTemplateService noveltyReportTemplateService;
     private final NoveltyReportReferencesService noveltyReportReferencesService;

+ 6 - 2
src/main/java/cn/cslg/pas/service/novelty/NoveltyReportReferencesService.java

@@ -40,6 +40,7 @@ import lombok.RequiredArgsConstructor;
 import org.apache.poi.hslf.record.Record;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 
 import java.util.*;
@@ -51,7 +52,7 @@ import java.util.stream.Collectors;
  * @createDate 2024-09-30 15:33:57
  */
 @Service
-@RequiredArgsConstructor
+@RequiredArgsConstructor(onConstructor_={@Lazy})
 public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportReferencesMapper, NoveltyReportReferences> {
     private final NoveltyReportTemplateService noveltyReportTemplateService;
     private final ReferencesService referencesService;
@@ -62,6 +63,7 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
     private final NoveltySearchRecordService noveltySearchRecordService;
     private final EsPatentService esPatentService;
     private final NoveltyTemplateFactory noveltyTemplateFactory;
+    private final NoveltyExportReportService noveltyExportReportService;
     @Autowired
     private CacheUtils cacheUtils;
 
@@ -187,7 +189,9 @@ public class NoveltyReportReferencesService extends ServiceImpl<NoveltyReportRef
         Map<String, Object> map = getTemplateMapsImp.getMap(queryNoveltyProjectVOs, technicalCaseVO, compareLiteratureVOS, noveltyCompareRecordQueryVOS, retrieveRecordVOS);
         String json = JsonUtils.objectToJson(map);
         noveltyReportReferenceDTO.setDataSource(json);
-        return this.addOrUpdate(noveltyReportReferenceDTO);
+        id = this.addOrUpdate(noveltyReportReferenceDTO);
+        noveltyExportReportService.exportReport(id);
+        return id;
     }
 
     public TechnicalCaseVO getTechnicalCaseVO(Integer projectId) {