1

PAS/src/main/java/cn/cslg/pas/common/model/vo/outApi/StarPatentVO.java

@@ -25,6 +25,10 @@ public class StarPatentVO implements Serializable {
     @JSONField(name = "PT")
     private Integer patentType;
     /**
+     * 专利类型
+     */
+    private String type;
+    /**
      * 申请人地址
      */
     @JSONField(name = "DZ")

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

@@ -3,31 +3,28 @@ package cn.cslg.pas.controller;
 
 import cn.cslg.pas.common.core.annotation.Permission;
 import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.vo.PatentInstructionVO;
+import cn.cslg.pas.common.utils.FileUtils;
+import cn.cslg.pas.common.utils.Response;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.common.utils.auth.checkAuth;
 import cn.cslg.pas.domain.PatentInstruction;
 import cn.cslg.pas.service.PatentInstructionService;
-import cn.cslg.pas.service.TaskService;
-import cn.cslg.pas.common.utils.FileUtils;
-import cn.cslg.pas.common.utils.Response;
-import cn.cslg.pas.common.model.vo.PatentInstructionVO;
-import cn.dev33.satoken.stp.StpUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.io.IoUtil;
-import cn.hutool.core.util.IdUtil;
 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.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.ServletOutputStream;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
-import java.util.Date;
 
 /**
  * <p>
@@ -42,9 +39,7 @@ import java.util.Date;
 @RequestMapping(Constants.API_VERSION_V2 + "/patent/instruction")
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentInstructionController {
-
     private final PatentInstructionService patentInstructionService;
-    private final TaskService taskService;
     private final FileUtils fileUtils;
     private final LoginUtils loginUtils;
 
@@ -92,7 +87,7 @@ public class PatentInstructionController {
                 response.setHeader("Content-Disposition", "attachment;filename=" + patentInstruction.getFileName());
                 ServletOutputStream out = response.getOutputStream();
 //                out.write(FileUtil.readBytes(fileUtils.getSystemPath(patentInstruction.getUrl())));
-                String fil =fileUtils.getSystemPath()+patentInstruction.getUrl();
+                String fil = fileUtils.getSystemPath() + patentInstruction.getUrl();
                 out.write(FileUtil.readBytes(fil));
                 IoUtil.close(out);
             }

PAS/src/main/java/cn/cslg/pas/domain/PatentInstruction.java

@@ -18,51 +18,43 @@ import javax.sql.rowset.serial.SerialBlob;
 @Data
 @TableName("os_patent_instruction")
 public class PatentInstruction extends SuperEntity<PatentInstruction> {
-
     /**
-     * 附件名称
+     * 专利号
      */
     private String patentNo;
-
     /**
-     * 附件上传地址
+     * 文件上传地址
      */
     private String url;
     /**
      * 专利ID
      */
     private Integer patentId;
-
     /**
      * 备注
      */
     private String remark;
-
     /**
-     * 上传人
+     * 上传人id
      */
     private Integer createBy;
-
     /**
      * 类型
      */
     private Integer type;
-
     /**
      * 大小
      */
     private Long size;
-
     /**
      * 文件名称
      */
     private String fileName;
 
+
     /**
      * 文件流
      */
-    //private byte[] buffer;
-    //private SerialBlob blob;
     @TableField(exist = false)
     private String pictureStringData;
 

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

@@ -1,18 +1,14 @@
 package cn.cslg.pas.service;
 
 
+import cn.cslg.pas.common.core.base.Constants;
+import cn.cslg.pas.common.model.dto.UploadFileDTO;
+import cn.cslg.pas.common.model.vo.PatentInstructionVO;
 import cn.cslg.pas.common.utils.*;
 import cn.cslg.pas.common.utils.SecurityUtils.LoginUtils;
 import cn.cslg.pas.domain.Patent;
-import cn.cslg.pas.domain.PatentImage;
 import cn.cslg.pas.domain.PatentInstruction;
-import cn.cslg.pas.domain.ProjectFile;
 import cn.cslg.pas.mapper.PatentInstructionMapper;
-import cn.cslg.pas.common.core.base.Constants;
-import cn.cslg.pas.common.core.base.EStatus;
-import cn.cslg.pas.common.model.dto.UploadFileDTO;
-import cn.cslg.pas.common.model.vo.PatentInstructionVO;
-import cn.dev33.satoken.stp.StpUtil;
 import cn.hutool.core.io.FileUtil;
 import cn.hutool.core.util.IdUtil;
 import cn.hutool.core.util.ZipUtil;
@@ -30,7 +26,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.multipart.MultipartFile;
 
 import java.io.File;
-import java.io.FileOutputStream;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -45,10 +40,7 @@ import java.util.stream.Collectors;
 @Service
 @RequiredArgsConstructor(onConstructor_ = {@Lazy})
 public class PatentInstructionService extends ServiceImpl<PatentInstructionMapper, PatentInstruction> {
-
     private final FileUtils fileUtils;
-    private final PatentService patentService;
-    private final ProjectFileService projectFileService;
     private final LoginUtils loginUtils;
 
     public IPage<PatentInstruction> getPageList(PatentInstructionVO params) {

PAS/src/main/java/cn/cslg/pas/service/outApi/PatentStarApiService.java

@@ -158,23 +158,33 @@ public class PatentStarApiService {
     public void loadStarPatentVOS(List<StarPatentVO> starPatentVOS, JSONObject Data) {
         String aa = Data.toString();
         starPatentVOS.forEach(item -> {
+            //专利类型
+            Integer patentType = item.getPatentType();
+            if (patentType != null) {
+                if (patentType.equals(2) || patentType.equals(9)) {
+                    item.setType("实用新型");
+                } else if (patentType.equals(1) || patentType.equals(8)) {
+                    item.setType("发明");
+                } else if (patentType.equals(3)) {
+                    item.setType("外观设计");
+                }
+            }
+
             //如果有公开号，则将公开号作为专利号
             if (item.getApplicationNo() != null && !item.getApplicationNo().equals("") && item.getApplicationNo().contains("CN")) {
                 item.setPatentNo(item.getApplicationNo());
-            }
-            else if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
-                    item.setPatentNo(item.getPublicNo());
+            } else if (item.getPublicNo() != null && !item.getPublicNo().equals("")) {
+                item.setPatentNo(item.getPublicNo());
                 //如果没有公开号，但是有公告号，则将公告号作为公开号和专利号
             }
             if (item.getPublicAccreditNo() != null && !item.getPublicAccreditNo().equals("")) {
-                if(item.getPublicNo()==null||item.getPublicNo().equals("")){
+                if (item.getPublicNo() == null || item.getPublicNo().equals("")) {
                     item.setPublicNo(item.getPublicAccreditNo());
                 }
-                if(item.getPatentNo() ==null) {
+                if (item.getPatentNo() == null) {
                     item.setPatentNo(item.getPublicAccreditNo());
                 }
-            }
-            else {
+            } else {
                 System.out.println("");
 
             }