改包名

pom.xml

@@ -9,10 +9,10 @@
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>com.izouma</groupId>
-    <artifactId>awesomeAdmin</artifactId>
+    <artifactId>artExamination</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>awesome-admin</name>
-    <description>awesome-admin</description>
+    <name>art-examination</name>
+    <description>art-examination</description>
 
     <repositories>
         <repository>
@@ -286,6 +286,15 @@
             <artifactId>pngquant4j</artifactId>
             <version>1.0</version>
         </dependency>
+
+        <!-- hutool -->
+        <dependency>
+            <groupId>cn.hutool</groupId>
+            <artifactId>hutool-all</artifactId>
+            <version>5.3.8</version>
+        </dependency>
     </dependencies>
 
+
+
 </project>

src/main/java/com/izouma/awesomeAdmin/Application.java → src/main/java/com/izouma/artExamination/Application.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin;
+package com.izouma.artExamination;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

src/main/java/com/izouma/awesomeAdmin/annotations/OperLog.java → src/main/java/com/izouma/artExamination/annotations/OperLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.annotations;
+package com.izouma.artExamination.annotations;
 
 import java.lang.annotation.*;
 

src/main/java/com/izouma/awesomeAdmin/annotations/Searchable.java → src/main/java/com/izouma/artExamination/annotations/Searchable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.annotations;
+package com.izouma.artExamination.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

src/main/java/com/izouma/awesomeAdmin/aspect/OperLogAspect.java → src/main/java/com/izouma/artExamination/aspect/OperLogAspect.java

@@ -1,14 +1,14 @@
-package com.izouma.awesomeAdmin.aspect;
+package com.izouma.artExamination.aspect;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.annotations.OperLog;
-import com.izouma.awesomeAdmin.domain.ExceptionLog;
-import com.izouma.awesomeAdmin.domain.OperationLog;
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.repo.ExceptionLogRepo;
-import com.izouma.awesomeAdmin.repo.OperationLogRepo;
-import com.izouma.awesomeAdmin.utils.IPUtils;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
+import com.izouma.artExamination.annotations.OperLog;
+import com.izouma.artExamination.domain.ExceptionLog;
+import com.izouma.artExamination.domain.OperationLog;
+import com.izouma.artExamination.domain.User;
+import com.izouma.artExamination.repo.ExceptionLogRepo;
+import com.izouma.artExamination.repo.OperationLogRepo;
+import com.izouma.artExamination.utils.IPUtils;
+import com.izouma.artExamination.utils.SecurityUtils;
 import org.aspectj.lang.JoinPoint;
 import org.aspectj.lang.annotation.AfterReturning;
 import org.aspectj.lang.annotation.AfterThrowing;
