From 35cdcf90b065028b0e44d0c61e2534b5f735b089 Mon Sep 17 00:00:00 2001
From: jianjun <jianjun4833@163.com>
Date: Thu, 25 Nov 2021 17:30:11 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/ResiCategoryStatsConfigController.java      | 6 +++---
 .../java/com/epmet/service/impl/IcResiUserServiceImpl.java | 7 +++++--
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
index 97059846c6..99b6299afa 100644
--- a/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
+++ b/epmet-module/oper-customize/oper-customize-server/src/main/java/com/epmet/controller/ResiCategoryStatsConfigController.java
@@ -90,13 +90,13 @@ public class ResiCategoryStatsConfigController {
         if(IcResiCategoryStatsConfigConstant.WARN_YES.equals(formDTO.getWarn())){
             //判断level1 和level2 的值
             if(null ==level1 || level1==0){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"黄色预警阈值需大于0");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"黄色预警阈值需大于0");
             }
             if(null == level2 || level2==0){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"红色预警阈值需大于0");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"红色预警阈值需大于0");
             }
             if(level2<=level1){
-                return new Result().error(EpmetErrorCode.OPERATION_FAILED.getCode(),"黄色预警阈值需大于红色预警阈值");
+                return new Result().error(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"黄色预警阈值需大于红色预警阈值");
             }
         }
         resiCategoryStatsConfigService.update(customerId,formDTO);
diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
index 9b3feb7773..dfc0185caf 100644
--- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
+++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
@@ -32,6 +32,7 @@ import com.epmet.commons.tools.enums.GenderEnum;
 import com.epmet.commons.tools.enums.HouseTypeEnum;
 import com.epmet.commons.tools.enums.RelationshipEnum;
 import com.epmet.commons.tools.exception.EpmetErrorCode;
+import com.epmet.commons.tools.exception.EpmetException;
 import com.epmet.commons.tools.exception.RenException;
 import com.epmet.commons.tools.feign.ResultDataResolver;
 import com.epmet.commons.tools.page.PageData;
@@ -173,7 +174,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "新增居民信息失败，身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
+                        String errorMsg = "新增居民信息失败，身份证号已存在!";
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }
                 //2021.11.25  end
@@ -231,7 +233,8 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
                     dto.setIdCard(map.get("ID_CARD"));
                     IcResiUserDTO userDTO = baseDao.getResiUser(dto);
                     if (null != userDTO && null != userDTO.getIdCard()) {
-                        throw new RenException(EpmetErrorCode.OPERATION_FAILED.getCode(), EpmetErrorCode.OPERATION_FAILED.getMsg(), "修改居民信息失败，身份证号已存在!", RenException.MessageMode.CODE_INTERNAL_EXTERNAL);
+                        String errorMsg = "修改居民信息失败，身份证号已存在!";
+                        throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(), errorMsg, errorMsg);
                     }
                 }
                 //2021.11.25  end