From 97c89d03c078c192a84d1f8e89808b56f27b0345 Mon Sep 17 00:00:00 2001
From: yinzuomei <576302893@qq.com>
Date: Tue, 7 Jul 2020 10:21:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/epmet/service/impl/DraftServiceImpl.java   |  2 +-
 .../group/service/impl/ResiGroupServiceImpl.java   | 14 +++++++-------
 .../grid/service/impl/ResiMineGridServiceImpl.java |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
index 319a1e4506..59e311c943 100644
--- a/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
+++ b/epmet-module/gov-voice/gov-voice-server/src/main/java/com/epmet/service/impl/DraftServiceImpl.java
@@ -150,7 +150,7 @@ public class DraftServiceImpl extends BaseServiceImpl<DraftDao, DraftEntity> imp
                 draftAttrResultDTO.setTagNameList(new String[0]);
             }
         } else {
-            logger.error(String.format("查询草稿属性失败,草稿id=%s", formDTO.getDraftId()));
+            logger.warn(String.format("查询草稿属性为空,草稿id=%s", formDTO.getDraftId()));
         }
         return draftAttrResultDTO;
     }
diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
index 0305525575..881374f12c 100644
--- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
+++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
@@ -251,7 +251,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//校验是否是群主
 		ResiGroupMemberDTO groupMemberDTO = resiGroupMemberService.getResiGroupMember(modifyGroupFormDTO.getGroupId(), modifyGroupFormDTO.getUserId());
 		if (null == groupMemberDTO || ModuleConstant.GROUP_MEMBER.equals(groupMemberDTO.getGroupLeaderFlag())) {
-			logger.error(String.format("修改小组信息异常:%s",EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg()));
+			logger.info(String.format("修改小组信息异常:%s",EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getMsg()));
 			throw new RenException(EpmetErrorCode.GROUP_LEADER_CAN_EDIT_GROUP_INFO.getCode());
 		}
 		if (StringUtils.isBlank(modifyGroupFormDTO.getGroupHeadPhoto())
@@ -279,7 +279,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 	public GroupSummarizeResultDTO getGroupSummarize(GroupSummarizeFormDTO groupSummarizeFormDTO) {
 		GroupSummarizeResultDTO groupSummarizeResultDTO = baseDao.selectGroupSummarize(groupSummarizeFormDTO);
 		if (null == groupSummarizeResultDTO) {
-			logger.error(String.format("查看小组管理界面信息异常,userId=%s,groupId=%s",groupSummarizeFormDTO.getUserId(),groupSummarizeFormDTO.getGroupId()));
+			logger.warn(String.format("查看小组管理界面信息异常,userId=%s,groupId=%s",groupSummarizeFormDTO.getUserId(),groupSummarizeFormDTO.getGroupId()));
 			return new GroupSummarizeResultDTO();
 		}
 		//获取组长信息
@@ -287,7 +287,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		if (groupLeaderUserInfo.success() && null != groupLeaderUserInfo.getData()) {
 			groupSummarizeResultDTO.setLeaderName(groupLeaderUserInfo.getData().getShowName());
 		} else {
-			logger.error(String.format("查看小组管理界面信息错误,获取组长注册信息失败,接口返参%s",JSON.toJSONString(groupLeaderUserInfo)));
+			logger.warn(String.format("查看小组管理界面信息错误,获取组长注册信息失败,接口返参%s",JSON.toJSONString(groupLeaderUserInfo)));
 			groupSummarizeResultDTO.setLeaderName("");
 		}
 		return groupSummarizeResultDTO;
@@ -329,7 +329,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
-			logger.error(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()));
+			logger.info(String.format("创建小组异常:%s",EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg()));
 			throw new RenException(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode());
 		}
 		//2.1、查询当前申请人的身份，生成对应格式的消息内容
@@ -338,7 +338,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
                 applyCreateGroupFormDTO.getCustomerId(),
                 applyCreateGroupFormDTO.getGridId());
         if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-			logger.error(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg()));
+			logger.info(String.format("创建小组异常:%s",EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg()));
 			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
         }
         String roleName = "";
@@ -450,7 +450,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		resiUserInfoFormDTO.setCustomerId(initApplyGroupFormDTO.getCustomerId());
 		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
-			logger.error(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result)));
+			logger.info(String.format("加入小组界面初始化查询成功,当前用户非注册居民,epmet-user-server接口入参%s,返回%s",JSON.toJSONString(resiUserInfoFormDTO),JSON.toJSONString(result)));
 			throw new RenException(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode());
 		}
 	}
@@ -481,7 +481,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				initApplyCreatedGroupFormDTO.getCustomerId(),
 				initApplyCreatedGroupFormDTO.getGridId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-			logger.error(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO)));
+			logger.info(String.format("创建小组界面初始化查询成功,用户角色列表%s",JSON.toJSONString(userRoleDTO)));
 			throw new RenException(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode());
 		}
 	}
diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
index dded7bc306..279b7eae9e 100644
--- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
+++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
@@ -44,11 +44,11 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
 	@Override
 	public LatestGridInfoResultDTO getLatestGridInfo(TokenDto tokenDto) {
 		if (null == tokenDto || StringUtils.isBlank(tokenDto.getUserId())) {
-			logger.warn(String.format("居民端获取用户最近访问的网格失败:tokenDto is null or userId is null"));
+			logger.error(String.format("居民端获取用户最近访问的网格失败:tokenDto is null or userId is null"));
 			throw new RenException(ModuleConstant.USER_NOT_NULL);
 		}
 		if(!AppClientConstant.APP_RESI.equals(tokenDto.getApp())){
-			logger.warn(String.format("居民端获取用户最近访问的网格失败,userId:%s,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL));
+			logger.error(String.format("居民端获取用户最近访问的网格失败,userId:%s,错误提示:%s",tokenDto.getUserId(),ModuleConstant.FOR_RESI_CALL));
 			throw new RenException(ModuleConstant.FOR_RESI_CALL);
 		}
 		logger.info(String.format("居民端获取用户最近访问网格入参%s", JSON.toJSONString(tokenDto)));