建表

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

@@ -0,0 +1,32 @@
+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;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "附件")
+public class Attachment extends BaseEntity {
+    private String attachmentName;
+
+    private String fileName;
+
+    private String remark;
+
+    private String size;
+
+    @ApiModelProperty(value = "操作人")
+    private Long operateUserId;
+
+    @ApiModelProperty(value = "版本")
+    private int version;
+
+    private Long patentId;
+
+}

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

@@ -0,0 +1,27 @@
+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;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "对接人")
+public class Docking extends BaseEntity {
+    @ApiModelProperty(value = "客户id")
+    private Long partnerId;
+
+    private String name;
+
+    private String phone;
+
+    private String email;
+
+    @ApiModelProperty(value = "职务")
+    private String jobTitle;
+}

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

@@ -0,0 +1,20 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.FeeType;
+import com.izouma.uwip.enums.PayStatus;
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "费用")
+public class Fee extends BaseEntity {
+    private FeeType type;
+
+    private PayStatus status;
+}

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

@@ -1,6 +1,7 @@
 package com.izouma.uwip.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
+import com.izouma.uwip.converter.StringArrayConverter;
 import com.izouma.uwip.dto.MenuDTO;
 import com.izouma.uwip.security.Authority;
 import lombok.AllArgsConstructor;
@@ -40,6 +41,10 @@ public class Menu extends BaseEntity implements Serializable {
 
     private String category;
 
+    @Convert(converter = StringArrayConverter.class)
+    @Column(columnDefinition = "TEXT")
+    private List<String> subUrl;
+
     @OneToMany
     @JoinColumn(name = "parent", insertable = false, updatable = false, foreignKey = @ForeignKey(ConstraintMode.NO_CONSTRAINT))
     List<Menu> children;
@@ -63,6 +68,7 @@ public class Menu extends BaseEntity implements Serializable {
                 .enabled(menuDTO.getEnabled())
                 .active(menuDTO.getActive())
                 .category(menuDTO.getCategory())
+                .subUrl(menuDTO.getSubUrl())
                 .children(null)
                 .build();
         menu.setId(menuDTO.getId());

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

@@ -0,0 +1,62 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.PartnerType;
+import com.izouma.uwip.enums.SupplierType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "客户/供应商管理")
+public class Partner extends BaseEntity {
+    /**
+     * 区分 客户/供应商
+     */
+    @Enumerated(EnumType.STRING)
+    private PartnerType type;
+
+    @Enumerated(EnumType.STRING)
+    @ApiModelProperty(value = "供应商类型")
+    private SupplierType supplierType;
+
+    @ApiModelProperty(value = "代码")
+    private String code;
+
+    private String name;
+
+    private String enName;
+
+    private String address;
+
+    private String enAddress;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String uscc;
+
+    @ApiModelProperty(value = "开票名称")
+    private String billingName;
+
+    @ApiModelProperty(value = "税号")
+    private String taxID;
+
+    @ApiModelProperty(value = "开票地址")
+    private String billingAddress;
+
+    @ApiModelProperty(value = "开票电话")
+    private String billingPhone;
+
+    @ApiModelProperty(value = "开户行")
+    private String accountBank;
+
+    @ApiModelProperty(value = "账号")
+    private String account;
+}

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

@@ -0,0 +1,30 @@
+package com.izouma.uwip.domain;
+
+import com.izouma.uwip.enums.PatentType;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import javax.persistence.EnumType;
+import javax.persistence.Enumerated;
+
+@AllArgsConstructor
+@Data
+@Builder
+@NoArgsConstructor
+@ApiModel(value = "专利申请")
+public class Patent extends BaseEntity{
+    private String name;
+
+    @ApiModelProperty(value = "专利类型")
+    @Enumerated(EnumType.STRING)
+    private PatentType type;
+
+    @ApiModelProperty(value = "客户id")
+    private Long partnerId;
+
+
+}

src/main/java/com/izouma/uwip/dto/MenuDTO.java

@@ -1,5 +1,7 @@
 package com.izouma.uwip.dto;
 
+import java.util.List;
+
 public interface MenuDTO {
     Long getId();
 
@@ -20,4 +22,6 @@ public interface MenuDTO {
     Boolean getActive();
 
     String getCategory();
+
+    List<String> getSubUrl();
 }

src/main/java/com/izouma/uwip/enums/FeeType.java

@@ -0,0 +1,15 @@
+package com.izouma.uwip.enums;
+
+public enum FeeType {
+    /*
+    官费
+     */
+
+    /*
+    代理费
+     */
+
+    /*
+    其他
+     */
+}

src/main/java/com/izouma/uwip/enums/PartnerType.java

@@ -0,0 +1,12 @@
+package com.izouma.uwip.enums;
+
+public enum PartnerType {
+    /*
+    供应商
+     */
+    SUPPLIER,
+    /*
+    客户
+     */
+    CLIENT
+}

src/main/java/com/izouma/uwip/enums/PatentType.java

@@ -0,0 +1,17 @@
+package com.izouma.uwip.enums;
+
+public enum PatentType {
+    INVENTION_PATENT("发明专利"),
+    UTILITY_MODEL_PATENT("实用新型专利"),
+    APPEARANCE_DESIGN_PATENT("外观设计专利");
+
+    private final String description;
+
+    public String getDescription() {
+        return description;
+    }
+
+    PatentType(String description) {
+        this.description = description;
+    }
+}

src/main/java/com/izouma/uwip/enums/PayStatus.java

@@ -0,0 +1,11 @@
+package com.izouma.uwip.enums;
+
+public enum PayStatus {
+    /*
+    已支付
+     */
+
+    /*
+    未支付
+     */
+}

src/main/java/com/izouma/uwip/enums/SupplierType.java

@@ -0,0 +1,12 @@
+package com.izouma.uwip.enums;
+
+public enum SupplierType {
+    /*
+    境内
+     */
+    DOMESTIC,
+    /*
+    境外
+     */
+    ABROAD
+}

src/test/java/com/izouma/uwip/repo/UserRepoTest.java

@@ -9,6 +9,7 @@ import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.test.context.junit4.SpringRunner;
 
+import java.util.Collections;
 import java.util.List;
 
 @RunWith(SpringRunner.class)
@@ -20,8 +21,9 @@ public class UserRepoTest {
     @Test
     public void testUser() {
         User user = User.builder()
-                .username("testuser")
-                .password("123")
+                .username("root")
+                .password("123456")
+                .authorities(Collections.singleton(Authority.builder().name("ROLE_ADMIN").build()))
                 .avatar("")
                 .build();
         userRepo.save(user);