事故车线索录入，校验手机号必填，非正常手机号拨号时直接返回该号码

张志伟
1 parent 667e410c
Showing 4 changed files with 13 additions and 1 deletions
fw-valhalla-domain/src/main/java/cn/fw/valhalla/domain/dto/AccidentPoolDTO.java
fw-valhalla-server/src/test/java/cn/fw/valhalla/ValhallaAppTests.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/CommonService.java
fw-valhalla-service/src/main/java/cn/fw/valhalla/service/bus/follow/strategy/impl/ACFollowStrategy.java
@@ -29,6 +29,7 @@ public class AccidentPoolDTO {
     /**
      * 报案手机号
      */
+    @NotBlank(message = "报案手机号不能为空")
     private String reportMobile;
     /**
      * 车牌号
 package cn.fw.valhalla;
+import cn.fw.common.util.ValidationUtils;
 import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,4 +36,9 @@ class ValhallaAppTests {
                 .andDo(MockMvcResultHandlers.print());
     }
+    @Test
+    public void phoneTest() {
+        String phone ="+8619142820251";
+        System.out.println(ValidationUtils.checkMobile(phone));
+    }
 }
 package cn.fw.valhalla.service.bus;
+import cn.fw.common.util.ValidationUtils;
 import cn.fw.valhalla.common.constant.RoleCode;
 import cn.fw.valhalla.domain.db.customer.AccidentPool;
 import cn.fw.valhalla.domain.db.customer.Customer;
@@ -77,6 +78,9 @@ public class CommonService {
             AccidentPool accidentPool = accidentPoolService.getById(cusId);
             BV.notNull(accidentPool, () -> "用户不存在");
             becallNo = accidentPool.getReportMobile();
+            if (!ValidationUtils.checkMobile(becallNo)) {
+                return becallNo;
+            }
         } else {
             Customer customer = customerService.queryByIdWithInvalid(cusId);
             BV.notNull(customer, () -> "用户不存在");
 package cn.fw.valhalla.service.bus.follow.strategy.impl;
 import cn.fw.common.exception.BusinessException;
+import cn.fw.common.util.ValidationUtils;
 import cn.fw.valhalla.common.utils.DateUtil;
 import cn.fw.valhalla.common.utils.MobileUtil;
 import cn.fw.valhalla.common.utils.StringUtils;
@@ -93,7 +94,7 @@ public class ACFollowStrategy extends AbstractFollowStrategy {
         ACDetailVO vo = assemble(followRecord.getCustomerId());
         vo.setId(followRecord.getId());
         vo.setTaskId(followRecord.getTaskId());
-        vo.setHadCall(count > 0);
+        vo.setHadCall(count > 0 || !ValidationUtils.checkMobile(vo.getReportMobile()));
         vo.setDeadline(Objects.isNull(followRecord.getLimitTime()) ? followRecord.getDeadline() : followRecord.getLimitTime());
         return vo;
     }