Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	PAS/src/main/java/cn/cslg/pas/controller/ProductPatentController.java

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

@@ -0,0 +1,71 @@
+package cn.cslg.pas.controller;
+
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.QueryPatentVO;
+import cn.cslg.pas.common.model.dto.ProductPatentDTO;
+import cn.cslg.pas.common.model.vo.TaskParams;
+import cn.cslg.pas.common.model.vo.TaskVO;
+import cn.cslg.pas.common.utils.Response;
+import cn.cslg.pas.common.utils.StringUtils;
+import cn.cslg.pas.common.utils.auth.checkAuth;
+import cn.cslg.pas.domain.Task;
+import cn.cslg.pas.service.ProjectService;
+import cn.cslg.pas.service.TaskService;
+import cn.cslg.pas.service.UploadPatentBatchService;
+import cn.cslg.pas.service.asso.AssoProductPatentService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.RequiredArgsConstructor;
+import org.springframework.context.annotation.Lazy;
+import org.springframework.web.bind.annotation.*;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.util.List;
+
+/**
+ * <p>
+ * 任务 前端控制器
+ * </p>
+ *
+ * @author 王岩
+ * @since 2022-02-17
+ */
+@Tag(name = "产品相关专利管理")
+@RestController
+@RequestMapping(Constants.API_VERSION_V2 + "/proPatent")
+@RequiredArgsConstructor(onConstructor_ = {@Lazy})
+public class ProductPatentController {
+    private final AssoProductPatentService assoProductPatentService;
+    private final UploadPatentBatchService uploadPatentBatchService;
+    private final ProjectService projectService;
+    @PostMapping("/add")
+    @Operation(summary = "添加产品相关专利")
+    public String addPatents(@RequestBody ProductPatentDTO patentDTO) {
+        assoProductPatentService.addPatents(patentDTO);
+        return Response.success(true);
+    }
+    @PostMapping("/delete")
+    @Operation(summary = "删除产品相关专利")
+    public String deletePatents(@RequestBody ProductPatentDTO patentDTO) {
+      List<String> patentNos =  assoProductPatentService.deletePatents(patentDTO);
+        if(patentNos.size()==0){
+            return Response.success("删除成功");
+        }
+    return  Response.successBut(patentNos);
+    }
+
+    @PostMapping("/importPatents")
+    @Operation(summary = "导入专利")
+    public String importSysPatent(MultipartFile file, Integer productId) {
+        TaskParams taskParams = projectService.getImportPatentTaskParamsBro(file,productId);
+        uploadPatentBatchService.uploadPatentForProduct(taskParams,productId);
+        return Response.success();
+    }
+
+    @PostMapping("/queryPatents")
+    @Operation(summary = "查询产品相关专利")
+    public String queryPatents(@RequestBody QueryPatentVO params) {
+        return Response.success(assoProductPatentService.getPageList(params));
+    }
+}
+

logs/pas/pas-info.log

@@ -91,3 +91,36 @@
 [pas:0.0.0.0:8877] [,] 2023-03-12 23:51:26.036 INFO 3888 [http-nio-8877-exec-3] org.springdoc.api.AbstractOpenApiResource Init duration for springdoc-openapi is: 861 ms
 [pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.608 INFO 3888 [http-nio-8877-exec-4] cn.cslg.pas.controller.StructureController 开始处理【分页查询架构】的请求，请求参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
 [pas:0.0.0.0:8877] [,] 2023-03-12 23:51:34.610 INFO 3888 [http-nio-8877-exec-4] cn.cslg.pas.service.impl.StructureServiceImpl 开始处理【分页查询架构】的业务2，参数为：StructureQueryPageDTO(productId=22, structureId=0, structureName=string)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:29.386 INFO 27632 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 27632 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:29.388 INFO 27632 [main] cn.cslg.pas.Application The following profiles are active: dev
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:30.827 INFO 27632 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:30.829 INFO 27632 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:30.896 INFO 27632 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 51 ms. Found 0 Redis repository interfaces.
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.621 INFO 27632 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.629 INFO 27632 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.629 INFO 27632 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.630 INFO 27632 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.710 INFO 27632 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.711 INFO 27632 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 2277 ms
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:31.915 INFO 27632 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:32.126 INFO 27632 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:37.288 INFO 27632 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:37.304 INFO 27632 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:18:37.313 INFO 27632 [main] cn.cslg.pas.Application Started Application in 8.463 seconds (JVM running for 9.326)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:23:29.454 INFO 27632 [SpringApplicationShutdownHook] com.alibaba.druid.pool.DruidDataSource {dataSource-1} closed
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:26.396 INFO 3548 [main] cn.cslg.pas.Application Starting Application using Java 1.8.0_342 on DESKTOP-69B64D5 with PID 3548 (D:\Wispro-CodeWarehouse-BackEnd\PAS\target\classes started by admin in D:\Wispro-CodeWarehouse-BackEnd)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:26.399 INFO 3548 [main] cn.cslg.pas.Application The following profiles are active: dev
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:27.262 INFO 3548 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Multiple Spring Data modules found, entering strict repository configuration mode!
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:27.265 INFO 3548 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Bootstrapping Spring Data Redis repositories in DEFAULT mode.
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:27.328 INFO 3548 [main] org.springframework.data.repository.config.RepositoryConfigurationDelegate Finished Spring Data repository scanning in 45 ms. Found 0 Redis repository interfaces.
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:27.992 INFO 3548 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat initialized with port(s): 8877 (http)
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:27.999 INFO 3548 [main] org.apache.coyote.http11.Http11NioProtocol Initializing ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.000 INFO 3548 [main] org.apache.catalina.core.StandardService Starting service [Tomcat]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.000 INFO 3548 [main] org.apache.catalina.core.StandardEngine Starting Servlet engine: [Apache Tomcat/9.0.56]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.079 INFO 3548 [main] org.apache.catalina.core.ContainerBase.[Tomcat].[localhost].[/] Initializing Spring embedded WebApplicationContext
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.079 INFO 3548 [main] org.springframework.boot.web.servlet.context.ServletWebServerApplicationContext Root WebApplicationContext: initialization completed in 1631 ms
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.275 INFO 3548 [main] com.alibaba.druid.spring.boot.autoconfigure.DruidDataSourceAutoConfigure Init DruidDataSource
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:28.484 INFO 3548 [main] com.alibaba.druid.pool.DruidDataSource {dataSource-1} inited
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:33.331 INFO 3548 [main] org.apache.coyote.http11.Http11NioProtocol Starting ProtocolHandler ["http-nio-8877"]
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:33.347 INFO 3548 [main] org.springframework.boot.web.embedded.tomcat.TomcatWebServer Tomcat started on port(s): 8877 (http) with context path ''
+[pas:0.0.0.0:8877] [,] 2023-03-16 11:24:33.356 INFO 3548 [main] cn.cslg.pas.Application Started Application in 7.477 seconds (JVM running for 8.146)