设计数据库

src/main/java/com/izouma/awesomeAdmin/domain/Examiner.java

@@ -0,0 +1,44 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Where(clause = "del = 0")
+@ApiModel("考官信息")
+public class Examiner extends BaseEntity {
+    private String name;
+
+    private boolean sex;
+
+    private String phone;
+
+    private String documentType;
+
+    private String documentNo;
+
+    private boolean external;
+
+    private String specialtyName;
+
+    private String specialtyCode;
+
+    private String work;
+
+    private String position;
+
+    private String yearsOfStudy;
+
+    private String yearsOfWork;
+
+    private Long gradingOrganizationId;
+
+}

src/main/java/com/izouma/awesomeAdmin/domain/GradingOrganization.java

@@ -0,0 +1,50 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Where(clause = "del = 0")
+@ApiModel("考级机构")
+public class GradingOrganization extends BaseEntity {
+    private String name;
+
+    private String uscc;
+
+    private String certificateNo;
+
+    private LocalDate  firstIssueAt;
+
+    private String district;
+
+    private String address;
+
+    private String nature;
+
+    private String legalRepresentative;
+
+    private boolean sex;
+
+    private String documentType;
+
+    private String documentNo;
+
+    private String phone;
+
+    private String telephone;
+
+    private String nameOfPermanentInstitution;
+
+    private String communicationAddress;
+
+    private String head;
+}

src/main/java/com/izouma/awesomeAdmin/domain/GradingOrganizationSpecialty.java

@@ -0,0 +1,25 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Where(clause = "del = 0")
+@ApiModel("考级机构专业信息")
+public class GradingOrganizationSpecialty extends BaseEntity {
+    private String specialtyName;
+
+    private String specialtyCode;
+
+    private String level;
+
+    private Long gradingOrganizationId;
+}

src/main/java/com/izouma/awesomeAdmin/domain/GradingOrganizationStaff.java

@@ -0,0 +1,29 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Where(clause = "del = 0")
+@ApiModel("考级机构工作人员")
+public class GradingOrganizationStaff extends BaseEntity {
+    private String name;
+
+    private boolean sex;
+
+    private String documentNo;
+
+    private boolean specialDuty;
+
+    private String position;
+
+    private Long gradingOrganizationId;
+}

src/main/java/com/izouma/awesomeAdmin/domain/Organization.java

@@ -0,0 +1,45 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Entity
+@Where(clause = "del = 0")
+@ApiModel("承办单位")
+public class Organization extends BaseEntity {
+    private String name;
+
+    private String type;
+
+    private String uscc;
+
+    private String district;
+
+    private String address;
+
+    private String legalRepresentative;
+
+    private boolean sex;
+
+    private String documentType;
+
+    private String documentNo;
+
+    private String position;
+
+    private String telephone;
+
+    private String phone;
+
+    private Long gradingOrganizationId;
+
+
+}

src/main/java/com/izouma/awesomeAdmin/domain/Record.java

@@ -0,0 +1,80 @@
+package com.izouma.awesomeAdmin.domain;
+
+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.Entity;
+import java.time.LocalDate;
+
+@Data
+@Builder
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("备案管理")
+public class Record extends BaseEntity {
+    @ApiModelProperty(value = "考级活动名称")
+    private String examinationName;
+
+    @ApiModelProperty(value = "考级活动开始时间")
+    private LocalDate examinationStartTime;
+
+    @ApiModelProperty(value = "考级活动结束时间")
+    private LocalDate examinationEndTime;
+
+    @ApiModelProperty(value = "单位类别")
+    private String category;
+
+    @ApiModelProperty(value = "承办单位名称")
+    private String organizer;
+
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String uscc;
+
+    @ApiModelProperty(value = "考级地址")
+    private String district;
+
+    @ApiModelProperty(value = "考级详细地址")
+    private String examinationAddress;
+
+    @ApiModelProperty(value = "考场数量")
+    private int examCenterQuantity;
+
+    @ApiModelProperty(value = "报考人数")
+    private int examQuantity;
+
+    @ApiModelProperty(value = "考官人数")
+    private int examinerQuantity;
+
+    @ApiModelProperty(value = "考点负责人名称")
+    private String examOwner;
+
+    @ApiModelProperty(value = "考点负责人手机号")
+    private String examOwnerPhone;
+
+    @ApiModelProperty(value = "安全负责人名称")
+    private String securityOwner;
+
+    @ApiModelProperty(value = "安全负责人手机号")
+    private String securityOwnerPhone;
+
+    @ApiModelProperty(value = "备案时间")
+    private LocalDate recordTime;
+
+    private Long gradingOrganizationId;
+
+    private boolean afterTheExam;
+
+    @ApiModelProperty(value = "考试人数")
+    private Integer numOfCandidates;
+
+    @ApiModelProperty(value = "合格人数")
+    private Integer numOfQualified;
+
+    @ApiModelProperty(value = "考后备案时间")
+    private LocalDate afterRecordTime;
+}

