修改接口入参及提示语问题

epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java

@@ -17,16 +17,7 @@ public enum EpmetErrorCode {
 	MOBILE_CODE_ERROR(8102, "手机验证码错误"),
 	AUTO_CONFIRM_FAILED(8103, "自动认证失败"),
 	MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"),
-	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"),
-
-
-	/**
-	 * 手机号已存在
-	 */
-	MOBILE_EXIST(8201, "该手机号已注册居民，请使用其他手机号注册！"),
-	PARAMETER_EXCEPTION(8202, "必要参数存在空值或手机号输入不合规，请检查参数赋值情况！！"),
-	UPDATE_EXCEPTION(8203, "用户居民注册访问记录表更新数据失败！"),
-	PARTICIPATION_EXCEPTION(8204, "参数异常，请检查所传参数是否合规！");
+	MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败");
 
 
 	private int value;

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java

@@ -120,12 +120,12 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl<CustomerStaffG
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+       /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getResiWarmApplyId())
                 || StringUtils.isBlank(formDTO.getAuditStatus())
                 || (!NumConstant.ZERO_STR.equals(formDTO.getAuditStatus()) && !NumConstant.ONE_STR.equals(formDTO.getAuditStatus()))) {
             return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.manageAudit(formDTO);
     }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java

@@ -1,8 +1,8 @@
 /**
  * Copyright (c) 2018 人人开源 All rights reserved.
- *
+ * <p>
  * https://www.renren.io
- *
+ * <p>
  * 版权所有，侵权必究！
  */
 
@@ -22,4 +22,6 @@ import com.epmet.commons.tools.exception.ErrorCode;
  */
 public interface ModuleErrorCode extends ErrorCode {
 
+    String PARTICIPATION_EXCEPTION = "参数异常,请检查所传参数是否符合规范以及是否存在空值";
+    String MOBILE_EXCEPTION = "手机号输入不符合规范，请重新输入";
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java

@@ -1,6 +1,5 @@
 package com.epmet.modules.resiregister.service.impl;
 
-import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
@@ -8,6 +7,7 @@ import com.epmet.dto.form.ResiInfoSubmitFormDTO;
 import com.epmet.dto.form.ResiRegisterFormDTO;
 import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
+import com.epmet.modules.exception.ModuleErrorCode;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.resiregister.service.ResiRegisterService;
 import com.epmet.modules.utils.ModuleConstant;
@@ -38,11 +38,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getVisitFrom())) {
-            return new Result<ResiRegisterResultDTO>().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
+            return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.PARTICIPATION_EXCEPTION);
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
@@ -57,11 +57,11 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
+        /*if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId())
                 || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId())
                 || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) {
             return new Result().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
-        }
+        }*/
         UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo();
         userResiInfoDTO.setUserId(tokenDTO.getUserId());
         userResiInfoDTO.setApp(tokenDTO.getApp());
@@ -81,10 +81,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
                 || StringUtils.isBlank(formDTO.getResiVisitId())
                 || !validateMobile(formDTO.getMobile())) {
             return new Result<ResiRegisterResultDTO>().error(EpmetErrorCode.PARAMETER_EXCEPTION.getName());
+        }*/
+        if (!validateMobile(formDTO.getMobile())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleErrorCode.MOBILE_EXCEPTION);
         }
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.getVerificationCode(formDTO);

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java

@@ -34,11 +34,11 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+       /* if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getVisitFrom())) {
             return new Result<ResiWarmheartedResultDTO>().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
@@ -53,12 +53,12 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result().error(ModuleConstant.USER_NOT_NULL);
         }
-        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+        /*if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
                 || StringUtils.isBlank(formDTO.getGridId())
                 || StringUtils.isBlank(formDTO.getResiWarmVisitId())
                 || StringUtils.isBlank(formDTO.getReason())) {
             return new Result().error(EpmetErrorCode.PARTICIPATION_EXCEPTION.getName());
-        }
+        }*/
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.submit(formDTO);
     }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java

@@ -163,7 +163,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
      * @return
      */
     public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
-        Date date = new Date();
         ResiWarmheartedApplyEntity entity = new ResiWarmheartedApplyEntity();
         entity.setCustomerId(formDTO.getCustomerId());
         entity.setGridId(formDTO.getGridId());

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java

@@ -20,6 +20,7 @@ package com.epmet.dto.form;
 import com.epmet.dto.UserResiInfoDTO;
 import lombok.Data;
 
+import javax.validation.constraints.NotBlank;
 import java.io.Serializable;
 import java.util.Date;
 
@@ -39,21 +40,25 @@ public class ResiInfoSubmitFormDTO implements Serializable {
 	/**
 	 * 客户Id (customer.id)
 	 */
+	@NotBlank(message = "客户ID不能为空")
 	private String customerId;
 
 	/**
 	 * 网格Id (customer_grid.id)
 	 */
+	@NotBlank(message = "网格ID不能为空")
 	private String gridId;
 
 	/**
 	 * 居民注册行为记录表Id resi_visit.id
 	 */
+	@NotBlank(message = "注册行为表ID不能为空")
 	private String resiVisitId;
 
 	/**
 	 * 用户在居民端完善的个人信息
 	 */
+	@NotBlank(message = "个人信息不能为空")
 	private UserResiInfoDTO resiInfo;
 
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java

@@ -18,16 +18,19 @@ public class VerificationCodeFormDTO implements Serializable {
     /**
      * 手机号(注册手机号)
      */
+    @NotBlank(message = "手机号不能为空")
     private String mobile;
 
     /**
      * 居民注册行为记录表Id resi_visit.id
      */
+    @NotBlank(message = "注册行为表ID不能为空")
     private String resiVisitId;
 
     /**
      * 用户ID
      */
+    @NotBlank(message = "用户ID不能为空")
     private String userId;
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java

@@ -10,6 +10,7 @@ package com.epmet.constant;
 
 /**
  * 常量
+ *
  * @author sun
  * @since 1.0.0
  */
@@ -35,4 +36,7 @@ public interface UserResiRegisterConstant {
      */
     String FAILD = "faild";
 
+    String MOBILE_EXIST = "该手机号已注册居民，请使用其他手机号注册";
+
+    String UPDATE_EXCEPTION = "用户居民注册访问记录表更新数据失败";
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java

@@ -207,8 +207,7 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
 		//2:判断手机号是否可用
 		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
-			result.setCode(EpmetErrorCode.MOBILE_EXIST.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_EXIST.getName());
+			result.error(UserResiRegisterConstant.MOBILE_EXIST);
 			return result;
 		}
 		//3:调用短信服务 生成验证码发送短信

epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java

@@ -151,7 +151,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(EpmetErrorCode.UPDATE_EXCEPTION.getName());
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }
 
@@ -164,7 +164,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setUpdatedBy(verificationCodeFormDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
         if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-            log.warn(EpmetErrorCode.UPDATE_EXCEPTION.getName());
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
         }
     }