@@ -39,14 +39,14 @@ public class OperLogAspect {
     /**
      * 设置操作日志切入点 记录操作日志 在注解的位置切入代码
      */
-    @Pointcut("@annotation(com.izouma.awesomeAdmin.annotations.OperLog)")
+    @Pointcut("@annotation(com.izouma.artExamination.annotations.OperLog)")
     public void operLogPointCut() {
     }
 
     /**
      * 设置操作异常切入点记录异常日志 扫描所有controller包下操作
      */
-    @Pointcut("execution(* com.izouma.awesomeAdmin.web..*.*(..))")
+    @Pointcut("execution(* com.izouma.artExamination.web..*.*(..))")
     public void operExceptionLogPointCut() {
     }
 

src/main/java/com/izouma/awesomeAdmin/config/CacheConfig.java → src/main/java/com/izouma/artExamination/config/CacheConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import org.springframework.cache.CacheManager;
 import org.springframework.cache.annotation.EnableCaching;

src/main/java/com/izouma/awesomeAdmin/config/Constants.java → src/main/java/com/izouma/artExamination/config/Constants.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 public interface Constants {
 

src/main/java/com/izouma/awesomeAdmin/config/DateConfig.java → src/main/java/com/izouma/artExamination/config/DateConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import com.fasterxml.jackson.core.JsonGenerator;
 import com.fasterxml.jackson.core.JsonParser;

src/main/java/com/izouma/awesomeAdmin/config/LocalDateTimeSerializerConfig.java → src/main/java/com/izouma/artExamination/config/LocalDateTimeSerializerConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateSerializer;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;

src/main/java/com/izouma/awesomeAdmin/config/SpringSecurityAuditorAware.java → src/main/java/com/izouma/artExamination/config/SpringSecurityAuditorAware.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.utils.SecurityUtils;
+import com.izouma.artExamination.domain.User;
+import com.izouma.artExamination.utils.SecurityUtils;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.stereotype.Component;
 

src/main/java/com/izouma/awesomeAdmin/config/WebMvcConfig.java → src/main/java/com/izouma/artExamination/config/WebMvcConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;

src/main/java/com/izouma/awesomeAdmin/config/WxMaConfiguration.java → src/main/java/com/izouma/artExamination/config/WxMaConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import cn.binarywang.wx.miniapp.api.WxMaService;
 import cn.binarywang.wx.miniapp.api.impl.WxMaServiceImpl;

src/main/java/com/izouma/awesomeAdmin/config/WxMaProperties.java → src/main/java/com/izouma/artExamination/config/WxMaProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/config/WxMpConfiguration.java → src/main/java/com/izouma/artExamination/config/WxMpConfiguration.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
-import com.izouma.awesomeAdmin.mpHandler.LogHandler;
+import com.izouma.artExamination.mpHandler.LogHandler;
 import lombok.AllArgsConstructor;
 import me.chanjar.weixin.mp.api.WxMpMessageRouter;
 import me.chanjar.weixin.mp.api.WxMpService;

src/main/java/com/izouma/awesomeAdmin/config/WxMpProperties.java → src/main/java/com/izouma/artExamination/config/WxMpProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/config/WxPayConfiguration.java → src/main/java/com/izouma/artExamination/config/WxPayConfiguration.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import com.github.binarywang.wxpay.config.WxPayConfig;
 import com.github.binarywang.wxpay.service.WxPayService;

src/main/java/com/izouma/awesomeAdmin/config/WxPayProperties.java → src/main/java/com/izouma/artExamination/config/WxPayProperties.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.config;
+package com.izouma.artExamination.config;
 
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;

src/main/java/com/izouma/awesomeAdmin/converter/FileObjectConverter.java → src/main/java/com/izouma/artExamination/converter/FileObjectConverter.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.domain.FileObject;
+import com.izouma.artExamination.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.AttributeConverter;

src/main/java/com/izouma/awesomeAdmin/converter/FileObjectListConverter.java → src/main/java/com/izouma/artExamination/converter/FileObjectListConverter.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import com.alibaba.fastjson.JSON;
-import com.izouma.awesomeAdmin.domain.FileObject;
+import com.izouma.artExamination.domain.FileObject;
 import org.apache.commons.lang3.StringUtils;
 
 import javax.persistence.AttributeConverter;

src/main/java/com/izouma/awesomeAdmin/converter/JSONObjectConverter.java → src/main/java/com/izouma/artExamination/converter/JSONObjectConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;

src/main/java/com/izouma/awesomeAdmin/converter/LongArrayConverter.java → src/main/java/com/izouma/artExamination/converter/LongArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/izouma/awesomeAdmin/converter/StringArrayConverter.java → src/main/java/com/izouma/artExamination/converter/StringArrayConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import org.apache.commons.lang3.StringUtils;
 

src/main/java/com/izouma/awesomeAdmin/converter/StringToMapConverter.java → src/main/java/com/izouma/artExamination/converter/StringToMapConverter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.converter;
+package com.izouma.artExamination.converter;
 
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;

src/main/java/com/izouma/awesomeAdmin/domain/AuditedEntity.java → src/main/java/com/izouma/artExamination/domain/AuditedEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/izouma/awesomeAdmin/domain/BaseEntity.java → src/main/java/com/izouma/artExamination/domain/BaseEntity.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;

src/main/java/com/izouma/awesomeAdmin/domain/District.java → src/main/java/com/izouma/artExamination/domain/District.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
-import com.izouma.awesomeAdmin.annotations.Searchable;
-import com.izouma.awesomeAdmin.enums.DistrictLevel;
+import com.izouma.artExamination.annotations.Searchable;
+import com.izouma.artExamination.enums.DistrictLevel;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -0,0 +1,47 @@
+package com.izouma.artExamination.domain;
+
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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 uniqueCode;
+    @ApiModelProperty(value = "考官姓名")
+    private String name;
+    @ApiModelProperty(value = "性别")
+    private boolean sex;
+    @ApiModelProperty(value = "联系电话")
+    private String phone;
+    @ApiModelProperty(value = "证件类型")
+    private String documentType;
+    @ApiModelProperty(value = "证件号码")
+    private String documentNo;
+    @ApiModelProperty(value = "是否外聘")
+    private boolean external;
+    @ApiModelProperty(value = "专业名称")
+    private String specialtyName;
+    @ApiModelProperty(value = "专业代码")
+    private String specialtyCode;
+    @ApiModelProperty(value = "工作单位")
+    private String work;
+    @ApiModelProperty(value = "职称")
+    private String position;
+    @ApiModelProperty(value = "专业艺术学习年限")
+    private String yearsOfStudy;
+    @ApiModelProperty(value = "从事艺术工作年限")
+    private String yearsOfWork;
+    @ApiModelProperty(value = "所属考级机构唯一标识")
+    private String gradingOrganizationCode;
+
+}

src/main/java/com/izouma/awesomeAdmin/domain/ExceptionLog.java → src/main/java/com/izouma/artExamination/domain/ExceptionLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

src/main/java/com/izouma/awesomeAdmin/domain/FileObject.java → src/main/java/com/izouma/artExamination/domain/FileObject.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import lombok.Data;
 

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

@@ -0,0 +1,75 @@
+package com.izouma.artExamination.domain;
+
+import cn.hutool.core.bean.BeanUtil;
+import com.izouma.artExamination.dto.GradingOrganizationDTO;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+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    uniqueCode;
+    @ApiModelProperty(value = "考级单位名称")
+    private String    name;
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String    uscc;
+    @ApiModelProperty(value = "许可/备案证号")
+    private String    certificateNo;
+    @ApiModelProperty(value = "首发日期")
+    private LocalDate firstIssueAt;
+    @ApiModelProperty(value = "住所区划")
+    private String    district;
+    @ApiModelProperty(value = "详细地址")
+    private String    address;
+    @ApiModelProperty(value = "单位性质")
+    private String    nature;
+    @ApiModelProperty(value = "法定代表人")
+    private String    legalRepresentative;
+    @ApiModelProperty(value = "性别")
+    private boolean   sex;
+    @ApiModelProperty(value = "证件类型")
+    private String    documentType;
+    @ApiModelProperty(value = "证件号")
+    private String    documentNo;
+    @ApiModelProperty(value = "移动电话")
+    private String    phone;
+    @ApiModelProperty(value = "固定电话")
+    private String    telephone;
+    @ApiModelProperty(value = "常设机构名称")
+    private String    nameOfPermanentInstitution;
+    @ApiModelProperty(value = "通信详细地址")
+    private String    communicationAddress;
+    @ApiModelProperty(value = "机构负责人")
+    private String    head;
+    @ApiModelProperty(value = "负责人性别")
+    private String    headSex;
+    @ApiModelProperty(value = "负责人职务")
+    private String    headPosition;
+    @ApiModelProperty(value = "负责人政治面貌")
+    private String    politicalAffiliation;
+    @ApiModelProperty(value = "负责人证件类型")
+    private String    headDocumentType;
+    @ApiModelProperty(value = "负责人证件号码")
+    private String    headDocumentNo;
+    @ApiModelProperty(value = "负责人移动电话")
+    private String    headPhone;
+    @ApiModelProperty(value = "负责人固定电话")
+    private String    headTelephone;
+    @ApiModelProperty(value = "单位传真")
+    private String    fax;
+
+    public GradingOrganization(GradingOrganizationDTO dto) {
+        BeanUtil.copyProperties(this, dto);
+    }
+}

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

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

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

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -15,6 +15,8 @@ import javax.persistence.Entity;
 @Where(clause = "del = 0")
 @ApiModel("考级机构工作人员")
 public class GradingOrganizationStaff extends BaseEntity {
+    private String uniqueCode;
+
     private String name;
 
     private boolean sex;
@@ -25,5 +27,5 @@ public class GradingOrganizationStaff extends BaseEntity {
 
     private String position;
 
-    private Long gradingOrganizationId;
+    private String gradingOrganizationCode;
 }

src/main/java/com/izouma/awesomeAdmin/domain/Menu.java → src/main/java/com/izouma/artExamination/domain/Menu.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import com.alibaba.excel.annotation.ExcelIgnore;
-import com.izouma.awesomeAdmin.dto.MenuDTO;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.artExamination.dto.MenuDTO;
+import com.izouma.artExamination.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/awesomeAdmin/domain/OperationLog.java → src/main/java/com/izouma/artExamination/domain/OperationLog.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;

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

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
@@ -15,6 +15,8 @@ import javax.persistence.Entity;
 @Where(clause = "del = 0")
 @ApiModel("承办单位")
 public class Organization extends BaseEntity {
+    private String uniqueCode;
+
     private String name;
 
     private String type;
@@ -39,7 +41,7 @@ public class Organization extends BaseEntity {
 
     private String phone;
 
-    private Long gradingOrganizationId;
+    private String gradingOrganizationCode;
 
 
 }

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

@@ -1,5 +1,7 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
+import cn.hutool.core.bean.BeanUtil;
+import com.izouma.artExamination.dto.RecordDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -17,6 +19,8 @@ import java.time.LocalDate;
 @NoArgsConstructor
 @ApiModel("备案管理")
 public class Record extends BaseEntity {
+    private String uniqueCode;
+
     @ApiModelProperty(value = "考级活动名称")
     private String examinationName;
 
@@ -77,4 +81,8 @@ public class Record extends BaseEntity {
 
     @ApiModelProperty(value = "考后备案时间")
     private LocalDate afterRecordTime;
+
+    public Record(RecordDTO dto) {
+        BeanUtil.copyProperties(this, dto);
+    }
 }

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

@@ -1,5 +1,8 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
+import com.izouma.artExamination.converter.LongArrayConverter;
+import com.izouma.artExamination.converter.StringArrayConverter;
+import com.izouma.artExamination.dto.RecordSpecialtyDTO;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
@@ -8,8 +11,10 @@ import lombok.Data;
 import lombok.NoArgsConstructor;
 import org.hibernate.annotations.Where;
 
+import javax.persistence.Convert;
 import javax.persistence.Entity;
 import java.time.LocalDate;
+import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -19,14 +24,16 @@ import java.time.LocalDate;
 @ApiModel("备案专业")
 @Where(clause = "del = 0")
 public class RecordSpecialty extends BaseEntity {
-    private Long recordId;
+    private String uniqueCode;
+
+    private String recordCode;
 
     private String specialtyName;
 
     private String specialtyCode;
 
     @ApiModelProperty(value = "总级数")
-    private int level;
+    private String level;
 
     @ApiModelProperty(value = "考场数量")
     private int numOfExam;
@@ -34,6 +41,8 @@ public class RecordSpecialty extends BaseEntity {
     @ApiModelProperty(value = "考官人数")
     private int examinerQuantity;
 
+    private boolean afterTheExam;
+
     @ApiModelProperty(value = "考试人数")
     private Integer numOfCandidates;
 
@@ -42,4 +51,8 @@ public class RecordSpecialty extends BaseEntity {
 
     @ApiModelProperty(value = "考后备案时间")
     private LocalDate afterRecordTime;
+
+    @Convert(converter = StringArrayConverter.class)
+    private List<String> examinerCode;
+
 }

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

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import io.swagger.annotations.ApiModel;
-import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,7 +15,9 @@ import javax.persistence.Entity;
 @NoArgsConstructor
 @ApiModel(value = "备案专业考官")
 public class RecordSpecialtyExaminer extends BaseEntity {
-    private Long recordSpecialtyId;
+    private String uniqueCode;
 
-    private Long examinerId;
+    private String recordSpecialtyCode;
+
+    private String examinerCode;
 }

src/main/java/com/izouma/awesomeAdmin/domain/SmsRecord.java → src/main/java/com/izouma/artExamination/domain/SmsRecord.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;

src/main/java/com/izouma/awesomeAdmin/domain/SuperUser.java → src/main/java/com/izouma/artExamination/domain/SuperUser.java

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 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.security.Authority;
+import com.izouma.artExamination.annotations.Searchable;
+import com.izouma.artExamination.config.Constants;
+import com.izouma.artExamination.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/izouma/awesomeAdmin/domain/SysConfig.java → src/main/java/com/izouma/artExamination/domain/SysConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;

src/main/java/com/izouma/awesomeAdmin/domain/TestClass.java → src/main/java/com/izouma/artExamination/domain/TestClass.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 import lombok.AllArgsConstructor;
 import lombok.Builder;

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

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.domain;
+package com.izouma.artExamination.domain;
 
 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.security.Authority;
+import com.izouma.artExamination.annotations.Searchable;
+import com.izouma.artExamination.config.Constants;
+import com.izouma.artExamination.security.Authority;
 import io.swagger.annotations.ApiModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;

src/main/java/com/izouma/awesomeAdmin/dto/Captcha.java → src/main/java/com/izouma/artExamination/dto/Captcha.java

@@ -1,7 +1,6 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.artExamination.dto;
 
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Data;
 
 @Data

src/main/java/com/izouma/artExamination/dto/GradingOrganizationDTO.java

@@ -0,0 +1,74 @@
+package com.izouma.artExamination.dto;
+
+import com.izouma.artExamination.domain.BaseEntity;
+import com.izouma.artExamination.domain.GradingOrganizationSpecialty;
+import com.izouma.artExamination.domain.GradingOrganizationStaff;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+@ApiModel("考级机构")
+public class GradingOrganizationDTO {
+    private String uniqueCode;
+    private Long      id;
+    @ApiModelProperty(value = "考级单位名称")
+    private String    name;
+    @ApiModelProperty(value = "统一社会信用代码")
+    private String    uscc;
+    @ApiModelProperty(value = "许可/备案证号")
+    private String    certificateNo;
+    @ApiModelProperty(value = "首发日期")
+    private LocalDate firstIssueAt;
+    @ApiModelProperty(value = "住所区划")
+    private String    district;
+    @ApiModelProperty(value = "详细地址")
+    private String    address;
+    @ApiModelProperty(value = "单位性质")
+    private String    nature;
+    @ApiModelProperty(value = "法定代表人")
+    private String    legalRepresentative;
+    @ApiModelProperty(value = "性别")
+    private boolean   sex;
+    @ApiModelProperty(value = "证件类型")
+    private String    documentType;
+    @ApiModelProperty(value = "证件号")
+    private String    documentNo;
+    @ApiModelProperty(value = "移动电话")
+    private String    phone;
+    @ApiModelProperty(value = "固定电话")
+    private String    telephone;
+    @ApiModelProperty(value = "常设机构名称")
+    private String    nameOfPermanentInstitution;
+    @ApiModelProperty(value = "通信详细地址")
+    private String    communicationAddress;
+    @ApiModelProperty(value = "机构负责人")
+    private String    head;
+    @ApiModelProperty(value = "负责人性别")
+    private String    headSex;
+    @ApiModelProperty(value = "负责人职务")
+    private String    headPosition;
+    @ApiModelProperty(value = "负责人政治面貌")
+    private String    politicalAffiliation;
+    @ApiModelProperty(value = "负责人证件类型")
+    private String    headDocumentType;
+    @ApiModelProperty(value = "负责人证件号码")
+    private String    headDocumentNo;
+    @ApiModelProperty(value = "负责人移动电话")
+    private String    headPhone;
+    @ApiModelProperty(value = "负责人固定电话")
+    private String    headTelephone;
+    @ApiModelProperty(value = "单位传真")
+    private String    fax;
+
+    List<GradingOrganizationStaff> staffs;
+
+    List<GradingOrganizationSpecialty> specialties;
+}

src/main/java/com/izouma/awesomeAdmin/dto/MenuDTO.java → src/main/java/com/izouma/artExamination/dto/MenuDTO.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.artExamination.dto;
 
 public interface MenuDTO {
     Long getId();

src/main/java/com/izouma/awesomeAdmin/dto/PageQuery.java → src/main/java/com/izouma/artExamination/dto/PageQuery.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.artExamination.dto;
 
 import lombok.Data;
 

src/main/java/com/izouma/artExamination/dto/RecordDTO.java

@@ -0,0 +1,80 @@
+package com.izouma.artExamination.dto;
+
+import com.izouma.artExamination.domain.RecordSpecialty;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class RecordDTO {
+    private String uniqueCode;
+    private Long id;
+
+    @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 String gradingOrganizationCode;
+
+    private boolean afterTheExam;
+
+    @ApiModelProperty(value = "考试人数")
+    private Integer numOfCandidates;
+
+    @ApiModelProperty(value = "合格人数")
+    private Integer numOfQualified;
+
+    @ApiModelProperty(value = "考后备案时间")
+    private LocalDate afterRecordTime;
+
+    List<RecordSpecialty> specialties;
+
+}

src/main/java/com/izouma/artExamination/dto/RecordSpecialtyDTO.java

@@ -0,0 +1,39 @@
+package com.izouma.artExamination.dto;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.util.List;
+
+@Data
+@NoArgsConstructor
+public class RecordSpecialtyDTO {
+    private String uniqueCode;
+    private Long id;
+
+    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;
+
+    private List<Long> examiners;
+}

src/main/java/com/izouma/awesomeAdmin/dto/UserRegister.java → src/main/java/com/izouma/artExamination/dto/UserRegister.java

@@ -1,8 +1,8 @@
-package com.izouma.awesomeAdmin.dto;
+package com.izouma.artExamination.dto;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonInclude;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.artExamination.security.Authority;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/awesomeAdmin/dto/gen/GenCode.java → src/main/java/com/izouma/artExamination/dto/gen/GenCode.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.artExamination.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

src/main/java/com/izouma/awesomeAdmin/dto/gen/Subtable.java → src/main/java/com/izouma/artExamination/dto/gen/Subtable.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.artExamination.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

src/main/java/com/izouma/awesomeAdmin/dto/gen/TableField.java → src/main/java/com/izouma/artExamination/dto/gen/TableField.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.dto.gen;
+package com.izouma.artExamination.dto.gen;
 
 
 import com.fasterxml.jackson.annotation.JsonAutoDetect;

src/main/java/com/izouma/awesomeAdmin/enums/AuthorityName.java → src/main/java/com/izouma/artExamination/enums/AuthorityName.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.enums;
+package com.izouma.artExamination.enums;
 
 public enum AuthorityName {
     ROLE_USER("普通用户"),

src/main/java/com/izouma/awesomeAdmin/enums/DistrictLevel.java → src/main/java/com/izouma/artExamination/enums/DistrictLevel.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.enums;
+package com.izouma.artExamination.enums;
 
 public enum DistrictLevel {
     PROVINCE(1),

src/main/java/com/izouma/awesomeAdmin/exception/AuthenticationException.java → src/main/java/com/izouma/artExamination/exception/AuthenticationException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.artExamination.exception;
 
 public class AuthenticationException extends RuntimeException {
     public AuthenticationException(String message, Throwable cause) {

src/main/java/com/izouma/awesomeAdmin/exception/BusinessException.java → src/main/java/com/izouma/artExamination/exception/BusinessException.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.artExamination.exception;
 
 import java.util.function.Supplier;
 

src/main/java/com/izouma/awesomeAdmin/exception/GlobalExceptionHandler.java → src/main/java/com/izouma/artExamination/exception/GlobalExceptionHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.exception;
+package com.izouma.artExamination.exception;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;

src/main/java/com/izouma/awesomeAdmin/mpHandler/LogHandler.java → src/main/java/com/izouma/artExamination/mpHandler/LogHandler.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.mpHandler;
+package com.izouma.artExamination.mpHandler;
 
 import lombok.extern.slf4j.Slf4j;
 import me.chanjar.weixin.common.session.WxSessionManager;

src/main/java/com/izouma/awesomeAdmin/repo/AuthorityRepo.java → src/main/java/com/izouma/artExamination/repo/AuthorityRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.artExamination.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface AuthorityRepo extends JpaRepository<Authority, String> {

src/main/java/com/izouma/awesomeAdmin/repo/DistrictRepo.java → src/main/java/com/izouma/artExamination/repo/DistrictRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.District;
+import com.izouma.artExamination.domain.District;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/artExamination/repo/ExaminerRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.Examiner;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface ExaminerRepo extends JpaRepository<Examiner, Long>, JpaSpecificationExecutor<Examiner> {
+    @Query("update Examiner t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/awesomeAdmin/repo/ExceptionLogRepo.java → src/main/java/com/izouma/artExamination/repo/ExceptionLogRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.ExceptionLog;
+import com.izouma.artExamination.domain.ExceptionLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/artExamination/repo/GradingOrganizationRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.GradingOrganization;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface GradingOrganizationRepo extends JpaRepository<GradingOrganization, Long>, JpaSpecificationExecutor<GradingOrganization> {
+    @Query("update GradingOrganization t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/artExamination/repo/GradingOrganizationSpecialtyRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.GradingOrganizationSpecialty;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface GradingOrganizationSpecialtyRepo extends JpaRepository<GradingOrganizationSpecialty, Long>, JpaSpecificationExecutor<GradingOrganizationSpecialty> {
+    @Query("update GradingOrganizationSpecialty t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/artExamination/repo/GradingOrganizationStaffRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.GradingOrganizationStaff;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface GradingOrganizationStaffRepo extends JpaRepository<GradingOrganizationStaff, Long>, JpaSpecificationExecutor<GradingOrganizationStaff> {
+    @Query("update GradingOrganizationStaff t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/awesomeAdmin/repo/MenuRepo.java → src/main/java/com/izouma/artExamination/repo/MenuRepo.java

@@ -1,8 +1,7 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.Menu;
-import com.izouma.awesomeAdmin.dto.MenuDTO;
-import org.hibernate.annotations.Where;
+import com.izouma.artExamination.domain.Menu;
+import com.izouma.artExamination.dto.MenuDTO;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/izouma/awesomeAdmin/repo/OperationLogRepo.java → src/main/java/com/izouma/artExamination/repo/OperationLogRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.OperationLog;
+import com.izouma.artExamination.domain.OperationLog;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/artExamination/repo/OrganizationRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.Organization;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface OrganizationRepo extends JpaRepository<Organization, Long>, JpaSpecificationExecutor<Organization> {
+    @Query("update Organization t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/artExamination/repo/RecordRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.Record;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface RecordRepo extends JpaRepository<Record, Long>, JpaSpecificationExecutor<Record> {
+    @Query("update Record t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/artExamination/repo/RecordSpecialtyExaminerRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.RecordSpecialtyExaminer;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface RecordSpecialtyExaminerRepo extends JpaRepository<RecordSpecialtyExaminer, Long>, JpaSpecificationExecutor<RecordSpecialtyExaminer> {
+    @Query("update RecordSpecialtyExaminer t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/artExamination/repo/RecordSpecialtyRepo.java

@@ -0,0 +1,16 @@
+package com.izouma.artExamination.repo;
+
+import com.izouma.artExamination.domain.RecordSpecialty;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
+import org.springframework.data.jpa.repository.Modifying;
+import org.springframework.data.jpa.repository.Query;
+
+import javax.transaction.Transactional;
+
+public interface RecordSpecialtyRepo extends JpaRepository<RecordSpecialty, Long>, JpaSpecificationExecutor<RecordSpecialty> {
+    @Query("update RecordSpecialty t set t.del = true where t.id = ?1")
+    @Modifying
+    @Transactional
+    void softDelete(Long id);
+}

src/main/java/com/izouma/awesomeAdmin/repo/SmsRecordRepo.java → src/main/java/com/izouma/artExamination/repo/SmsRecordRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.SmsRecord;
+import com.izouma.artExamination.domain.SmsRecord;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;

src/main/java/com/izouma/awesomeAdmin/repo/SysConfigRepo.java → src/main/java/com/izouma/artExamination/repo/SysConfigRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
+import com.izouma.artExamination.domain.SysConfig;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 

src/main/java/com/izouma/awesomeAdmin/repo/TestClassRepo.java → src/main/java/com/izouma/artExamination/repo/TestClassRepo.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.TestClass;
+import com.izouma.artExamination.domain.TestClass;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/izouma/awesomeAdmin/repo/UserRepo.java → src/main/java/com/izouma/artExamination/repo/UserRepo.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.repo;
+package com.izouma.artExamination.repo;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.security.Authority;
+import com.izouma.artExamination.domain.User;
+import com.izouma.artExamination.security.Authority;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.JpaSpecificationExecutor;
 import org.springframework.data.jpa.repository.Modifying;

src/main/java/com/izouma/awesomeAdmin/security/Authority.java → src/main/java/com/izouma/artExamination/security/Authority.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.izouma.awesomeAdmin.enums.AuthorityName;
+import com.izouma.artExamination.enums.AuthorityName;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;

src/main/java/com/izouma/awesomeAdmin/security/JwtAuthenticationEntryPoint.java → src/main/java/com/izouma/artExamination/security/JwtAuthenticationEntryPoint.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import org.springframework.security.core.AuthenticationException;
 import org.springframework.security.web.AuthenticationEntryPoint;

src/main/java/com/izouma/awesomeAdmin/security/JwtAuthorizationTokenFilter.java → src/main/java/com/izouma/artExamination/security/JwtAuthorizationTokenFilter.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import io.jsonwebtoken.ExpiredJwtException;
 import io.jsonwebtoken.SignatureException;

src/main/java/com/izouma/awesomeAdmin/security/JwtConfig.java → src/main/java/com/izouma/artExamination/security/JwtConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import lombok.Data;
 import org.springframework.boot.context.properties.ConfigurationProperties;

src/main/java/com/izouma/awesomeAdmin/security/JwtTokenUtil.java → src/main/java/com/izouma/artExamination/security/JwtTokenUtil.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import edu.umd.cs.findbugs.annotations.SuppressFBWarnings;
 import io.jsonwebtoken.Claims;

src/main/java/com/izouma/awesomeAdmin/security/JwtUser.java → src/main/java/com/izouma/artExamination/security/JwtUser.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.artExamination.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.userdetails.UserDetails;
 

src/main/java/com/izouma/awesomeAdmin/security/JwtUserDetailsService.java → src/main/java/com/izouma/artExamination/security/JwtUserDetailsService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
-import com.izouma.awesomeAdmin.domain.User;
-import com.izouma.awesomeAdmin.repo.UserRepo;
+import com.izouma.artExamination.domain.User;
+import com.izouma.artExamination.repo.UserRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.security.core.userdetails.UserDetails;
 import org.springframework.security.core.userdetails.UserDetailsService;

src/main/java/com/izouma/awesomeAdmin/security/JwtUserFactory.java → src/main/java/com/izouma/artExamination/security/JwtUserFactory.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
-import com.izouma.awesomeAdmin.domain.User;
+import com.izouma.artExamination.domain.User;
 import org.springframework.security.core.GrantedAuthority;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
 

src/main/java/com/izouma/awesomeAdmin/security/WebSecurityConfig.java → src/main/java/com/izouma/artExamination/security/WebSecurityConfig.java

@@ -1,4 +1,4 @@
-package com.izouma.awesomeAdmin.security;
+package com.izouma.artExamination.security;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;

src/main/java/com/izouma/awesomeAdmin/service/CaptchaService.java → src/main/java/com/izouma/artExamination/service/CaptchaService.java

@@ -1,19 +1,17 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.dto.Captcha;
+import com.izouma.artExamination.dto.Captcha;
 import com.wf.captcha.SpecCaptcha;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.ehcache.UserManagedCache;
 import org.ehcache.config.builders.ExpiryPolicyBuilder;
 import org.ehcache.config.builders.UserManagedCacheBuilder;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.awt.*;
 import java.io.IOException;
 import java.time.Duration;
-import java.util.Objects;
 import java.util.UUID;
 
 @Service

src/main/java/com/izouma/awesomeAdmin/service/DistrictService.java → src/main/java/com/izouma/artExamination/service/DistrictService.java

@@ -1,12 +1,12 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
 import com.alibaba.fastjson.JSON;
 import com.github.kevinsawicki.http.HttpRequest;
-import com.izouma.awesomeAdmin.domain.District;
-import com.izouma.awesomeAdmin.enums.DistrictLevel;
-import com.izouma.awesomeAdmin.repo.DistrictRepo;
-import com.izouma.awesomeAdmin.utils.amap.DistrictsItem;
-import com.izouma.awesomeAdmin.utils.amap.QueryDistrictResponse;
+import com.izouma.artExamination.domain.District;
+import com.izouma.artExamination.enums.DistrictLevel;
+import com.izouma.artExamination.repo.DistrictRepo;
+import com.izouma.artExamination.utils.amap.DistrictsItem;
+import com.izouma.artExamination.utils.amap.QueryDistrictResponse;
 import lombok.AllArgsConstructor;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.data.jpa.domain.Specification;

src/main/java/com/izouma/artExamination/service/ExaminerService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.Examiner;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.ExaminerRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class ExaminerService {
+
+    private ExaminerRepo examinerRepo;
+
+    public Page<Examiner> all(PageQuery pageQuery) {
+        return examinerRepo.findAll(JpaUtils.toSpecification(pageQuery, Examiner.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/awesomeAdmin/service/ExceptionLogService.java → src/main/java/com/izouma/artExamination/service/ExceptionLogService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.repo.ExceptionLogRepo;
+import com.izouma.artExamination.repo.ExceptionLogRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/izouma/awesomeAdmin/service/GenCodeService.java → src/main/java/com/izouma/artExamination/service/GenCodeService.java

@@ -1,7 +1,7 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.dto.gen.GenCode;
-import com.izouma.awesomeAdmin.dto.gen.TableField;
+import com.izouma.artExamination.dto.gen.GenCode;
+import com.izouma.artExamination.dto.gen.TableField;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
@@ -15,7 +15,6 @@ import java.awt.*;
 import java.awt.font.FontRenderContext;
 import java.awt.geom.AffineTransform;
 import java.io.*;
-import java.lang.reflect.Field;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.nio.file.Paths;

src/main/java/com/izouma/artExamination/service/GradingOrganizationService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.GradingOrganization;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.GradingOrganizationRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class GradingOrganizationService {
+
+    private GradingOrganizationRepo gradingOrganizationRepo;
+
+    public Page<GradingOrganization> all(PageQuery pageQuery) {
+        return gradingOrganizationRepo.findAll(JpaUtils.toSpecification(pageQuery, GradingOrganization.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/artExamination/service/GradingOrganizationSpecialtyService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.GradingOrganizationSpecialty;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.GradingOrganizationSpecialtyRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class GradingOrganizationSpecialtyService {
+
+    private GradingOrganizationSpecialtyRepo gradingOrganizationSpecialtyRepo;
+
+    public Page<GradingOrganizationSpecialty> all(PageQuery pageQuery) {
+        return gradingOrganizationSpecialtyRepo.findAll(JpaUtils.toSpecification(pageQuery, GradingOrganizationSpecialty.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/artExamination/service/GradingOrganizationStaffService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.GradingOrganizationStaff;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.GradingOrganizationStaffRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class GradingOrganizationStaffService {
+
+    private GradingOrganizationStaffRepo gradingOrganizationStaffRepo;
+
+    public Page<GradingOrganizationStaff> all(PageQuery pageQuery) {
+        return gradingOrganizationStaffRepo.findAll(JpaUtils.toSpecification(pageQuery, GradingOrganizationStaff.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/awesomeAdmin/service/OperationLogService.java → src/main/java/com/izouma/artExamination/service/OperationLogService.java

@@ -1,6 +1,6 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.repo.OperationLogRepo;
+import com.izouma.artExamination.repo.OperationLogRepo;
 import lombok.AllArgsConstructor;
 import org.springframework.stereotype.Service;
 

src/main/java/com/izouma/artExamination/service/OrganizationService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.Organization;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.OrganizationRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class OrganizationService {
+
+    private OrganizationRepo organizationRepo;
+
+    public Page<Organization> all(PageQuery pageQuery) {
+        return organizationRepo.findAll(JpaUtils.toSpecification(pageQuery, Organization.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/artExamination/service/RecordService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.Record;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.RecordRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RecordService {
+
+    private RecordRepo recordRepo;
+
+    public Page<Record> all(PageQuery pageQuery) {
+        return recordRepo.findAll(JpaUtils.toSpecification(pageQuery, Record.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/artExamination/service/RecordSpecialtyExaminerService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.RecordSpecialtyExaminer;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.RecordSpecialtyExaminerRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RecordSpecialtyExaminerService {
+
+    private RecordSpecialtyExaminerRepo recordSpecialtyExaminerRepo;
+
+    public Page<RecordSpecialtyExaminer> all(PageQuery pageQuery) {
+        return recordSpecialtyExaminerRepo.findAll(JpaUtils.toSpecification(pageQuery, RecordSpecialtyExaminer.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/artExamination/service/RecordSpecialtyService.java

@@ -0,0 +1,20 @@
+package com.izouma.artExamination.service;
+
+import com.izouma.artExamination.domain.RecordSpecialty;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.RecordSpecialtyRepo;
+import com.izouma.artExamination.utils.JpaUtils;
+import lombok.AllArgsConstructor;
+import org.springframework.data.domain.Page;
+import org.springframework.stereotype.Service;
+
+@Service
+@AllArgsConstructor
+public class RecordSpecialtyService {
+
+    private RecordSpecialtyRepo recordSpecialtyRepo;
+
+    public Page<RecordSpecialty> all(PageQuery pageQuery) {
+        return recordSpecialtyRepo.findAll(JpaUtils.toSpecification(pageQuery, RecordSpecialty.class), JpaUtils.toPageRequest(pageQuery));
+    }
+}

src/main/java/com/izouma/awesomeAdmin/service/SysConfigService.java → src/main/java/com/izouma/artExamination/service/SysConfigService.java

@@ -1,10 +1,10 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.domain.SysConfig;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.exception.BusinessException;
-import com.izouma.awesomeAdmin.repo.SysConfigRepo;
-import com.izouma.awesomeAdmin.utils.JpaUtils;
+import com.izouma.artExamination.domain.SysConfig;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.exception.BusinessException;
+import com.izouma.artExamination.repo.SysConfigRepo;
+import com.izouma.artExamination.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;

src/main/java/com/izouma/awesomeAdmin/service/TestClassService.java → src/main/java/com/izouma/artExamination/service/TestClassService.java

@@ -1,9 +1,9 @@
-package com.izouma.awesomeAdmin.service;
+package com.izouma.artExamination.service;
 
-import com.izouma.awesomeAdmin.domain.TestClass;
-import com.izouma.awesomeAdmin.dto.PageQuery;
-import com.izouma.awesomeAdmin.repo.TestClassRepo;
-import com.izouma.awesomeAdmin.utils.JpaUtils;
+import com.izouma.artExamination.domain.TestClass;
+import com.izouma.artExamination.dto.PageQuery;
+import com.izouma.artExamination.repo.TestClassRepo;
+import com.izouma.artExamination.utils.JpaUtils;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.stereotype.Service;