整理部分代码

pom.xml

@@ -178,22 +178,19 @@
             <artifactId>ehcache</artifactId>
         </dependency>
 
-        <!--第一种方式导入校验依赖-->
+<!--后端校验的依赖-->
         <dependency>
             <groupId>javax.validation</groupId>
             <artifactId>validation-api</artifactId>
             <version>2.0.1.Final</version>
         </dependency>
+
         <dependency>
             <groupId>org.springframework.cloud</groupId>
             <artifactId>spring-cloud-commons</artifactId>
             <version>2.2.3.RELEASE</version>
         </dependency>
-<!--        <dependency>-->
-<!--            <groupId>com.github.github.pagehelper</groupId>-->
-<!--            <artifactId>pagehelper</artifactId>-->
-<!--            <version>5.0.1</version>-->
-<!--        </dependency>-->
+
         <dependency>
             <groupId>com.github.pagehelper</groupId>
             <artifactId>pagehelper-spring-boot-starter</artifactId>
@@ -219,9 +216,12 @@
             <scope>test</scope>
         </dependency>
 
-    </dependencies>
-
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
 
+    </dependencies>
 
 
     <build>

src/main/java/com/chuanghai/repair/controller/WorkController.java

@@ -7,6 +7,7 @@ import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
+import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;

src/main/java/com/chuanghai/repair/entity/RepairsAdmin.java

