Merge branch 'dev0.2' of http://git.elinkit.com.cn:7070/r/epmet-cloud into dev0.2

epmet-admin/epmet-admin-server/docker-compose.yml

@@ -2,6 +2,7 @@ version: "3.7"
 services:
   epmet-admin-server:
     container_name: epmet-admin-server-dev
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.0
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.1
     ports:
-      - "8082:8082"
+      - "8082:8082"
+    network_mode: bridge # 不会创建新的网络

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

@@ -10,7 +10,6 @@ public enum EpmetErrorCode {
 	CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"),
 	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
 	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
-	ONLY_LEADER_CAN_INVITE(8005,"抱歉，只有群主才可以邀请新成员"),
 	LOSE_EFFICACY(8006,"此链接已过期"),
 
 	MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"),
@@ -22,27 +21,27 @@ public enum EpmetErrorCode {
 	CANNOT_AUDIT_WARM(8201, "只有注册居民才可以申请热心居民，请先完成居民注册");
 
 
-	private int value;
-	private String name;
+	private int code;
+	private String msg;
 
-	EpmetErrorCode(int value, String name) {
-		this.value = value;
-		this.name = name;
+	EpmetErrorCode(int code, String msg) {
+		this.code = code;
+		this.msg = msg;
 	}
 
-	public int getValue() {
-		return value;
+	public int getCode() {
+		return code;
 	}
 
-	public void setValue(int value) {
-		this.value = value;
+	public void setCode(int code) {
+		this.code = code;
 	}
 
-	public String getName() {
-		return name;
+	public String getMsg() {
+		return msg;
 	}
 
-	public void setName(String name) {
-		this.name = name;
+	public void setMsg(String msg) {
+		this.msg = msg;
 	}
 }

epmet-gateway/docker-compose.yml

@@ -2,6 +2,12 @@ version: "3.7"
 services:
   epmet-gateway: # 会自动生成容器名称: <当前所在目录>_epmet-gateway_1，依赖于所在目录，不稳定，所以使用container_name 完全手动指定
     container_name: epmet-gateway-dev # 完全手动指定容器NAME
-    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.0
+    image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.1
     ports:
-      - "8080:8080"
+      - "8080:8080"
+    network_mode: bridge # 不会创建新的网络
+
+# 定义新的网络
+#networks:
+#  epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway
+#    driver: bridge

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java

@@ -137,6 +137,6 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
             e.printStackTrace();
             logger.error(String.format("短信验证码发送失败,手机号:%s。errorMessage:%s", mobile, e.getMessage()));
         }
-        return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getValue(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getName());
+        return new Result().error(EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getCode(), EpmetErrorCode.MESSAGE_SMS_SEND_ERROR.getMsg());
     }
 }

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java

@@ -290,7 +290,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		//1、校验是否同名
 		List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
 		if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
-			return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getName());
+			return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getCode(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getMsg());
 		}
 		//2、插入一条待审核的组信息
 		ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
@@ -374,7 +374,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 		Result<UserResiInfoResultDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
 		if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
 			logger.info("居民注册信息查询失败");
-			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
+			return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 		}
 		return new Result();
 	}
@@ -410,7 +410,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
 				initApplyCreatedGroupFormDTO.getUserId(),
 				initApplyCreatedGroupFormDTO.getCustomerId());
 		if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
-			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue(),EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
+			return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getCode(),EpmetErrorCode.CANNOT_CREATE_GROUP.getMsg());
 		}
 		return new Result();
 	}

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java

@@ -155,20 +155,12 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 	 * @param formDTO
 	 * @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
 	 * @Author yinzuomei
-	 * @Description 生成邀请连接
+	 * @Description 生成邀请群成员连接
 	 * @Date 2020/3/31 22:50
 	 **/
 	@Override
 	public Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO) {
-		//1、只有群主可以邀请新成员
-		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(formDTO.getGroupId(), formDTO.getUserId());
-		if (null == resiGroupMemberDTO) {
-			return new Result<>();
-		}
-		if (null != resiGroupMemberDTO && !LeaderFlagConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())) {
-			return new Result<CreateGroupInvitationResultDTO>().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getValue(),
-					EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getName());
-		}
+		//1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮）
 		//2、审核通过（讨论中）的群才可以分享邀请连接
 		ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
 		if (!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) {
@@ -179,7 +171,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		groupInvitationEntity.setInviterUserId(formDTO.getUserId());
 		groupInvitationEntity.setInviterCustomerId(resiGroupDTO.getCustomerId());
 		groupInvitationEntity.setInviterGridId(resiGroupDTO.getGridId());
-		//暂定7天有效期
+		//暂定14天有效期
 		Calendar calendar = Calendar.getInstance();
 		calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + NumConstant.FOURTEEN);
 		groupInvitationEntity.setValidEndTime(calendar.getTime());
