From 60da59242f16096cd72979ac713659bc1dce079e Mon Sep 17 00:00:00 2001
From: wangxianzhang <ZHANGYUGE6666>
Date: Fri, 8 Apr 2022 15:58:01 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B1=85=E6=B0=91=E4=BF=A1=E6=81=AF=E5=AF=BC?=
 =?UTF-8?q?=E5=85=A5=EF=BC=9A=E5=A2=9E=E5=8A=A0=E8=BA=AB=E4=BB=BD=E8=AF=81?=
 =?UTF-8?q?=E5=8F=B7=E5=92=8C=E6=89=8B=E6=9C=BA=E5=8F=B7=E7=9A=84=E9=95=BF?=
 =?UTF-8?q?=E5=BA=A6=E6=A3=80=E6=9F=A5=E5=92=8C=E9=94=99=E8=AF=AF=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EpmetCommonServiceOpenFeignClient.java    |  4 +--
 .../controller/ImportTaskController.java      |  2 +-
 .../impl/IcResiUserImportServiceImpl.java     | 30 +++++++++++++++++++
 3 files changed, 33 insertions(+), 3 deletions(-)

diff --git a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
index 7dc71f336e..4214e77cf8 100644
--- a/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
+++ b/epmet-module/epmet-common-service/common-service-client/src/main/java/com/epmet/feign/EpmetCommonServiceOpenFeignClient.java
@@ -22,7 +22,7 @@ import java.util.Map;
  * @date 2020/6/4 10:28
  */
 @FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class)
- //@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class, url = "http://192.168.1.132:8103")
+ //@FeignClient(name = ServiceConstant.EPMET_COMMON_SERVICE, fallbackFactory = EpmetCommonServiceOpenFeignClientFallbackFactory.class, url = "http://localhost:8103")
 public interface EpmetCommonServiceOpenFeignClient {
     /**
      * @param formDTO
@@ -131,7 +131,7 @@ public interface EpmetCommonServiceOpenFeignClient {
      * @param input
      * @return
      */
-    @RequestMapping("/commonservice/import-task/create")
+    @PostMapping("/commonservice/import-task/create")
     Result<ImportTaskCommonResultDTO> createImportTask(@RequestBody ImportTaskCommonFormDTO input);
 
     /**
diff --git a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
index 8af4083542..8b03c4465b 100644
--- a/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
+++ b/epmet-module/epmet-common-service/common-service-server/src/main/java/com/epmet/controller/ImportTaskController.java
@@ -39,7 +39,7 @@ public class ImportTaskController {
      * @param input
      * @return
      */
-    @RequestMapping("create")
+    @PostMapping("create")
     public Result<ImportTaskCommonResultDTO> createTask(@RequestBody ImportTaskCommonFormDTO input) {
         ValidatorUtils.validateEntity(input, ImportTaskCommonFormDTO.Create.class);
         String operatorId = input.getOperatorId();
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
index 313c18c16d..1d3c3b2cc8 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserImportServiceImpl.java
@@ -424,6 +424,9 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
 
                 String idCard = columnAndValues.get("ID_CARD");
 
+                // 执行指定的检查
+                specifiedCheck(columnAndValues);
+
                 Map<String, String> existingResiMap = icResiUserDao.selectResiInfoMap(idCard, null);
 
                 if (existingResiMap == null) {
@@ -526,6 +529,33 @@ public class IcResiUserImportServiceImpl implements IcResiUserImportService, Res
         }
     }
 
+    /**
+     * 执行指定的检查
+     * @param columnAndValues
+     */
+    private void specifiedCheck(LinkedHashMap<String, String> columnAndValues) {
+        String idCard = columnAndValues.get("ID_CARD");
+        String mobile = columnAndValues.get("MOBILE");
+
+        List<String> errors = new ArrayList<>();
+
+        if (idCard.length() > 18) {
+            // 身份证号超长了哦，不可以的
+            errors.add("身份证号过长，限制18位");
+        }
+
+        if (StringUtils.isNotBlank(mobile) && mobile.length() > 15) {
+            // 手机号超长也是不可以的
+            errors.add("手机号过长，限制15位");
+        }
+
+        if (errors.size() > 0) {
+            // 有错误
+            String errorMsg = String.join(";", errors);
+            throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
+        }
+    }
+
     /**
      * 持久化IC居民附加信息
      * @param headerColumnWrapper 数据库列包装信息