@@ -44,7 +44,7 @@ public class RepairsAdmin {
     /**
      * 手机号码
      */
-    @Pattern(regexp = "\\d{11}",message = "必须为数字，并且长度为11")
+    @Pattern(regexp = "^1(3|4|5|7|8)\\d{9}$",message = "手机号码格式错误")
     @ApiModelProperty(value = "管理员手机号码")
     @Column(name = "admin_phone")
     private String adminPhone;
@@ -53,7 +53,6 @@ public class RepairsAdmin {
      * 状态 1（启用） 0（未启用）
      */
     @ApiModelProperty(value = "状态 1（启用） 0（未启用）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "admin_status")
     private String adminStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsFault.java

@@ -39,7 +39,6 @@ public class RepairsFault {
      * 故障类型状态 1（启用）0（停用）
      */
     @ApiModelProperty(value = "故障状态 1（启用）0（停用）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "fault_status")
     private String faultStatus;
 
@@ -48,7 +47,6 @@ public class RepairsFault {
      * 故障类型 0（水电工）1（空调工）2（木工）
      */
     @ApiModelProperty(value = "故障类型 0（水电工）1（空调工）2（木工）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "fault_type")
     private String faultType;
 

src/main/java/com/chuanghai/repair/entity/RepairsNotice.java

@@ -39,7 +39,6 @@ public class RepairsNotice {
      * 公告状态 0（删除）1（启用）
      */
     @ApiModelProperty(value = "公告状态 0（删除）1（启用）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "notice_status")
     private String noticeStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsOrder.java

@@ -69,7 +69,6 @@ public class RepairsOrder {
      * 订单状态 0（待接单）1（已接单）2（维修完成）3（退单）
      */
     @ApiModelProperty(value = "订单状态 0（新订单）1（待接单）2（已接单）3（维修完成）4（退单）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "order_status")
     private String orderStatus;
 
@@ -84,7 +83,6 @@ public class RepairsOrder {
      * 支付状态 0（未支付）1（已支付）
      */
     @ApiModelProperty(value = "支付状态 0（未支付）1（已支付）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "order_price_status")
     private String orderPriceStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsStudent.java

@@ -32,13 +32,13 @@ public class RepairsStudent {
      * 学生性别
      */
     @ApiModelProperty(value = "学生性别 0(男) 1（女）")//  grade
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "student_sex")
     private String studentSex;
 
     /**
      * 手机号码
      */
+    @Pattern(regexp = "^1(3|4|5|7|8)\\d{9}$",message = "手机号码格式错误")
     @ApiModelProperty(value = "学生手机号码") //key:telephone，value:(+86)15179443822
     @Column(name = "student_phone")
     private String studentPhone;
@@ -46,6 +46,7 @@ public class RepairsStudent {
     /**
      * 备选手机号码
      */
+    @Pattern(regexp = "^1(3|4|5|7|8)\\d{9}$",message = "手机号码格式错误")
     @ApiModelProperty(value = "备选手机号码")
     @Column(name = "student_other_phone")
     private String studentOtherPhone;
@@ -68,7 +69,6 @@ public class RepairsStudent {
      * 学生校区0（黄家湖校区）1（靖安校区）
      */
     @ApiModelProperty(value ="学生校区0（黄家湖校区）1（靖安校区）" ) //key:campus，value:
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "student_campus")
     private String studentCampus;
 
@@ -84,7 +84,6 @@ public class RepairsStudent {
      * 学生状态 0（未毕业）1（已毕业）
      */
     @ApiModelProperty(value = "学生状态 0（未毕业）1（已毕业）")
-    @Pattern(regexp = "\\d{1}",message = "必须为数字，并且长度为1")
     @Column(name = "student_status")
     private String studentStatus;
 

src/main/java/com/chuanghai/repair/entity/RepairsWork.java

@@ -4,10 +4,12 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.*;
 
 import javax.persistence.*;
+import javax.validation.constraints.NotBlank;
 import javax.validation.constraints.NotEmpty;
 import javax.validation.constraints.Pattern;
 
 
+
 @NoArgsConstructor
 @AllArgsConstructor
 @Setter
@@ -43,7 +45,8 @@ public class RepairsWork {
     /**
      * 维修工手机号码
      */
-    @Pattern(regexp = "\\d{11}",message = "必须为数字，并且长度为11")
+    @Pattern(regexp = "^(((13[0-9])|(14[579])|(15([0-3]|[5-9]))|(16[6])|(17[0135678])|(18[0-9])|(19[89]))\\d{8})$", message = "手机号格式错误")
+    @NotBlank(message = "手机号码不能为空")
     @ApiModelProperty(value = "维修工手机号码")
     @Column(name = "work_phone")
     private String workPhone;
@@ -52,7 +55,6 @@ public class RepairsWork {
      * 状态 1（在岗）0（离岗）2（离职）
      */
     @ApiModelProperty(value = "状态 1（在岗）0（离岗）2（离职）")
-    @Pattern(regexp = "",message = "必须为数字，并且长度为1")
     @Column(name = "work_status")
     private String workStatus;
 
@@ -60,7 +62,6 @@ public class RepairsWork {
      * 工人类型 0（水电工）1（木工）
      */
     @ApiModelProperty(value ="维修工人类型 0（水电工）1（空调工）2（木工）" )
-    @Pattern(regexp = "\\d{2}",message = "必须为数字，并且长度为1")
     @Column(name = "work_type")
     private String workType;
 
@@ -68,7 +69,7 @@ public class RepairsWork {
     /**
      * 工人服务校区0（南校区）1（北校区）
      */
-    @Pattern(regexp = "\\^[01]$\\ ",message = "必须为数字，并且长度为1")
+    @Pattern(regexp = "^(0|1)$", message = "参数不符合规范")
     @ApiModelProperty(value ="工人服务校区0（黄家湖校区）1（靖安校区）" )
     @Column(name = "work_campus")
     private String workCampus;

src/main/resources/application.yml

@@ -42,6 +42,7 @@ weixiao:
   ocode: 1015730314
   serverUrl: http://10.244.137.3:8084
 # serverUrl: http://binguo.vaiwan.com
+# serverUrl: http://87hhvi.natappfree.cc
   title: 寝室维修通知
   content: 同学你好，你的寝室报修单已被维修师傅接单，维修师傅将于半小时后上门维修；请合理安排时间，谢谢合作。
   sender: 寝室管理办公室