src/main/java/com/izouma/awesomeAdmin/domain/RecordSpecialty.java

@@ -0,0 +1,45 @@
+package com.izouma.awesomeAdmin.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.hibernate.annotations.Where;
+
+import javax.persistence.Entity;
+import java.time.LocalDate;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@Builder
+@Entity
+@ApiModel("备案专业")
+@Where(clause = "del = 0")
+public class RecordSpecialty extends BaseEntity {
+    private Long recordId;
+
+    private String specialtyName;
+
+    private String specialtyCode;
+
+    @ApiModelProperty(value = "总级数")
+    private int level;
+
+    @ApiModelProperty(value = "考场数量")
+    private int numOfExam;
+
+    @ApiModelProperty(value = "考官人数")
+    private int examinerQuantity;
+
+    @ApiModelProperty(value = "考试人数")
+    private Integer numOfCandidates;
+
+    @ApiModelProperty(value = "合格人数")
+    private Integer numOfQualified;
+
+    @ApiModelProperty(value = "考后备案时间")
+    private LocalDate afterRecordTime;
+}

src/main/java/com/izouma/awesomeAdmin/domain/RecordSpecialtyExaminer.java

@@ -0,0 +1,22 @@
+package com.izouma.awesomeAdmin.domain;
+
+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.Entity;
+
+@Data
+@Builder
+@Entity
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel(value = "备案专业考官")
+public class RecordSpecialtyExaminer extends BaseEntity {
+    private Long recordSpecialtyId;
+
+    private Long examinerId;
+}

src/main/java/com/izouma/awesomeAdmin/domain/User.java

@@ -4,8 +4,6 @@ import com.alibaba.excel.annotation.ExcelIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.izouma.awesomeAdmin.annotations.Searchable;
 import com.izouma.awesomeAdmin.config.Constants;
-import com.izouma.awesomeAdmin.converter.FileObjectConverter;
-import com.izouma.awesomeAdmin.converter.FileObjectListConverter;
 import com.izouma.awesomeAdmin.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -19,7 +17,6 @@ import javax.validation.constraints.Pattern;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
 import java.util.HashSet;
-import java.util.List;
 import java.util.Set;
 
 @Data

src/main/resources/application.yaml

@@ -12,9 +12,12 @@ spring:
     profiles:
         active: dev
     datasource:
-        url: jdbc:mysql://mysql.izouma.com/awesome_admin_v2?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
-        username: microball
-        password: 2wsx@WSX#EDC
+#        url: jdbc:mysql://mysql.izouma.com/awesome_admin_v2?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+#        username: microball
+#        password: 2wsx@WSX#EDC
+        url: jdbc:mysql://localhost:3306/art_examination?useUnicode=true&characterEncoding=UTF-8&zeroDateTimeBehavior=convertToNull&allowMultiQueries=true&useSSL=false&serverTimezone=GMT%2b8
+        username: root
+        password: 12345678
         hikari:
             minimum-idle: 5
             maximum-pool-size: 30

src/test/java/com/izouma/awesomeAdmin/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,9 +21,10 @@ public class UserRepoTest {
     @Test
     public void testUser() {
         User user = User.builder()
-                .username("testuser")
-                .password("123")
+                .username("root")
+                .password("123456")
                 .avatar("")
+//                .authorities(Collections.singleton(Authority.builder().name("ROLE_ADMIN").build()))
                 .build();
         userRepo.save(user);
     }
@@ -37,7 +39,7 @@ public class UserRepoTest {
 
     @Test
     public void findAllByAuthoritiesContains() {
-        List<User> list = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.builder().name("ROLE_ADMIN").build());
-        System.out.println(list);
+//        List<User> list = userRepo.findAllByAuthoritiesContainsAndDelFalse(Authority.builder().name("ROLE_ADMIN").build());
+//        System.out.println(list);
     }
 }