国家/国内数据库设计

src/main/java/com/izouma/uwip/domain/CountryPatent.java

@@ -79,6 +79,6 @@ public class CountryPatent extends BaseEntity {
     private Boolean replyPassed;
 
     @ApiModelProperty(value = "办登缴费期限")
-    private LocalDate registerPeriod;
+    private LocalDate registerPayPeriod;
 
 }

src/main/java/com/izouma/uwip/domain/DomesticPatent.java

@@ -1,4 +1,53 @@
 package com.izouma.uwip.domain;
 
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "国内申请")
 public class DomesticPatent extends BaseEntity {
+    @ApiModelProperty(value = "申请人统一社会信用代码")
+    private String applicantUscc;
+
+    @ApiModelProperty(value = "第一发明人身份证")
+    private String inventorIdno;
+
+    @ApiModelProperty(value = "是否请求费减")
+    private boolean deduction;
+
+    @ApiModelProperty(value = "是否请求实质审查")
+    private boolean essentialReview;
+
+    @ApiModelProperty(value = "是否申请提前公开")
+    private boolean publicInAdvance;
+
+    @ApiModelProperty(value = "是否申请红章受理通知书")
+    private boolean chapterAcceptanceNotice;
+
+    @ApiModelProperty(value = "是否申请红章缴费通知书")
+    private boolean chapterPaymentNotice;
+
+    @ApiModelProperty(value = "是否决定答复")
+    private Boolean decideReply;
+
+    /*
+    true 客户准备
+    false 律师准备
+     */
+    @ApiModelProperty(value = "准备答复意见")
+    private Boolean isClientReady;
+
+    @ApiModelProperty(value = "是否通过答复")
+    private Boolean replyPassed;
+
+    @ApiModelProperty(value = "办登通知日")
+    private LocalDate registerNotice;
 }

src/main/java/com/izouma/uwip/domain/InternationalPatent.java

@@ -1,15 +1,19 @@
 package com.izouma.uwip.domain;
 
+import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 
+import java.time.LocalDate;
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "国际申请")
 public class InternationalPatent extends BaseEntity {
 
-    @ApiModelProperty(value = "申请人统一社会信用代码")
-    private String applicantUscc;
-
-    @ApiModelProperty(value = "第一发明人身份证")
-    private String inventorIdno;
-
-//    private boolean
 
 }

src/main/java/com/izouma/uwip/service/AttachmentService.java

@@ -26,10 +26,10 @@ public class AttachmentService {
     }
 
     /*
-    KB
+    B/KB
      */
-    public int getSize(String oss) {
-        int size = 0;
+    public String getSize(String oss) {
+        double size = 0.0;
         try {
             URL url = new URL(oss);
             URLConnection conn = url.openConnection();
@@ -38,7 +38,10 @@ public class AttachmentService {
         } catch (IOException e) {
             e.printStackTrace();
         }
-        return size / 1024;
+        if (size > 1024) {
+            return size / 1024 + "KB";
+        }
+        return size + "B";
     }
 
     /*
@@ -53,7 +56,7 @@ public class AttachmentService {
                     .fileName(dto.getFileName())
                     .url(dto.getUrl())
                     .remark(dto.getRemark())
-                    .size(getSize(dto.getUrl()) + "KB")
+                    .size(getSize(dto.getUrl()))
                     .version(attachmentRepo.findVersion("%" + dto.getAttachmentName() + "%", patentId))
                     .build();
             attachmentRepo.save(build);

src/test/java/com/izouma/uwip/service/AttachmentServiceTest.java

@@ -11,6 +11,6 @@ public class AttachmentServiceTest extends ApplicationTests {
 
     @Test
     public void getSize() {
-        System.out.println(attachmentService.getSize("https://uwip.oss-cn-hangzhou.aliyuncs.com/image/2021-03-24-16-22-50wnZuukgh.jpeg"));
+        System.out.println(attachmentService.getSize("https://uwip.oss-cn-hangzhou.aliyuncs.com/text/2021-03-26-17-33-03dWOZjMVd.txt"));
     }
 }