@@ -210,7 +202,6 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		ResiGroupMemberDTO resiGroupMemberDTO = resiGroupMemberDao.selectGroupMemberInfo(groupInvitationDTO.getResiGroupId(), formDTO.getUserId());
 		if (null != resiGroupMemberDTO && !MemberStateConstant.REMOVED.equals(resiGroupMemberDTO.getStatus())) {
 			linkGroupInfoResultDTO.setInGroup(Constant.YES);
-//			return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
 		} else {
 			linkGroupInfoResultDTO.setInGroup(Constant.NO);
 		}
@@ -282,10 +273,10 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 		GroupInvitationDTO groupInvitationDTO = this.get(invitationId);
 		//Date1.after(Date2),当Date1大于Date2时，返回TRUE，当小于等于时，返回false；
 		if (null == groupInvitationDTO) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName());
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
 		}
 		if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) {
-			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName());
+			return new Result<GroupInvitationDTO>().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg());
 		}
 		ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId());
 		if (null == resiGroupEntity) {
@@ -323,7 +314,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationD
 					formDTO.getUserId(),
 					resiGroupDTO.getCustomerId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(), EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
+				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(), EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
 		}
 		//3、新增一条邀请入群、直接审核通过的入群记录

epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java

@@ -183,13 +183,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
 					applyJoinGroupFormDTO.getUserId(),
 					resiGroupDTO.getCustomerId());
 			if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
-				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
+				return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getCode(),EpmetErrorCode.CANNOT_JOIN_GROUP.getMsg());
 			}
 		}
 		//查看用户最新一条成员处理记录，避免重复申请
 		GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationLatest(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
 		if(null!=groupMember&&MemberStateConstant.UNDER_AUDITTING.equals(groupMember.getOperateStatus())){
-			return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue(),EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
+			return new Result().error(EpmetErrorCode.ALREADY_APPLIED_GROUP.getCode(),EpmetErrorCode.ALREADY_APPLIED_GROUP.getMsg());
 		}
 		if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
 			return new Result().error(ModuleConstant.ALREADY_IN_GROUP);

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

@@ -108,16 +108,16 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		partyMemberInfoParam.setCustomerId(fromDTO.getCustomerId());
 		PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam);
 		if (null != partyMemberInfoResult) {
-			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName());
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
 			return result;
 		}
 
 		//生成短信验证码
 		Map<String, String> message = (Map<String, String>) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData();
 		if(null == message) {
-			result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName());
+			result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg());
 			return result;
 		}
 		//删除旧验证码
@@ -144,8 +144,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		if (null == code) {
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
 					PartyMemberConstant.OPERATE_AUTO_FAILED);
-			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
+			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg());
 			return result;
 		}
 
@@ -165,8 +165,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			partyMemberInfoEntity.setConfirmResult("1");
 			partymemberInfoService.insert(partyMemberInfoEntity);
 
-			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue());
-			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName());
+			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode());
+			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg());
 		} else {
 			//将访问记录更新到热心居民申请行为记录表
 			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);

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

@@ -139,8 +139,8 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         userResiInfoFormDTO.setUserId(formDTO.getUserId());
         Result<UserResiInfoResultDTO> result1 = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
         if (!result1.success() || null == result1.getData()) {
-            result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getValue());
-            result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getName());
+            result.setCode(EpmetErrorCode.CANNOT_AUDIT_WARM.getCode());
+            result.setMsg(EpmetErrorCode.CANNOT_AUDIT_WARM.getMsg());
             return result;
         }
         //1:热心居民申请行为记录表新增数据
@@ -220,4 +220,4 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         }
         return result;
     }
-}
+}

epmet-user/epmet-user-server/docker-compose.yml

@@ -4,4 +4,5 @@ services:
     container_name: epmet-user-server-dev
     image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0
     ports:
-      - "8087:8087"
+      - "8087:8087"
+    network_mode: bridge # 不会创建新的网络

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

@@ -156,16 +156,16 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		if(null == verificationCode || StringUtils.isBlank(verificationCode)){
 			//验证码校验失败则更新行为记录表数据 返回前台结果
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
-			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
+			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getMsg());
 			return result;
 		}
 		//2:再次判断手机号是否可用
 		if (!getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
 			//手机号验证失败则更新行为记录表数据 返回前台结果
 			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
-			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName());
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getMsg());
 			return result;
 		}
 		//3:校验成功 数据存入居民注册表 更新行为记录表数据
@@ -214,8 +214,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
 		result = messageFeignClient.sendSmsCaptcha(verificationCodeFormDTO.getMobile());
 		Map<String,Object> map = (Map<String, Object>) result.getData();
 		if(null == map) {
-			result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue());
-			result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName());
+			result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode());
+			result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg());
 			return result;
 		}
 		//4:删除缓存中可能存在的旧验证码