From 88ada95a74e050d7c86c612db63f3e7a30b67d22 Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 14:34:53 +0800 Subject: [PATCH 01/15] =?UTF-8?q?docker-compose.yml=20=E7=BD=91=E7=BB=9C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/docker-compose.yml | 3 ++- epmet-gateway/docker-compose.yml | 8 +++++++- epmet-user/epmet-user-server/docker-compose.yml | 3 ++- 3 files changed, 11 insertions(+), 3 deletions(-) diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index 41161bf100..f5a7e12240 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -4,4 +4,5 @@ services: container_name: epmet-admin-server-dev image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-admin-server:2.0.0 ports: - - "8082:8082" \ No newline at end of file + - "8082:8082" + network_mode: bridge # 不会创建新的网络 \ No newline at end of file diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index 53b7ea7aeb..d00149311b 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -4,4 +4,10 @@ services: container_name: epmet-gateway-dev # 完全手动指定容器NAME image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-gateway:2.0.0 ports: - - "8080:8080" \ No newline at end of file + - "8080:8080" + network_mode: bridge # 不会创建新的网络 + +# 定义新的网络 +#networks: +# epmet-gateway: # 会自动生成容器网络名称: <当前所在目录>_epmet-gateway +# driver: bridge \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml index c38941b8c3..5e354491a9 100644 --- a/epmet-user/epmet-user-server/docker-compose.yml +++ b/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" \ No newline at end of file + - "8087:8087" + network_mode: bridge # 不会创建新的网络 \ No newline at end of file From 1980789aa00babb974cee07a5106263a18fc368b Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 15:37:57 +0800 Subject: [PATCH 02/15] =?UTF-8?q?docker-compose.yml=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-gateway/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-gateway/docker-compose.yml b/epmet-gateway/docker-compose.yml index d00149311b..d973dd4ca1 100644 --- a/epmet-gateway/docker-compose.yml +++ b/epmet-gateway/docker-compose.yml @@ -2,7 +2,7 @@ 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" network_mode: bridge # 不会创建新的网络 From bfa9d7046d7ea4843793f4ff6a4459f68354192b Mon Sep 17 00:00:00 2001 From: wxz Date: Fri, 10 Apr 2020 15:44:07 +0800 Subject: [PATCH 03/15] =?UTF-8?q?docker-compose.yml=20=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- epmet-admin/epmet-admin-server/docker-compose.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-admin/epmet-admin-server/docker-compose.yml b/epmet-admin/epmet-admin-server/docker-compose.yml index f5a7e12240..97c34cb896 100644 --- a/epmet-admin/epmet-admin-server/docker-compose.yml +++ b/epmet-admin/epmet-admin-server/docker-compose.yml @@ -2,7 +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" network_mode: bridge # 不会创建新的网络 \ No newline at end of file From dd9b946350d2f0435c3ea6e62f08822d042b146f Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Fri, 10 Apr 2020 23:11:26 +0800 Subject: [PATCH 04/15] =?UTF-8?q?EpmetErrorCode=20=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 26 +++++++++---------- .../epmet/service/impl/SysSmsServiceImpl.java | 2 +- .../service/impl/ResiGroupServiceImpl.java | 6 ++--- .../impl/GroupInvitationServiceImpl.java | 10 +++---- .../impl/ResiGroupMemberServiceImpl.java | 4 +-- .../impl/PartyMemberConfirmServiceImpl.java | 16 ++++++------ .../impl/ResiWarmheartedApplyServiceImpl.java | 6 ++--- .../service/impl/UserResiInfoServiceImpl.java | 12 ++++----- 8 files changed, 41 insertions(+), 41 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 42ed88cf12..9215b5283d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -22,27 +22,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; } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 9002ceb31a..859138663e 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/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 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()); } } 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 a37bf1aa7a..85c11e2858 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 @@ -290,7 +290,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl 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 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(); } if (null != resiGroupMemberDTO && !LeaderFlagConstant.GROUP_LEADER.equals(resiGroupMemberDTO.getGroupLeaderFlag())) { - return new Result().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getValue(), - EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getName()); + return new Result().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getCode(), + EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getMsg()); } //2、审核通过（讨论中）的群才可以分享邀请连接 ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId()); @@ -282,10 +282,10 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); } if (null != groupInvitationDTO && !groupInvitationDTO.getValidEndTime().after(new Date())) { - return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getValue(), EpmetErrorCode.LOSE_EFFICACY.getName()); + return new Result().error(EpmetErrorCode.LOSE_EFFICACY.getCode(), EpmetErrorCode.LOSE_EFFICACY.getMsg()); } ResiGroupEntity resiGroupEntity = resiGroupDao.selectById(groupInvitationDTO.getResiGroupId()); if (null == resiGroupEntity) { @@ -323,7 +323,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl message = (Map) 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); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index ba359e48ce..9e68e887bf 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/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 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 map = (Map) 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:删除缓存中可能存在的旧验证码 From 704e340df269a9b3710ce32c1cae4ee8e4af81d2 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Fri, 10 Apr 2020 23:42:59 +0800 Subject: [PATCH 05/15] =?UTF-8?q?=E5=88=A0=E9=99=A480005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../commons/tools/exception/EpmetErrorCode.java | 1 - .../service/impl/GroupInvitationServiceImpl.java | 15 +++------------ 2 files changed, 3 insertions(+), 13 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 9215b5283d..f621b518db 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/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, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"), diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java index 17301a6d26..c2e0b5a842 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java +++ b/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 * @Author yinzuomei - * @Description 生成邀请连接 + * @Description 生成邀请群成员连接 * @Date 2020/3/31 22:50 **/ @Override public Result 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().error(EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getCode(), - EpmetErrorCode.ONLY_LEADER_CAN_INVITE.getMsg()); - } + //1、只有群主可以邀请新成员（这块界面限制死了，只有群主才能看到邀请新成员按钮） //2、审核通过（讨论中）的群才可以分享邀请连接 ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId()); if (!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())) { @@ -179,7 +171,7 @@ public class GroupInvitationServiceImpl extends BaseServiceImpl().ok(linkGroupInfoResultDTO); } else { linkGroupInfoResultDTO.setInGroup(Constant.NO); } From f70ce9dd0541f2c6d0ac6c7a31bc4f9ef27f1515 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 11 Apr 2020 08:57:41 +0800 Subject: [PATCH 06/15] =?UTF-8?q?=E6=A5=BC=E9=99=A2=E5=B0=8F=E7=BB=84-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E6=88=90=E5=91=98=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E9=A6=96=E6=AC=A1=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dto/member/form/RemoveMemberFormDTO.java | 38 ++++++++++ .../modules/constant/UserMessageConstant.java | 39 +++++++---- .../group/dao/ResiGroupStatisticalDao.java | 10 ++- .../service/ResiGroupStatisticalService.java | 11 +++ .../impl/ResiGroupStatisticalServiceImpl.java | 70 ++++++++++++++++++- .../controller/ResiGroupMemberController.java | 13 ++++ .../service/GroupMemeberOperationService.java | 13 ++++ .../service/ResiGroupMemberService.java | 8 +++ .../GroupMemeberOperationServiceImpl.java | 22 +++++- .../impl/ResiGroupMemberServiceImpl.java | 47 +++++++++++++ .../epmet/modules/topic/dao/ResiTopicDao.java | 10 +++ .../topic/service/ResiTopicService.java | 36 ++++++---- .../service/impl/ResiTopicServiceImpl.java | 45 ++++++++++++ .../mapper/group/ResiGroupStatisticalDao.xml | 31 ++++++++ .../resources/mapper/topic/ResiTopicDao.xml | 31 ++++++++ 15 files changed, 391 insertions(+), 33 deletions(-) create mode 100644 epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/RemoveMemberFormDTO.java create mode 100644 epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/RemoveMemberFormDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/RemoveMemberFormDTO.java new file mode 100644 index 0000000000..93e8292e05 --- /dev/null +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/member/form/RemoveMemberFormDTO.java @@ -0,0 +1,38 @@ +package com.epmet.resi.group.dto.member.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 楼院小组--删除组成员 + * @Author sun + */ +@Data +public class RemoveMemberFormDTO implements Serializable { + private static final long serialVersionUID = 1626650057895049665L; + + /** + * 群组成员关系表 + */ + @NotBlank(message = "成员Id不能为空") + private String memerId; + + /** + * 显示是否要屏蔽该成员的全部话题,1是0否 + */ + @NotBlank(message = "是否屏蔽成员话题不能为空") + private String hideFlag; + + /** + * 当前登录用户id + */ + private String userId; + + /** + * 所属app + */ + private String app; + +} diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java index b72cc890cb..9f979acedf 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java @@ -6,24 +6,35 @@ package com.epmet.modules.constant; * @Date 2020/4/7 15:55 */ public interface UserMessageConstant { - /** - * 消息标题 - */ - String GROUP_TITLE="您有一条小组消息"; + /** + * 消息标题 + */ + String GROUP_TITLE = "您有一条小组消息"; - /** - * 组长同意入群申请，用户会收到：您有一条小组消息。 您加入的【组名】已通过审核，请查看。 - */ - String AGREE_APPLY="您加入的【%s】已通过审核，请查看"; + /** + * 组长同意入群申请，用户会收到：您有一条小组消息。 您加入的【组名】已通过审核，请查看。 + */ + String AGREE_APPLY = "您加入的【%s】已通过审核，请查看"; - /** - * 组长拒绝入群申请，用户会收到：您在【组名】的入组申请被拒绝。原因：【组长拒绝审核时输入的备注】 - */ - String DISAGREE_APPLY="您在【%s】的入组申请被拒绝。原因：【%s】"; + /** + * 组长拒绝入群申请，用户会收到：您在【组名】的入组申请被拒绝。原因：【组长拒绝审核时输入的备注】 + */ + String DISAGREE_APPLY = "您在【%s】的入组申请被拒绝。原因：【%s】"; + + /** + * 成员通过链接同意进群后，组长会收到：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】 + */ + String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】"; + + String DATA_ACQUISITION_FAILED = "数据库数据获取失败"; + + String DELETE_SUCCESS = "组成员删除成功"; + + String DELETE_FAILED = "组成员删除失败"; /** - * 成员通过链接同意进群后，组长会收到：您的好友-【认证的居民名字 xxx路-王先生】通过邀请链接，加入了【组名】 + * 删除组成员时对应话题操作日志表设置默认的屏蔽理由 */ - String INVITED_JOIN_GROUP="您的好友-【%s】通过邀请连接，加入了【%s】"; + String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java index 5c0cec19a2..f323ce4168 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/dao/ResiGroupStatisticalDao.java @@ -20,14 +20,22 @@ package com.epmet.modules.group.dao; import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 群组统计信息表 * - * @author generator generator@elink-cn.com + * @author generator generator@elink-cn.comH * @since v1.0.0 2020-03-31 */ @Mapper public interface ResiGroupStatisticalDao extends BaseDao { + /** + * 根据组Id查询群组统计信息表数据 + * @param resiGroupId + * @return + * @author sun + */ + ResiGroupStatisticalEntity selectByResiGroupId(@Param("resiGroupId") String resiGroupId); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java index 3cba82c496..160c9eea05 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupStatisticalService.java @@ -19,8 +19,11 @@ package com.epmet.modules.group.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; +import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.resi.group.dto.group.ResiGroupStatisticalDTO; +import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import java.util.List; import java.util.Map; @@ -92,4 +95,12 @@ public interface ResiGroupStatisticalService extends BaseService implements ResiGroupStatisticalService { + @Autowired + private ResiGroupServiceImpl resiGroupServiceImpl; + @Autowired + private EpmetUserFeignClient epmetUserFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -60,8 +76,8 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -96,4 +112,54 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO); + if (!resultList.success()) { + result.error(UserMessageConstant.DATA_ACQUISITION_FAILED); + return result; + } + for (UserRoleResultDTO userRole : resultList.getData()) { + if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) { + //热心居民总数 + entity.setTotalEarnestMemebers(entity.getTotalEarnestMemebers() - NumConstant.ONE); + break; + } else if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRole.getRoleKey())) { + //党员总数 + entity.setTotalPartyMembers(entity.getTotalPartyMembers() - NumConstant.ONE); + break; + } + } + baseDao.updateById(entity); + return result; + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java index 50bad72d0a..39d0d3d689 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/controller/ResiGroupMemberController.java @@ -122,4 +122,17 @@ public class ResiGroupMemberController { ValidatorUtils.validateEntity(disagreeApplyFormDTO); return resiGroupMemberService.disAgreeApply(disagreeApplyFormDTO); } + + /** + * @Author sun + * @Description 楼院小组--删除组成员 + **/ + @PostMapping("removemember") + public Result removeMember(@LoginUser TokenDto tokenDto, @RequestBody RemoveMemberFormDTO removeMemberFormDTO) { + removeMemberFormDTO.setUserId(tokenDto.getUserId()); + removeMemberFormDTO.setApp(tokenDto.getApp()); + ValidatorUtils.validateEntity(removeMemberFormDTO); + return resiGroupMemberService.removeMember(removeMemberFormDTO); + } + } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java index a1422f5e8d..21bac5fe39 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/GroupMemeberOperationService.java @@ -19,8 +19,11 @@ package com.epmet.modules.member.service; import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.modules.member.entity.GroupMemeberOperationEntity; +import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; +import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import java.util.List; import java.util.Map; @@ -92,4 +95,14 @@ public interface GroupMemeberOperationService extends BaseService getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); QueryWrapper wrapper = new QueryWrapper<>(); wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); @@ -101,4 +105,18 @@ public class GroupMemeberOperationServiceImpl extends BaseServiceImpl page(Map params) { IPage page = baseDao.selectPage( @@ -405,4 +413,43 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl { * @Date 2020.04.01 15:21 **/ int updateBatch(List list); + + /** + * @Description 批量更新 + * @Param List + * @return int + * @Author wangc + * @Date 2020.04.01 15:21 + **/ + List selectTopicList(ResiTopicDTO resiTopicDTO); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java index 2c5b14fa8a..9bfd82fe86 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/ResiTopicService.java @@ -21,7 +21,9 @@ import com.epmet.commons.mybatis.service.BaseService; import com.epmet.commons.tools.page.PageData; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; +import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.modules.topic.entity.ResiTopicEntity; +import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; @@ -103,82 +105,88 @@ public interface ResiTopicService extends BaseService { void delete(String[] ids); /** + * @return Result * @Description 创建话题接口，具体逻辑包括：1.身份校验 2.创建话题 3.话题操作记录 * @Param tokenDto * @Param resiTopicPublishFormDTO - * @return Result * @Author wangc * @Date 2020.03.31 13:19 **/ Result createTopic(TokenDto tokenDto, ResiTopicPublishFormDTO resiTopicPublishFormDTO); /** + * @return Result> * @Description 查看组内最近十条话题 * @Param tokenDto * @Param groupId - * @return Result> * @Author wangc * @Date 2020.04.01 08:59 **/ - Result> getLatestTopics(TokenDto tokenDto,String groupId); + Result> getLatestTopics(TokenDto tokenDto, String groupId); /** - * @Description 查看历史话题(分页,允许状态筛选) + * @return Result> + * @Description 查看历史话题(分页, 允许状态筛选) * @Param tokenDto * @Param ResiTopicPageFormDTO.class - * @return Result> * @Author wangc * @Date 2020.04.01 10:36 **/ Result> getPastTopicList(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); /** + * @return Result * @Description 屏蔽话题 * @Param tokenDto * @Param ResiTopicHiddenFormDTO.class - * @return Result * @Author wangc * @Date 2020.04.01 12:38 **/ - Result hideTopic(TokenDto tokenDto,ResiTopicOperationFormDTO hiddenFormDTO); + Result hideTopic(TokenDto tokenDto, ResiTopicOperationFormDTO hiddenFormDTO); /** + * @return Result * @Description 批量取消屏蔽 * @Param tokenDto * @Param topicIds - * @return Result * @Author wangc * @Date 2020.04.01 14:17 **/ - Result cancelHiddenTopics(TokenDto tokenDto,List topicIds); + Result cancelHiddenTopics(TokenDto tokenDto, List topicIds); /** + * @return Result.class * @Description 关闭话题 * @Param tokenDto * @Param ResiTopicOperationFormDTO.class - * @return Result.class * @Author wangc * @Date 2020.04.01 15:37 **/ - Result closeTopic(TokenDto tokenDto,ResiTopicOperationFormDTO closeFormDTO); + Result closeTopic(TokenDto tokenDto, ResiTopicOperationFormDTO closeFormDTO); /** + * @return ResiTopicDetailResultDTO * @Description 查看话题详情 * @Param tokenDto * @Param topicId - * @return ResiTopicDetailResultDTO * @Author wangc * @Date 2020.04.01 15:56 **/ Result getTopicDetail(TokenDto tokenDto, String topicId); /** + * @return List * @Description 屏蔽话题列表查询 * @Param tokenDto * @Param ResiTopicPageFormDTO.class - * @return List * @Author wangc * @Date 2020.04.01 16:45 **/ - Result> getHiddenTopics(TokenDto tokenDto,ResiTopicPageFormDTO topicPageFormDTO); + Result> getHiddenTopics(TokenDto tokenDto, ResiTopicPageFormDTO topicPageFormDTO); + + /** + * @Description 删除组成员--根据前端传过来的屏蔽标志更新话题状态 + * @Author sun + **/ + Result upResiTopic(RemoveMemberFormDTO removeMemberFormDTO, ResiGroupMemberEntity entity); } \ No newline at end of file diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java index 4e7096910c..5d01893296 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/service/impl/ResiTopicServiceImpl.java @@ -30,12 +30,14 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserResiInfoFormDTO; import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; +import com.epmet.modules.constant.UserMessageConstant; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupDao; import com.epmet.modules.group.dao.ResiGroupStatisticalDao; import com.epmet.modules.group.entity.ResiGroupEntity; import com.epmet.modules.group.entity.ResiGroupStatisticalEntity; import com.epmet.modules.member.dao.ResiGroupMemberDao; +import com.epmet.modules.member.entity.ResiGroupMemberEntity; import com.epmet.modules.member.service.ResiGroupMemberService; import com.epmet.modules.topic.dao.ResiTopicAttachmentDao; import com.epmet.modules.topic.dao.ResiTopicCommentDao; @@ -44,11 +46,13 @@ import com.epmet.modules.topic.dao.ResiTopicOperationDao; import com.epmet.modules.topic.entity.ResiTopicAttachmentEntity; import com.epmet.modules.topic.entity.ResiTopicEntity; import com.epmet.modules.topic.entity.ResiTopicOperationEntity; +import com.epmet.modules.topic.service.ResiTopicOperationService; import com.epmet.modules.topic.service.ResiTopicService; import com.epmet.modules.utils.ModuleConstant; import com.epmet.resi.group.constant.MemberStateConstant; import com.epmet.resi.group.constant.TopicConstant; import com.epmet.resi.group.dto.member.ResiGroupMemberDTO; +import com.epmet.resi.group.dto.member.form.RemoveMemberFormDTO; import com.epmet.resi.group.dto.topic.ResiTopicDTO; import com.epmet.resi.group.dto.topic.form.ResiTopicOperationFormDTO; @@ -100,6 +104,9 @@ public class ResiTopicServiceImpl extends BaseServiceImpl page(Map params) { @@ -583,4 +590,42 @@ public class ResiTopicServiceImpl extends BaseServiceImpl list = baseDao.selectTopicList(resiTopicDTO); + if (null == list || list.size() < 1) { + return result; + } + //2:批量更新话题状态 + List ids = new ArrayList<>(); + List topicOperationList = new ArrayList<>(); + ResiTopicOperationEntity resiTopicOperationEntity = null; + for (ResiTopicDTO dto : list) { + ids.add(dto.getId()); + resiTopicOperationEntity = new ResiTopicOperationEntity(); + resiTopicOperationEntity.setTopicId(dto.getId()); + resiTopicOperationEntity.setOperationType(TopicConstant.HIDDEN); + resiTopicOperationEntity.setOperationReason(UserMessageConstant.DELETE_MEMBER_REASON); + resiTopicOperationEntity.setDelFlag(NumConstant.ZERO_STR); + resiTopicOperationEntity.setRevision(NumConstant.ZERO); + resiTopicOperationEntity.setCreatedBy(removeMemberFormDTO.getUserId()); + resiTopicOperationEntity.setUpdatedBy(removeMemberFormDTO.getUserId()); + topicOperationList.add(resiTopicOperationEntity); + } + baseDao.cancelHiddenOrCloseBatch(ids, removeMemberFormDTO.getUserId(),TopicConstant.HIDDEN); + //3:批量新增对应的话题操作日志 + resiTopicOperationService.insertBatch(topicOperationList); + return result; + } } diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml new file mode 100644 index 0000000000..82b67e2a34 --- /dev/null +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/group/ResiGroupStatisticalDao.xml @@ -0,0 +1,31 @@ + + + + + + + rgs.id AS "id", + rgs.resi_group_id AS "resiGroupId", + rgs.total_members AS "totalMembers", + rgs.total_topics AS "totalTopics", + rgs.total_issues AS "totalIssues", + rgs.total_party_members AS "totalPartyMembers", + rgs.total_earnest_memebers AS "totalEarnestMemebers", + rgs.total_normal_memebers AS "totalNormalMemebers", + rgs.del_flag AS "delFlag", + rgs.revision AS "revision", + rgs.created_by AS "createdBy", + rgs.created_time AS "createdTime", + rgs.updated_by AS "updatedBy", + rgs.updated_time AS "updatedTime" + + + + + diff --git a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml index 0baa4f4771..57ba94d5b6 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml +++ b/epmet-module/resi-group/resi-group-server/src/main/resources/mapper/topic/ResiTopicDao.xml @@ -3,6 +3,24 @@ + + rt.id AS "id", + rt.group_id AS "groupId", + rt.topic_content AS "topicContent", + rt.status AS "status", + rt.province AS "province", + rt.city AS "city", + rt.area AS "area", + rt.address AS "address", + rt.longitude AS "longitude", + rt.dimension AS "dimension", + rt.del_flag AS "delFlag", + rt.revision AS "revision", + rt.created_by AS "createdBy", + rt.created_time AS "createdTime", + rt.updated_by AS "updatedBy", + rt.updated_time AS "updatedTime" + @@ -177,6 +195,19 @@ + + From 25828f49c0ba6c482c94e03a753c69da7b8ff5f2 Mon Sep 17 00:00:00 2001 From: yinzuomei <57602893@qq.com> Date: Sat, 11 Apr 2020 09:59:17 +0800 Subject: [PATCH 07/15] =?UTF-8?q?8006=EF=BC=9A=E6=AD=A4=E9=82=80=E8=AF=B7?= =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=B7=B2=E8=BF=87=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/epmet/commons/tools/exception/EpmetErrorCode.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index f621b518db..de82024de8 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -10,7 +10,7 @@ public enum EpmetErrorCode { CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组，请选择您的身份"), GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"), ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"), - LOSE_EFFICACY(8006,"此链接已过期"), + LOSE_EFFICACY(8006,"此邀请链接已过期"), MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"), MOBILE_CODE_ERROR(8102, "手机验证码错误"), From f2536eabccb502afd1c299b55697a94f9617773c Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 11 Apr 2020 10:18:44 +0800 Subject: [PATCH 08/15] =?UTF-8?q?=E6=A5=BC=E9=99=A2=E5=B0=8F=E7=BB=84-?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E7=BB=84=E6=88=90=E5=91=98-=E7=A8=8B?= =?UTF-8?q?=E5=BA=8F=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../epmet/modules/constant/UserMessageConstant.java | 10 ---------- .../com/epmet/modules/exception/ModuleErrorCode.java | 10 ++++++++++ .../com/epmet/modules/feign/EpmetUserFeignClient.java | 2 +- .../service/impl/ResiGroupStatisticalServiceImpl.java | 7 ++++--- .../service/impl/ResiGroupMemberServiceImpl.java | 11 ++++++----- .../topic/service/impl/ResiTopicServiceImpl.java | 3 ++- 6 files changed, 23 insertions(+), 20 deletions(-) diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java index 9f979acedf..f6e33a7ce8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/constant/UserMessageConstant.java @@ -26,15 +26,5 @@ public interface UserMessageConstant { */ String INVITED_JOIN_GROUP = "您的好友-【%s】通过邀请连接，加入了【%s】"; - String DATA_ACQUISITION_FAILED = "数据库数据获取失败"; - - String DELETE_SUCCESS = "组成员删除成功"; - - String DELETE_FAILED = "组成员删除失败"; - - /** - * 删除组成员时对应话题操作日志表设置默认的屏蔽理由 - */ - String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java index 481935dd64..c21bded4a8 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/exception/ModuleErrorCode.java @@ -22,5 +22,15 @@ import com.epmet.commons.tools.exception.ErrorCode; */ public interface ModuleErrorCode extends ErrorCode { + String DATA_ACQUISITION_FAILED = "数据库数据获取失败"; + + String DELETE_SUCCESS = "组成员删除成功"; + + String DELETE_FAILED = "组成员删除失败"; + + /** + * 删除组成员时对应话题操作日志表设置默认的屏蔽理由 + */ + String DELETE_MEMBER_REASON = "删除组成员，屏蔽该成员话题"; } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 575d610516..72c34fedcb 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -21,7 +21,7 @@ import java.util.List; * @Author yinzuomei * @Date 2020/3/16 14:48 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class) +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallback.class,url="http://localhost:8087") public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java index 82296c2023..a75a34e049 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupStatisticalServiceImpl.java @@ -29,6 +29,7 @@ import com.epmet.commons.tools.utils.Result; import com.epmet.dto.form.UserRoleFormDTO; import com.epmet.dto.result.UserRoleResultDTO; import com.epmet.modules.constant.UserMessageConstant; +import com.epmet.modules.exception.ModuleErrorCode; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.dao.ResiGroupStatisticalDao; import com.epmet.modules.group.entity.ResiGroupEntity; @@ -124,7 +125,7 @@ public class ResiGroupStatisticalServiceImpl extends BaseServiceImpl> resultList = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO); if (!resultList.success()) { - result.error(UserMessageConstant.DATA_ACQUISITION_FAILED); + result.error(ModuleErrorCode.DATA_ACQUISITION_FAILED); return result; } for (UserRoleResultDTO userRole : resultList.getData()) { diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java index ae38a58103..418d5b504b 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java @@ -33,6 +33,7 @@ import com.epmet.dto.form.UserResiInfoListFormDTO; import com.epmet.dto.result.UserResiInfoResultDTO; import com.epmet.feign.MessageFeignClient; import com.epmet.modules.constant.UserMessageConstant; +import com.epmet.modules.exception.ModuleErrorCode; import com.epmet.modules.feign.EpmetUserFeignClient; import com.epmet.modules.group.service.ResiGroupService; import com.epmet.modules.group.service.ResiGroupStatisticalService; @@ -432,16 +433,16 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl Date: Sat, 11 Apr 2020 12:54:22 +0800 Subject: [PATCH 09/15] =?UTF-8?q?=E6=8E=A8=E8=8D=90=E7=BE=A4=E8=BF=94?= =?UTF-8?q?=E5=8F=82=E6=96=B0=E5=A2=9Estatus,ErrorCode=E6=B7=BB=E5=8A=A0?= =?UTF-8?q?=E6=B3=A8=E9=87=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/epmet/entity/SysLogErrorEntity.java | 2 +- .../commons/tools/exception/ErrorCode.java | 81 +++++++++++++++++++ .../tools/exception/RenExceptionHandler.java | 4 +- .../epmet/commons/tools/log/SysLogError.java | 2 +- .../group/result/RecommendGroupResultDTO.java | 5 ++ .../service/impl/ResiGroupServiceImpl.java | 8 ++ .../member/dao/GroupMemeberOperationDao.java | 11 +++ .../service/GroupMemeberOperationService.java | 11 +++ .../GroupMemeberOperationServiceImpl.java | 13 +++ .../member/GroupMemeberOperationDao.xml | 14 ++++ 10 files changed, 147 insertions(+), 4 deletions(-) diff --git a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysLogErrorEntity.java b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysLogErrorEntity.java index d408b6da24..9e6e78784c 100644 --- a/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysLogErrorEntity.java +++ b/epmet-admin/epmet-admin-server/src/main/java/com/epmet/entity/SysLogErrorEntity.java @@ -62,7 +62,7 @@ public class SysLogErrorEntity implements Serializable { /** * 创建者 */ - private Long creator; + private String creator; /** * 创建时间 */ diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ErrorCode.java index 1e124f87b0..55e30ac1c3 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/ErrorCode.java @@ -18,26 +18,107 @@ package com.epmet.commons.tools.exception; * @since 1.0.0 */ public interface ErrorCode { + /** + * 服务器内部异常 + */ int INTERNAL_SERVER_ERROR = 500; + /** + * 未授权 + */ int UNAUTHORIZED = 401; + + /** + * 拒绝访问，没有权限 + */ int FORBIDDEN = 403; + /** + * {0}不能为空 + */ int NOT_NULL = 10001; + + /** + * 数据库中已存在该记录 + */ int DB_RECORD_EXISTS = 10002; + + /** + * 获取参数失败 + */ int PARAMS_GET_ERROR = 10003; + + /** + * 账号或密码错误 + */ int ACCOUNT_PASSWORD_ERROR = 10004; + + /** + * 账号已被停用 + */ int ACCOUNT_DISABLE = 10005; + + /** + * 唯一标识不能为空 + */ int IDENTIFIER_NOT_NULL = 10006; + + /** + * 验证码不正确 + */ int CAPTCHA_ERROR = 10007; + + /** + * 先删除子菜单或按钮 + */ int SUB_MENU_EXIST = 10008; + + /** + * 原密码不正确 + */ int PASSWORD_ERROR = 10009; + + /** + * 账号不存在 + */ int ACCOUNT_NOT_EXIST = 10010; + + /** + * 上级部门选择错误 + */ int SUPERIOR_DEPT_ERROR = 10011; + + /** + * 上级菜单不能为自身 + */ int SUPERIOR_MENU_ERROR = 10012; + + /** + * 数据权限接口，只能是Map类型参数 + */ int DATA_SCOPE_PARAMS_ERROR = 10013; + + /** + * 请先删除下级部门 + */ int DEPT_SUB_DELETE_ERROR = 10014; + + /** + * 请先删除部门下的用户 + */ int DEPT_USER_DELETE_ERROR = 10015; + + /** + * 参数格式不正确，请使用JSON格式 + */ int JSON_FORMAT_ERROR = 10016; + + /** + * 上级区域选择错误 + */ int SUPERIOR_REGION_ERROR = 10017; + + /** + * 请先删除下级区域 + */ int REGION_SUB_DELETE_ERROR = 10018; } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java index 2fafc0cd81..6896d99dd5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/RenExceptionHandler.java @@ -14,7 +14,7 @@ import com.epmet.commons.tools.config.ModuleConfig; import com.epmet.commons.tools.log.SysLogError; import com.epmet.commons.tools.log.enums.LogTypeEnum; import com.epmet.commons.tools.log.producer.LogProducer; -import com.epmet.commons.tools.security.user.SecurityUser; +import com.epmet.commons.tools.security.user.LoginUserUtil; import com.epmet.commons.tools.utils.HttpContextUtils; import com.epmet.commons.tools.utils.IpUtils; import com.epmet.commons.tools.utils.Result; @@ -93,8 +93,8 @@ public class RenExceptionHandler { } //登录用户ID - log.setCreator(SecurityUser.getUserId()); + log.setCreator(LoginUserUtil.getLoginUserId()); //异常信息 log.setErrorInfo(ExceptionUtils.getErrorStackTrace(ex)); diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/SysLogError.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/SysLogError.java index 3b002a399f..4108944cb5 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/SysLogError.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/log/SysLogError.java @@ -56,7 +56,7 @@ public class SysLogError extends BaseLog { /** * 创建者 */ - private Long creator; + private String creator; /** * 创建时间 */ diff --git a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java index 49918db469..1c2fb006a0 100644 --- a/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java +++ b/epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/group/result/RecommendGroupResultDTO.java @@ -38,4 +38,9 @@ public class RecommendGroupResultDTO implements Serializable { */ private Integer totalPartyMember; + /** + * under_auditting审核中、rejected已拒绝的前端显示加入 + */ + private String status=""; + } 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 85c11e2858..ee936b3911 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 @@ -19,6 +19,7 @@ package com.epmet.modules.group.service.impl; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.api.R; import com.epmet.commons.mybatis.service.impl.BaseServiceImpl; import com.epmet.commons.tools.constant.EpmetRoleKeyConstant; import com.epmet.commons.tools.constant.FieldConstant; @@ -186,6 +187,13 @@ public class ResiGroupServiceImpl extends BaseServiceImpl recommendGroupList = baseDao.selectListRecommendGroup(recommendGroupFormDTO); + for (RecommendGroupResultDTO recommendGroupResultDTO : recommendGroupList) { + GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.selectLatestRecord(recommendGroupResultDTO.getGroupId(), + recommendGroupFormDTO.getUserId()); + if (null != groupMemeberOperationDTO) { + recommendGroupResultDTO.setStatus(groupMemeberOperationDTO.getOperateStatus()); + } + } return new Result>().ok(recommendGroupList); } diff --git a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java index c2d4bc16aa..8d56bd49af 100644 --- a/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java +++ b/epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/GroupMemeberOperationDao.java @@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.dao.BaseDao; import com.epmet.modules.member.entity.GroupMemeberOperationEntity; import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 组成员出入群记录表 @@ -39,4 +40,14 @@ public interface GroupMemeberOperationDao extends BaseDao + + From 24cfd06fcf91fed359dfa9d585cebe286d0e0ba8 Mon Sep 17 00:00:00 2001 From: sunyuchao Date: Sat, 11 Apr 2020 13:16:48 +0800 Subject: [PATCH 10/15] =?UTF-8?q?=E5=B1=85=E6=B0=91=E6=B3=A8=E5=86=8C?= =?UTF-8?q?=E3=80=81=E7=83=AD=E5=BF=83=E5=B1=85=E6=B0=91=E7=94=B3=E8=AF=B7?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E6=8E=A5=E5=8F=A3=E4=BC=98=E5=8C=96=EF=BC=88?= =?UTF-8?q?=E8=BF=94=E5=8F=82=20=E6=8F=90=E7=A4=BA=E8=AF=AD=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 4 +++- .../impl/CustomerStaffGridServiceImpl.java | 6 ------ .../modules/exception/ModuleErrorCode.java | 2 -- .../service/impl/ResiRegisterServiceImpl.java | 15 --------------- .../form/ResiWarmheartedFormDTO.java | 5 +++++ .../constant/ResiWarmheartedVisitConstant.java | 2 +- .../impl/ResiWarmheartedApplyServiceImpl.java | 18 ++++++++++++------ .../warmhearted/ResiWarmheartedApplyDao.xml | 3 +++ .../constant/UserResiRegisterConstant.java | 3 +-- .../UserResiRegisterVisitController.java | 2 +- .../service/UserResiRegisterVisitService.java | 2 +- .../service/impl/UserResiInfoServiceImpl.java | 7 +++---- .../impl/UserResiRegisterVisitServiceImpl.java | 15 +++++++++++---- 13 files changed, 41 insertions(+), 43 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index de82024de8..46e63ab382 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -18,7 +18,9 @@ public enum EpmetErrorCode { MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), - CANNOT_AUDIT_WARM(8201, "只有注册居民才可以申请热心居民，请先完成居民注册"); + CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"), + RESI_WARM_INIT(8202, "您的信息已提交成功，请等待后台审核。"), + RESI_WARM_SUBMIT(8203, "热心居民信息已提交成功，请等待后台审核。"); private int code; diff --git a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java index 6bb2f7243f..467ff9449b 100644 --- a/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java +++ b/epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/CustomerStaffGridServiceImpl.java @@ -120,12 +120,6 @@ public class CustomerStaffGridServiceImpl extends BaseServiceImpl().error(ModuleErrorCode.MOBILE_EXCEPTION); - } formDTO.setUserId(tokenDTO.getUserId()); return epmetUserFeignClient.getVerificationCode(formDTO); } - /** - * 校验手机号是否合规 - * - * @param mobile - * @return - * @Author sun - */ - private static boolean validateMobile(String mobile) { - Pattern pattern = Pattern.compile("^[1][3,4,5,7,8][0-9]{9}$"); - return pattern.matcher(mobile).matches(); - } - } diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java index 0b474c8bdd..0b33c41cdd 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedFormDTO.java @@ -55,4 +55,9 @@ public class ResiWarmheartedFormDTO implements Serializable { */ private String userId; + /** + * 审核状态 + */ + private String auditStatus; + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java index a7da270749..336b6f6f11 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java @@ -49,5 +49,5 @@ public interface ResiWarmheartedVisitConstant { /** * 数据库操作异常 */ - String OPERATION_EXCEPTION = "数据库操作异常！"; + String OPERATION_EXCEPTION = "数据库操作异常"; } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java index 9e68e887bf..513a351ab4 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java @@ -146,28 +146,34 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl().ok(resiWarmheartedResultDTO); + return result.ok(resiWarmheartedResultDTO); } @Override @Transactional(rollbackFor = Exception.class) public Result submit(ResiWarmheartedSubmitFormDTO formDTO) { + Result result = new Result(); //1:将申请记录存入热心居民申请表中 saveResiWarmApply(formDTO); //2:将最后一次操作行为更新到热心居民申请行为记录表中 resiWarmheartedVisitService.updateResiWarmVisit(formDTO); - return new Result(); + result.setCode(EpmetErrorCode.RESI_WARM_SUBMIT.getCode()); + result.setMsg(EpmetErrorCode.RESI_WARM_SUBMIT.getMsg()); + return result; } /** @@ -204,9 +210,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl NumConstant.ZERO && NumConstant.ONE_STR.equals(formDTO.getAuditStatus())) { //查询需要添加热心居民角色的userId ResiWarmheartedApplyEntity resiWarmheartedApplyEntity = baseDao.selectById(formDTO.getResiWarmApplyId()); UserRoleDTO dto = new UserRoleDTO(); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml index e4f87e4f27..ba8099f0fb 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml @@ -52,6 +52,9 @@ AND rw.user_id = #{userId} + + AND rw.audit_status != #{auditStatus} + diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java index 2f48d93d79..183290ec40 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java @@ -36,7 +36,6 @@ public interface UserResiRegisterConstant { */ String FAILD = "faild"; - String MOBILE_EXIST = "该手机号已注册居民，请使用其他手机号注册"; - String UPDATE_EXCEPTION = "用户居民注册访问记录表更新数据失败"; + String UPDATE_EXCEPTION = "用户居民注册访问记录表数据更新失败"; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java index 8b9971f8bd..aea84d1a23 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiRegisterVisitController.java @@ -95,6 +95,6 @@ public class UserResiRegisterVisitController { @PostMapping("init") public Result init(@RequestBody ResiRegisterFormDTO resiRegisterFormDTO){ - return userResiRegisterVisitService.saveUserResiRegisterVisit(resiRegisterFormDTO); + return userResiRegisterVisitService.init(resiRegisterFormDTO); } } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java index 62c385b557..579cb1e1c3 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java @@ -107,7 +107,7 @@ public interface UserResiRegisterVisitService extends BaseService saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO); + Result init(ResiRegisterFormDTO formDTO); /** * 居民端-居民注册信息提交-更新访问行为记录表数据 diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 8c937bc084..6ca4a3ae2b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -145,7 +145,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl map = (Map) result.getData(); - if(null == map) { + if (null == map || null == map.get("code")) { result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); return result; @@ -271,7 +271,6 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl list = userResiInfoDao.selectResiInfoByMobile(mobile); if (list.size() > 0) { bl = false; diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java index a24c454e82..1182611384 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java @@ -117,9 +117,16 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO) { + public Result init(ResiRegisterFormDTO formDTO) { Date date = new Date(); UserResiRegisterVisitEntity entity = new UserResiRegisterVisitEntity(); entity.setCustomerId(formDTO.getCustomerId()); @@ -130,7 +137,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl().ok(resiRegisterResultDTO); @@ -151,7 +158,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl Date: Sat, 11 Apr 2020 14:47:50 +0800 Subject: [PATCH 11/15] =?UTF-8?q?=E5=85=9A=E5=91=98=E8=AE=A4=E8=AF=81bug?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../tools/exception/EpmetErrorCode.java | 8 +- .../PartymemberConfirmAutoDTO.java | 5 + .../epmet/constant/PartyMemberConstant.java | 14 +- .../modules/feign/EpmetUserFeignClient.java | 3 +- .../service/PartyMemberConfirmService.java | 1 + .../PartymemberConfirmAutoService.java | 10 ++ .../PartymemberConfirmManualService.java | 116 +++++++++-------- .../impl/PartyMemberConfirmServiceImpl.java | 55 +++++--- .../impl/PartymemberBaseInfoServiceImpl.java | 41 +++--- .../PartymemberConfirmAutoServiceImpl.java | 120 ++++++++++-------- .../PartymemberConfirmManualServiceImpl.java | 8 ++ .../mapper/partymember/PartymemberInfoDao.xml | 15 ++- 12 files changed, 237 insertions(+), 159 deletions(-) diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java index 46e63ab382..1495df359d 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java @@ -12,10 +12,10 @@ public enum EpmetErrorCode { ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"), LOSE_EFFICACY(8006,"此邀请链接已过期"), - MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"), - MOBILE_CODE_ERROR(8102, "手机验证码错误"), - AUTO_CONFIRM_FAILED(8103, "自动认证失败"), - MOBILE_GET_CODE_ERROR(8104,"获取手机验证码失败"), + MOBILE_HAS_BEEN_USED(8101, "该手机号已注册，请更换手机号或使用原绑定的微信账号登录"), + MOBILE_CODE_ERROR(8102, "验证码错误"), + AUTO_CONFIRM_FAILED(8103, "党员注册失败"), + MOBILE_GET_CODE_ERROR(8104,"获取验证码失败"), MESSAGE_SMS_SEND_ERROR(8105, "短信发送失败"), CANNOT_AUDIT_WARM(8201, "未注册居民不能申请热心居民，请先完善居民注册。"), diff --git a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java index bd17f2582b..2499990b59 100644 --- a/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java +++ b/epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberConfirmAutoDTO.java @@ -135,4 +135,9 @@ public class PartymemberConfirmAutoDTO implements Serializable { */ private Date updatedTime; + /** + * 比对结果 + */ + private Boolean comparisonResults; + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index 6fcea577b8..b281285467 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -49,37 +49,37 @@ public interface PartyMemberConstant { /** * 比对结果相同 */ - Double EQUALS = 1.0; + Double EQUALS = 0.0; /** * 身份证比对结果大部分相同最低值 */ - Double ID_MOST = 0.88; + Double ID_MOST = 2.0; /** * 身份证比对结果小部分相同最低值 */ - Double ID_SMALL = 0.5; + Double ID_SMALL = 5.0; /** * 手机号比对结果大部分相同最低值 */ - Double MOBILE_MOST = 0.81; + Double MOBILE_MOST = 2.0; /** * 手机号比对结果小部分相同最低值 */ - Double MOBILE_SMALL = 0.5; + Double MOBILE_SMALL = 5.0; /** * 姓名比对结果大部分相同最低值 */ - Double NAME_MOST = 0.66; + Double NAME_MOST = 1.0; /** * 姓名比对结果小部分相同最低值 */ - Double NAME_SMALL = 0.5; + Double NAME_SMALL = 2.0; /** * 比对结果相同 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java index 211ae18ba8..9985019a59 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java @@ -16,7 +16,8 @@ import org.springframework.web.bind.annotation.RequestBody; * @dscription * @date 2020/3/30 14:51 */ -@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url="http://localhost:8087") +@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class,url = + "http://localhost:8087") public interface EpmetUserFeignClient { /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java index e9503682e1..feee93b3cc 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberConfirmService.java @@ -46,4 +46,5 @@ public interface PartyMemberConfirmService { */ Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO); + } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java index 57c73e6c0f..22bab006b9 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/PartymemberConfirmAutoService.java @@ -93,4 +93,14 @@ public interface PartymemberConfirmAutoService extends BaseService { - /** - * 默认分页 - * - * @param params - * @return PageData - * @author generator - * @date 2020-03-30 - */ - PageData page(Map params); + /** + * 默认分页 + * + * @param params + * @return PageData + * @author generator + * @date 2020-03-30 + */ + PageData page(Map params); - /** - * 默认查询 - * - * @param params - * @return java.util.List - * @author generator - * @date 2020-03-30 - */ - List list(Map params); + /** + * 默认查询 + * + * @param params + * @return java.util.List + * @author generator + * @date 2020-03-30 + */ + List list(Map params); - /** - * 单条查询 - * - * @param id - * @return PartymemberConfirmManualDTO - * @author generator - * @date 2020-03-30 - */ - PartymemberConfirmManualDTO get(String id); + /** + * 单条查询 + * + * @param id + * @return PartymemberConfirmManualDTO + * @author generator + * @date 2020-03-30 + */ + PartymemberConfirmManualDTO get(String id); - /** - * 默认保存 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-30 - */ - void save(PartymemberConfirmManualDTO dto); + /** + * 默认保存 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-30 + */ + void save(PartymemberConfirmManualDTO dto); - /** - * 默认更新 - * - * @param dto - * @return void - * @author generator - * @date 2020-03-30 - */ - void update(PartymemberConfirmManualDTO dto); + /** + * 默认更新 + * + * @param dto + * @return void + * @author generator + * @date 2020-03-30 + */ + void update(PartymemberConfirmManualDTO dto); - /** - * 批量删除 - * - * @param ids - * @return void - * @author generator - * @date 2020-03-30 - */ - void delete(String[] ids); + /** + * 批量删除 + * + * @param ids + * @return void + * @author generator + * @date 2020-03-30 + */ + void delete(String[] ids); + + /** + * 单条查询 + * + * @param partymemberInfoId + * @return + */ + PartymemberConfirmManualDTO getInfoByPartyMemberInfoId(String partymemberInfoId); } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index 1606179d24..5d7e6cff76 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -18,7 +18,9 @@ import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO; import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO; import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; +import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmManualDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; +import com.epmet.resi.partymember.dto.partymember.form.PartyMemberVerifyFromDTO; import lombok.extern.slf4j.Slf4j; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -81,8 +83,9 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService userResiInfoFormDTO.setUserId(fromDto.getUserId()); UserResiInfoResultDTO userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO).getData(); if (null != userResiInfoResult) { - PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, + PartymemberInfoDTO partyMemberInfo = ConvertUtils.sourceToTarget(userResiInfoResult, PartymemberInfoDTO.class); + partyMemberInfo.setId(""); partyMemberInfo.setMobile(userResiInfoResult.getRegMobile()); partyMemberInfo.setEstate(userResiInfoResult.getDistrict()); partyMemberInfo.setBuilding(userResiInfoResult.getBuildingAddress()); @@ -115,7 +118,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //生成短信验证码 Map message = (Map) messageFeignClient.sendSmsCaptcha(fromDTO.getMobile()).getData(); - if(null == message) { + if (null == message) { result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getCode()); result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getMsg()); return result; @@ -157,13 +160,18 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO, PartymemberInfoEntity.class); - if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) { + if (confirmAutoDTO == null || (confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0 && !confirmAutoDTO.getComparisonResults())) { //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED); //自动认证失败 partyMemberInfoEntity.setConfirmResult("1"); - partymemberInfoService.insert(partyMemberInfoEntity); + if (partyMemberInfoEntity.getId().isEmpty()) { + partymemberInfoService.insert(partyMemberInfoEntity); + } else { + partymemberInfoService.updateById(partyMemberInfoEntity); + } + result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getCode()); result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getMsg()); @@ -173,7 +181,11 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //自动认证成功 partyMemberInfoEntity.setConfirmResult("0"); - partymemberInfoService.insert(partyMemberInfoEntity); + if (partyMemberInfoEntity.getId().isEmpty()) { + partymemberInfoService.insert(partyMemberInfoEntity); + } else { + partymemberInfoService.updateById(partyMemberInfoEntity); + } //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); @@ -188,9 +200,17 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //将自动认证结果存入党员认证自动审核表 if (confirmAutoDTO != null) { + PartymemberConfirmAutoDTO partymemberConfirmAutoDTO = + partymemberConfirmAutoService.getInfoByPartyMemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getPartymemberVisitId()); - partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO, - PartymemberConfirmAutoEntity.class)); + if (null == partymemberConfirmAutoDTO) { + partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO, + PartymemberConfirmAutoEntity.class)); + } else { + confirmAutoDTO.setId(partymemberConfirmAutoDTO.getId()); + partymemberConfirmAutoService.updateById(ConvertUtils.sourceToTarget(confirmAutoDTO, + PartymemberConfirmAutoEntity.class)); + } } //判断是否已注册居民，如果没有则注册居民 @@ -209,15 +229,20 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO); infoDTO.setId(partyMemberInfo.getId()); partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class)); + PartymemberConfirmManualDTO partymemberConfirmManualDTO = + partymemberConfirmManualService.getInfoByPartyMemberInfoId(partyMemberInfo.getId()); + + if (null == partymemberConfirmManualDTO) { + //待审核数据存入党员认证人工审核表 + PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity(); + manualEntity.setCustomerId(infoDTO.getCustomerId()); + manualEntity.setGridId(infoDTO.getGridId()); + manualEntity.setUserId(infoDTO.getUserId()); + manualEntity.setPartymemberInfoId(infoDTO.getId()); + manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); + partymemberConfirmManualService.insert(manualEntity); + } - //待审核数据存入党员认证人工审核表 - PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity(); - manualEntity.setCustomerId(infoDTO.getCustomerId()); - manualEntity.setGridId(infoDTO.getGridId()); - manualEntity.setUserId(infoDTO.getUserId()); - manualEntity.setPartymemberInfoId(infoDTO.getId()); - manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING); - partymemberConfirmManualService.insert(manualEntity); return new Result(); } diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index c70c32c7d8..2f8e281b68 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -31,7 +31,7 @@ import com.epmet.modules.partymember.service.PartymemberBaseInfoService; import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO; import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO; -import info.debatty.java.stringsimilarity.JaroWinkler; +import info.debatty.java.stringsimilarity.Levenshtein; import org.apache.commons.lang3.StringUtils; import org.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; @@ -129,7 +129,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl baseInfo.getMobile().equals(partyMemberInfo.getMobile())).findFirst(); if (matchingResult.isPresent()) { - confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo); + confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true); return confirmAutoDTO; } @@ -137,7 +137,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl baseInfo.getName().equals(name)).findFirst(); if (matchingResult.isPresent()) { - confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo); + confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true); return confirmAutoDTO; } @@ -147,7 +147,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl mobileList = baseDao.selectBaseInfoByIdCard(partyMemberInfo); + List mobileList = baseDao.selectBaseInfoByMobile(partyMemberInfo); if (null != mobileList && mobileList.size() > 0) { //判断手机号和姓名 @@ -155,7 +155,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl baseInfo.getName().equals(name)).findFirst(); if (matchingResult.isPresent()) { - confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo); + confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo, true); return confirmAutoDTO; } @@ -164,7 +164,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl nameList = baseDao.selectBaseInfoByIdCard(partyMemberInfo); + List nameList = baseDao.selectBaseInfoByName(partyMemberInfo); if (null != nameList && nameList.size() > 0) { //获取匹配度最高的数据 @@ -175,13 +175,20 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0); - confirmAutoDTO = getResult(similar, partyMemberInfo); + confirmAutoDTO = getResult(similar, partyMemberInfo, false); return confirmAutoDTO; + } else { + return null; } } } - return null; + + PartymemberBaseInfoEntity similar = + sortList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) -> + getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0); + + return getResult(similar, partyMemberInfo, false); } @@ -192,7 +199,8 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl most) { + } else if (comparisonResult <= most) { result = result + "10"; - } else if (comparisonResult < small) { + } else if (comparisonResult >= small) { result = result + "00"; } else { result = result + "01"; diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java index 7681ed60dc..7000a9a731 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmAutoServiceImpl.java @@ -38,8 +38,8 @@ import java.util.List; import java.util.Map; /** - * 党员认证自动审核表 -只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录 + * 党员认证自动审核表 + * 只有在根据三项比对在partymember_base_info表有查询到数据 并且有一项的比对结果是11的才会在自动审核表有记录 * * @author generator generator@elink-cn.com * @since v1.0.0 2020-03-30 @@ -47,59 +47,67 @@ import java.util.Map; @Service public class PartymemberConfirmAutoServiceImpl extends BaseServiceImpl implements PartymemberConfirmAutoService { - @Autowired - private PartymemberConfirmAutoRedis partymemberConfirmAutoRedis; - - @Override - public PageData page(Map params) { - IPage page = baseDao.selectPage( - getPage(params, FieldConstant.CREATED_TIME, false), - getWrapper(params) - ); - return getPageData(page, PartymemberConfirmAutoDTO.class); - } - - @Override - public List list(Map params) { - List entityList = baseDao.selectList(getWrapper(params)); - - return ConvertUtils.sourceToTarget(entityList, PartymemberConfirmAutoDTO.class); - } - - private QueryWrapper getWrapper(Map params){ - String id = (String)params.get(FieldConstant.ID_HUMP); - - QueryWrapper wrapper = new QueryWrapper<>(); - wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); - - return wrapper; - } - - @Override - public PartymemberConfirmAutoDTO get(String id) { - PartymemberConfirmAutoEntity entity = baseDao.selectById(id); - return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void save(PartymemberConfirmAutoDTO dto) { - PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class); - insert(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void update(PartymemberConfirmAutoDTO dto) { - PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class); - updateById(entity); - } - - @Override - @Transactional(rollbackFor = Exception.class) - public void delete(String[] ids) { - // 逻辑删除（@TableLogic 注解） - baseDao.deleteBatchIds(Arrays.asList(ids)); - } + @Autowired + private PartymemberConfirmAutoRedis partymemberConfirmAutoRedis; + + @Override + public PageData page(Map params) { + IPage page = baseDao.selectPage( + getPage(params, FieldConstant.CREATED_TIME, false), + getWrapper(params) + ); + return getPageData(page, PartymemberConfirmAutoDTO.class); + } + + @Override + public List list(Map params) { + List entityList = baseDao.selectList(getWrapper(params)); + + return ConvertUtils.sourceToTarget(entityList, PartymemberConfirmAutoDTO.class); + } + + private QueryWrapper getWrapper(Map params) { + String id = (String) params.get(FieldConstant.ID_HUMP); + + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id); + + return wrapper; + } + + @Override + public PartymemberConfirmAutoDTO get(String id) { + PartymemberConfirmAutoEntity entity = baseDao.selectById(id); + return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void save(PartymemberConfirmAutoDTO dto) { + PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class); + insert(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void update(PartymemberConfirmAutoDTO dto) { + PartymemberConfirmAutoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberConfirmAutoEntity.class); + updateById(entity); + } + + @Override + @Transactional(rollbackFor = Exception.class) + public void delete(String[] ids) { + // 逻辑删除（@TableLogic 注解） + baseDao.deleteBatchIds(Arrays.asList(ids)); + } + + @Override + public PartymemberConfirmAutoDTO getInfoByPartyMemberInfoId(String partymemberInfoId) { + QueryWrapper wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId); + PartymemberConfirmAutoEntity entity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(entity, PartymemberConfirmAutoDTO.class); + } } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java index 8922637b53..926218c9ef 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberConfirmManualServiceImpl.java @@ -101,4 +101,12 @@ public class PartymemberConfirmManualServiceImpl extends BaseServiceImpl wrapper = new QueryWrapper<>(); + wrapper.eq(StringUtils.isNotBlank(partymemberInfoId), "PARTYMEMBER_INFO_ID", partymemberInfoId); + PartymemberConfirmManualEntity entity = baseDao.selectOne(wrapper); + return ConvertUtils.sourceToTarget(entity, PartymemberConfirmManualDTO.class); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml index 46c290d959..0eb6e6a06e 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml @@ -31,14 +31,17 @@