Browse Source

话题、评论相关接口

master
wangchao 6 years ago
parent
commit
3159b68152
  1. 4
      epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/exception/EpmetErrorCode.java
  2. 2
      epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml
  3. 2
      epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml
  4. 6
      epmet-module/epmet-oss/epmet-oss-server/pom.xml
  5. 2
      epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java
  6. 2
      epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml
  7. 2
      epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml
  8. 2
      epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml
  9. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java
  10. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java
  11. 101
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java
  12. 31
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java
  13. 28
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java
  14. 27
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java
  15. 20
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java
  16. 51
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java
  17. 0
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java
  18. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java
  19. 10
      epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java
  20. 10
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java
  21. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java
  22. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/impl/ResiGroupServiceImpl.java
  23. 0
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep
  24. 97
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java
  25. 0
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep
  26. 44
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java
  27. 0
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep
  28. 35
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java
  29. 0
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep
  30. 128
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java
  31. 0
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/.gitkeep
  32. 252
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/impl/GroupInvitationServiceImpl.java
  33. 12
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java
  34. 105
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/service/impl/ResiGroupMemberServiceImpl.java
  35. 20
      epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java
  36. 25
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml
  37. 17
      epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml
  38. 8
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java
  39. 8
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java
  40. 13
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java
  41. 11
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java
  42. 17
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java
  43. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java
  44. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java
  45. 5
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java
  46. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java
  47. 10
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedServiceImpl.java
  48. 65
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java
  49. 2
      epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java
  50. 23
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java
  51. 10
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java
  52. 3
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java
  53. 4
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java
  54. 14
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java
  55. 11
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java
  56. 44
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedApplyServiceImpl.java
  57. 26
      epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/impl/ResiWarmheartedVisitServiceImpl.java
  58. 40
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml
  59. 12
      epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml
  60. 21
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java
  61. 2
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java
  62. 5
      epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserResiRegisterConstant.java
  63. 20
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java
  64. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java
  65. 3
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java
  66. 6
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java
  67. 2
      epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java
  68. 8
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java
  69. 9
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java
  70. 11
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java
  71. 35
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/RegisterRelationServiceImpl.java
  72. 54
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java
  73. 22
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiRegisterVisitServiceImpl.java
  74. 4
      epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml
  75. 34
      epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml
  76. 37
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml
  77. 7
      epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml

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

@ -9,7 +9,9 @@ public enum EpmetErrorCode {
CANNOT_JOIN_GROUP(8001, "只有认证党员和居民才可以加入小组,请选择您的身份"),
CANNOT_CREATE_GROUP(8002, "只有党员和热心居民才能创建小组,请选择您的身份"),
GROUP_ALREADY_EXISTED(8003,"您的组名已存在,请重新修改"),
ALREADY_APPLIED_GROUP(8004,"该群已申请过,请耐心等待审核");
ALREADY_APPLIED_GROUP(8004,"该群已申请过,请耐心等待审核"),
ONLY_LEADER_CAN_INVITE(8005,"抱歉,只有群主才可以邀请新成员"),
LOSE_EFFICACY(8006,"链接已失效");
private int value;
private String name;

2
epmet-module/epmet-job/epmet-job-server/src/main/resources/bootstrap.yml

@ -4,6 +4,8 @@ server:
context-path: /job
spring:
main:
allow-bean-definition-overriding: true
application:
name: epmet-job-server
#环境 dev|test|prod

2
epmet-module/epmet-message/epmet-message-server/src/main/resources/bootstrap.yml

@ -4,6 +4,8 @@ server:
context-path: /message
spring:
main:
allow-bean-definition-overriding: true
application:
name: epmet-message-server
#环境 dev|test|prod

6
epmet-module/epmet-oss/epmet-oss-server/pom.xml

@ -92,12 +92,6 @@
<artifactId>fastdfs-client</artifactId>
<version>${fastdfs.version}</version>
</dependency>
<!-- 替换Feign原生httpclient -->
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-httpclient</artifactId>
<version>10.3.0</version>
</dependency>
</dependencies>
<build>

2
epmet-module/oper-access/oper-access-server/src/main/java/com/epmet/feign/EpmetUserFeignClient.java

@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
* @dscription
* @date 2020/3/19 9:32
*/
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class)
@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, path="/epmetuser", fallback = EpmetUserFeignClientFallback.class,url = "http://localhost:8087")
public interface EpmetUserFeignClient {
/**

2
epmet-module/oper-access/oper-access-server/src/main/resources/bootstrap.yml

@ -4,6 +4,8 @@ server:
context-path: /oper/access
spring:
main:
allow-bean-definition-overriding: true
application:
name: oper-access-server
#环境 dev|test|prod

2
epmet-module/oper-crm/oper-crm-server/src/main/resources/bootstrap.yml

@ -4,6 +4,8 @@ server:
context-path: /oper/crm
spring:
main:
allow-bean-definition-overriding: true
application:
name: oper-crm-server
#环境 dev|test|prod

2
epmet-module/oper-customize/oper-customize-server/src/main/resources/bootstrap.yml

@ -4,6 +4,8 @@ server:
context-path: /oper/customize
spring:
main:
allow-bean-definition-overriding: true
application:
name: oper-customize-server
#环境 dev|test|prod

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/form/ResiQueryCommentFormDTO.java

@ -0,0 +1,10 @@
package com.epmet.resi.group.dto.comment.form;
/**
* @Description
* @ClassName ResiCommentFormDTO
* @Author wangc
* @date 2020.04.01 17:14
*/
public class ResiCommentFormDTO {
}

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/comment/result/ResiCommentResultDTO.java

@ -0,0 +1,10 @@
package com.epmet.resi.group.dto.comment.result;
/**
* @Description
* @ClassName ResiCommentResultDTO
* @Author wangc
* @date 2020.04.01 17:07
*/
public class ResiCommentResultDTO {
}

101
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/GroupInvitationDTO.java

@ -0,0 +1,101 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.group.dto.invitation;
import java.io.Serializable;
import java.util.Date;
import lombok.Data;
/**
* 群邀请记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
@Data
public class GroupInvitationDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 主键可能跟epmet-user的personnel_invite的[邀请Id]关联
*/
private String id;
/**
* 邀请人idcustomer_user.id
*/
private String inviterUserId;
/**
* 邀请人所属客户id
*/
private String inviterCustomerId;
/**
* 邀请网格id
*/
private String inviterGridId;
/**
* 邀请小组id(resi_group.id)
*/
private String resiGroupId;
/**
* 邀请内容
*/
private String inviterContent;
/**
* 邀请码有效截止时间暂定XX天
*/
private Date validEndTime;
/**
* 删除标记 0未删除1已删除
*/
private String delFlag;
/**
* 乐观锁
*/
private Integer revision;
/**
* 创建人customer_user.id
*/
private String createdBy;
/**
* 创建时间(邀请时间)
*/
private Date createdTime;
/**
* 更新人
*/
private String updatedBy;
/**
* 更新时间
*/
private Date updatedTime;
}

31
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/AccetInvitationFormDTO.java

@ -0,0 +1,31 @@
package com.epmet.resi.group.dto.invitation.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 同意邀请进组
* @Author yinzuomei
* @Date 2020/3/31 23:45
*/
@Data
public class AccetInvitationFormDTO implements Serializable {
private static final long serialVersionUID = 132547449950577938L;
/**
* 邀请id
*/
@NotBlank(message="邀请链接id不能为空")
private String invitationId;
/**
* 当前登录用户id由TokenDto赋值
*/
@NotBlank(message="当前用户id不能为空")
private String userId;
@NotBlank(message = "app不能为空")
private String app;
}

28
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/CreateGroupInvitationFormDTO.java

@ -0,0 +1,28 @@
package com.epmet.resi.group.dto.invitation.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 生成邀请链接入参
* @Author yinzuomei
* @Date 2020/3/31 22:46
*/
@Data
public class CreateGroupInvitationFormDTO implements Serializable {
private static final long serialVersionUID = 5703017117444559566L;
/**
* 要审核的组id
*/
@NotBlank(message="groupId不能为空")
private String groupId;
/**
* 当前登录用户id由TokenDto赋值
*/
@NotBlank(message="当前用户id不能为空")
private String userId;
}

27
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/form/LinkGroupInfoFormDTO.java

@ -0,0 +1,27 @@
package com.epmet.resi.group.dto.invitation.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* @Description 根据群邀请连接查询群基本信息入参DTO
* @Author yinzuomei
* @Date 2020/3/31 23:12
*/
@Data
public class LinkGroupInfoFormDTO implements Serializable {
private static final long serialVersionUID = 7069116393380944951L;
/**
* 邀请id
*/
@NotBlank(message="邀请链接id不能为空")
private String invitationId;
/**
* 当前登录用户id由TokenDto赋值
*/
private String userId;
}

20
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/CreateGroupInvitationResultDTO.java

@ -0,0 +1,20 @@
package com.epmet.resi.group.dto.invitation.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 生成邀请链接返参
* @Author yinzuomei
* @Date 2020/3/31 22:49
*/
@Data
public class CreateGroupInvitationResultDTO implements Serializable {
private static final long serialVersionUID = 5142118627780324057L;
/**
* 邀请id
*/
private String invitationId;
}

51
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/invitation/result/LinkGroupInfoResultDTO.java

@ -0,0 +1,51 @@
package com.epmet.resi.group.dto.invitation.result;
import lombok.Data;
import java.io.Serializable;
/**
* @Description 根据群邀请连接查询群基本信息入参DTO 小组邀请界面信息
* @Author yinzuomei
* @Date 2020/3/31 23:18
*/
@Data
public class LinkGroupInfoResultDTO implements Serializable {
private static final long serialVersionUID = 8860336693592035343L;
/**
* 群组id
*/
private String groupId;
/**
* 群组头像
*/
private String groupHeadPhoto;
/**
* 组长名称
* 暂定街道-姓名
*/
private String leaderName;
/**
* 群组名称
*/
private String groupName;
/**
* 组介绍
*/
private String groupIntroduction;
/**
* 成员总数
*/
private Integer totalMember;
/**
* 党员总数
*/
private Integer totalPartyMember;
}

0
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiCommentFormDTO.java → epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiPublishCommentFormDTO.java

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/form/ResiTopicOperationFormDTO.java

@ -0,0 +1,10 @@
package com.epmet.resi.group.dto.topic.form;
/**
* @Description
* @ClassName ResiTopicOperationFormDTO
* @Author wangc
* @date 2020.04.01 15:32
*/
public class ResiTopicOperationFormDTO {
}

10
epmet-module/resi-group/resi-group-client/src/main/java/com/epmet/resi/group/dto/topic/result/ResiTopicDetailResultDTO.java

@ -0,0 +1,10 @@
package com.epmet.resi.group.dto.topic.result;
/**
* @Description
* @ClassName ResiTopicDetailResultDTO
* @Author wangc
* @date 2020.04.01 16:03
*/
public class ResiTopicDetailResultDTO {
}

10
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/comment/controller/ResiCommentController.java

@ -0,0 +1,10 @@
package com.epmet.modules.comment.controller;
/**
* @Description
* @ClassName ResiCommentController
* @Author wangc
* @date 2020.04.01 18:00
*/
public class ResiCommentController {
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/group/service/ResiGroupService.java

@ -24,6 +24,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.modules.group.entity.ResiGroupEntity;
import com.epmet.resi.group.dto.UserRoleDTO;
import com.epmet.resi.group.dto.group.ResiGroupDTO;
import com.epmet.resi.group.dto.group.form.*;
import com.epmet.resi.group.dto.group.result.CreatedResultDTO;
@ -192,4 +193,15 @@ public interface ResiGroupService extends BaseService<ResiGroupEntity> {
* @Date 2020/3/31 13:22
**/
Result disagreeApplyGroup(DisAgreeApplyGroupFormDTO disAgreeApplyGroupFormDTO);
/**
* @return com.epmet.resi.group.dto.UserRoleDTO
* @param app
* @param userId
* @param customerId
* @Author yinzuomei
* @Description 判断用户当前角色
* @Date 2020/4/1 0:00
**/
UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId);
}

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

@ -82,8 +82,6 @@ import java.util.Map;
@Service
public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGroupEntity> implements ResiGroupService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private ResiGroupRedis resiGroupRedis;
@Autowired
private ResiGroupMemberService resiGroupMemberService;
@ -293,10 +291,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
//1、校验是否同名
List<ResiGroupEntity> resiGroupEntityList = this.getResiGroupEntityList(applyCreateGroupFormDTO);
if (null != resiGroupEntityList && resiGroupEntityList.size() > 0) {
Result errorResult = new Result();
errorResult.setCode(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue());
errorResult.setMsg(EpmetErrorCode.GROUP_ALREADY_EXISTED.getName());
return errorResult;
return new Result().error(EpmetErrorCode.GROUP_ALREADY_EXISTED.getValue(),EpmetErrorCode.GROUP_ALREADY_EXISTED.getName());
}
//2、插入一条待审核的组信息
ResiGroupEntity resiGroupEntity = this.structureResiGroupEntity(applyCreateGroupFormDTO);
@ -377,10 +372,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
Result<UserResiInfoDTO> result = epmetUserFeignClient.getUserResiInfoDTO(resiUserInfoFormDTO);
if (!result.success() || null == result.getData() || StringUtils.isBlank(result.getData().getRegMobile())) {
logger.info("居民注册信息查询失败");
Result errorResult = new Result();
errorResult.setCode(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue());
errorResult.setMsg(EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
return errorResult;
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
}
return new Result();
}
@ -415,10 +407,7 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
}
UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(tokenDto.getApp(), tokenDto.getUserId(), customerId);
if (!NumConstant.ONE_STR.equals(userRoleDTO.getPartymemberFlag()) && !NumConstant.ONE_STR.equals(userRoleDTO.getWarmHeartedFlag())) {
Result errorResult = new Result();
errorResult.setCode(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue());
errorResult.setMsg(EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
return errorResult;
return new Result().error(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue(),EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
}
return new Result();
}
@ -495,7 +484,8 @@ public class ResiGroupServiceImpl extends BaseServiceImpl<ResiGroupDao, ResiGrou
* @Description 用户拥有党员或者热心居民标签返回true, 没有权限返回false
* @Date 2020/3/30 16:33
**/
private UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
@Override
public UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
UserRoleDTO userRoleDTO = new UserRoleDTO();
UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
userRoleFormDTO.setApp(app);

0
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/.gitkeep

97
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/controller/GroupInvitationController.java

@ -0,0 +1,97 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.modules.invitation.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.commons.tools.validator.ValidatorUtils;
import com.epmet.modules.invitation.service.GroupInvitationService;
import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
/**
* 群邀请记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
@RestController
@RequestMapping("invitation")
public class GroupInvitationController {
@Autowired
private GroupInvitationService groupInvitationService;
/**
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
* @Author yinzuomei
* @Description 生成邀请
* @Date 2020/3/31 22:50
**/
@PostMapping("creategroupinvitation")
public Result<CreateGroupInvitationResultDTO> createGroupInvitation(@LoginUser TokenDto tokenDto,
@RequestBody CreateGroupInvitationFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
return groupInvitationService.createGroupInvitation(formDTO);
}
/**
* @param tokenDto
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 根据群邀请连接查询群基本信息
* @Date 2020/3/31 23:11
**/
@PostMapping("getlinkgroupinfo")
public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(@LoginUser TokenDto tokenDto,
@RequestBody LinkGroupInfoFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
ValidatorUtils.validateEntity(formDTO);
return groupInvitationService.getLinkGroupInfo(formDTO);
}
/**
* @param tokenDto
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 同意邀请进组
* @Date 2020/3/31 23:47
**/
@PostMapping("acceptinvitation")
public Result accetInvitation(@LoginUser TokenDto tokenDto,
@RequestBody AccetInvitationFormDTO formDTO) {
formDTO.setUserId(tokenDto.getUserId());
formDTO.setApp(tokenDto.getApp());
ValidatorUtils.validateEntity(formDTO);
return groupInvitationService.accetInvitation(formDTO);
}
}

0
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/.gitkeep

44
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/dao/GroupInvitationDao.java

@ -0,0 +1,44 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.modules.invitation.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.modules.invitation.entity.GroupInvitationEntity;
import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
/**
* 群邀请记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
@Mapper
public interface GroupInvitationDao extends BaseDao<GroupInvitationEntity> {
/**
* @param groupId
* @return com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO
* @Author yinzuomei
* @Description 根据群邀请连接查询群基本信息
* @Date 2020/3/31 23:22
**/
LinkGroupInfoResultDTO selectLinkGroupInfo(@Param("groupId") String groupId);
}

0
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/.gitkeep

35
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/topic/entity/ResiTopicCommentEntity.java → epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/entity/GroupInvitationEntity.java

@ -15,7 +15,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.modules.topic.entity;
package com.epmet.modules.invitation.entity;
import com.baomidou.mybatisplus.annotation.TableName;
@ -26,31 +26,46 @@ import lombok.EqualsAndHashCode;
import java.util.Date;
/**
* 话题评论
* 群邀请记录
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
@Data
@EqualsAndHashCode(callSuper=false)
@TableName("resi_topic_comment")
public class ResiTopicCommentEntity extends BaseEpmetEntity {
@TableName("group_invitation")
public class GroupInvitationEntity extends BaseEpmetEntity {
private static final long serialVersionUID = 1L;
/**
* 评论内容
* 邀请人idcustomer_user.id
*/
private String commentContent;
private String inviterUserId;
/**
* 话题Id来自resi_topic
* 邀请人所属客户id
*/
private String topicId;
private String inviterCustomerId;
/**
* 评论状态
* 邀请网格id
*/
private String status;
private String inviterGridId;
/**
* 邀请小组id(resi_group.id)
*/
private String resiGroupId;
/**
* 邀请内容
*/
private String inviterContent;
/**
* 邀请码有效截止时间暂定XX天
*/
private Date validEndTime;
}

0
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/excel/.gitkeep

128
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/invitation/service/GroupInvitationService.java

@ -0,0 +1,128 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.modules.invitation.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.invitation.entity.GroupInvitationEntity;
import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
import java.util.List;
import java.util.Map;
/**
* 群邀请记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
public interface GroupInvitationService extends BaseService<GroupInvitationEntity> {
/**
* 默认分页
*
* @param params
* @return PageData<GroupInvitationDTO>
* @author generator
* @date 2020-03-31
*/
PageData<GroupInvitationDTO> page(Map<String, Object> params);
/**
* 默认查询
*
* @param params
* @return java.util.List<GroupInvitationDTO>
* @author generator
* @date 2020-03-31
*/
List<GroupInvitationDTO> list(Map<String, Object> params);
/**
* 单条查询
*
* @param id
* @return GroupInvitationDTO
* @author generator
* @date 2020-03-31
*/
GroupInvitationDTO get(String id);
/**
* 默认保存
*
* @param dto
* @return void
* @author generator
* @date 2020-03-31
*/
void save(GroupInvitationDTO dto);
/**
* 默认更新
*
* @param dto
* @return void
* @author generator
* @date 2020-03-31
*/
void update(GroupInvitationDTO dto);
/**
* 批量删除
*
* @param ids
* @return void
* @author generator
* @date 2020-03-31
*/
void delete(String[] ids);
/**
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
* @param formDTO
* @Author yinzuomei
* @Description 生成邀请连接
* @Date 2020/3/31 22:50
**/
Result<CreateGroupInvitationResultDTO> createGroupInvitation(CreateGroupInvitationFormDTO formDTO);
/**
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
* @param formDTO
* @Author yinzuomei
* @Description 根据群邀请连接查询群基本信息
* @Date 2020/3/31 23:20
**/
Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO);
/**
* @return com.epmet.commons.tools.utils.Result
* @param formDTO
* @Author yinzuomei
* @Description 同意邀请进组
* @Date 2020/3/31 23:47
**/
Result accetInvitation(AccetInvitationFormDTO formDTO);
}

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

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

@ -0,0 +1,252 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.modules.invitation.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.invitation.dao.GroupInvitationDao;
import com.epmet.modules.invitation.entity.GroupInvitationEntity;
import com.epmet.modules.invitation.service.GroupInvitationService;
import com.epmet.modules.member.dao.ResiGroupMemberDao;
import com.epmet.modules.member.service.GroupMemeberOperationService;
import com.epmet.modules.member.service.ResiGroupMemberService;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.constant.EnterGroupTypeConstant;
import com.epmet.resi.group.constant.GroupStateConstant;
import com.epmet.resi.group.constant.LeaderFlagConstant;
import com.epmet.resi.group.constant.MemberStateConstant;
import com.epmet.resi.group.dto.UserRoleDTO;
import com.epmet.resi.group.dto.group.ResiGroupDTO;
import com.epmet.resi.group.dto.invitation.GroupInvitationDTO;
import com.epmet.resi.group.dto.invitation.form.AccetInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.CreateGroupInvitationFormDTO;
import com.epmet.resi.group.dto.invitation.form.LinkGroupInfoFormDTO;
import com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO;
import com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO;
import com.epmet.resi.group.dto.member.GroupMemeberOperationDTO;
import com.epmet.resi.group.dto.member.ResiGroupMemberDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.*;
/**
* 群邀请记录表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-31
*/
@Service
public class GroupInvitationServiceImpl extends BaseServiceImpl<GroupInvitationDao, GroupInvitationEntity> implements GroupInvitationService {
@Autowired
private ResiGroupMemberDao resiGroupMemberDao;
@Autowired
private ResiGroupService resiGroupService;
@Autowired
private ResiGroupMemberService resiGroupMemberService;
@Autowired
private GroupMemeberOperationService groupMemeberOperationService;
@Override
public PageData<GroupInvitationDTO> page(Map<String, Object> params) {
IPage<GroupInvitationEntity> page = baseDao.selectPage(
getPage(params, FieldConstant.CREATED_TIME, false),
getWrapper(params)
);
return getPageData(page, GroupInvitationDTO.class);
}
@Override
public List<GroupInvitationDTO> list(Map<String, Object> params) {
List<GroupInvitationEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, GroupInvitationDTO.class);
}
private QueryWrapper<GroupInvitationEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<GroupInvitationEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
return wrapper;
}
@Override
public GroupInvitationDTO get(String id) {
GroupInvitationEntity entity = baseDao.selectById(id);
return ConvertUtils.sourceToTarget(entity, GroupInvitationDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void save(GroupInvitationDTO dto) {
GroupInvitationEntity entity = ConvertUtils.sourceToTarget(dto, GroupInvitationEntity.class);
insert(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void update(GroupInvitationDTO dto) {
GroupInvitationEntity entity = ConvertUtils.sourceToTarget(dto, GroupInvitationEntity.class);
updateById(entity);
}
@Override
@Transactional(rollbackFor = Exception.class)
public void delete(String[] ids) {
// 逻辑删除(@TableLogic 注解)
baseDao.deleteBatchIds(Arrays.asList(ids));
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.CreateGroupInvitationResultDTO>
* @Author yinzuomei
* @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());
}
//2、审核通过(讨论中)的群才可以分享邀请连接
ResiGroupDTO resiGroupDTO = resiGroupService.get(formDTO.getGroupId());
if(!GroupStateConstant.GROUP_APPROVED.equals(resiGroupDTO.getState())){
return new Result<CreateGroupInvitationResultDTO>().error(ModuleConstant.CANNOT_SHARED);
}
//3、插入一条邀请记录
GroupInvitationEntity groupInvitationEntity = new GroupInvitationEntity();
groupInvitationEntity.setInviterUserId(formDTO.getUserId());
groupInvitationEntity.setInviterCustomerId(resiGroupDTO.getCustomerId());
groupInvitationEntity.setInviterGridId(resiGroupDTO.getGridId());
//暂定7天有效期
Calendar calendar = Calendar.getInstance();
calendar.set(Calendar.DAY_OF_YEAR, calendar.get(Calendar.DAY_OF_YEAR) + NumConstant.SEVEN);
groupInvitationEntity.setValidEndTime(calendar.getTime());
insert(groupInvitationEntity);
CreateGroupInvitationResultDTO resultDTO = new CreateGroupInvitationResultDTO();
resultDTO.setInvitationId(groupInvitationEntity.getId());
return new Result<CreateGroupInvitationResultDTO>().ok(resultDTO);
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result<com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO>
* @Author yinzuomei
* @Description 根据群邀请连接查询群基本信息
* @Date 2020/3/31 23:20
**/
@Override
public Result<LinkGroupInfoResultDTO> getLinkGroupInfo(LinkGroupInfoFormDTO formDTO) {
//校验是否存在该邀请连接
Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
if(!validResult.success()){
return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
}
LinkGroupInfoResultDTO linkGroupInfoResultDTO = baseDao.selectLinkGroupInfo(validResult.getData().getResiGroupId());
return new Result<LinkGroupInfoResultDTO>().ok(linkGroupInfoResultDTO);
}
private Result<GroupInvitationDTO> checkLinkValid(String invitationId){
//校验是否存在该邀请连接
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());
}
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>().ok(groupInvitationDTO);
}
/**
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @Author yinzuomei
* @Description 同意邀请进组
* @Date 2020/3/31 23:47
**/
@Override
public Result accetInvitation(AccetInvitationFormDTO formDTO) {
//1、申请是否有效
Result<GroupInvitationDTO> validResult = this.checkLinkValid(formDTO.getInvitationId());
if(!validResult.success()){
return new Result<LinkGroupInfoResultDTO>().error(validResult.getCode(),validResult.getMsg());
}
//2、校验是否已经注册居民
ResiGroupDTO resiGroupDTO = resiGroupService.get(validResult.getData().getResiGroupId());
if (null != resiGroupDTO) {
UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
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());
}
}
//3、新增一条邀请入群、直接审核通过的入群记录
GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
groupMemeberOperation.setGroupId(resiGroupDTO.getId());
groupMemeberOperation.setCustomerUserId(formDTO.getUserId());
groupMemeberOperation.setGroupId(resiGroupDTO.getId());
groupMemeberOperation.setOperateStatus(MemberStateConstant.APPROVED);
groupMemeberOperation.setEnterGroupType(EnterGroupTypeConstant.INVITED);
groupMemeberOperation.setCreatedBy(formDTO.getUserId());
groupMemeberOperation.setOperateUserId(formDTO.getUserId());
groupMemeberOperationService.save(groupMemeberOperation);
//4、直接加入群成员关系表
ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
resiGroupMemberDTO.setCustomerUserId(groupMemeberOperation.getCustomerUserId());
resiGroupMemberDTO.setResiGroupId(groupMemeberOperation.getGroupId());
resiGroupMemberDTO.setGroupLeaderFlag(LeaderFlagConstant.GROUP_MEMBER);
resiGroupMemberDTO.setEnterGroupType(groupMemeberOperation.getEnterGroupType());
resiGroupMemberDTO.setStatus(MemberStateConstant.APPROVED);
resiGroupMemberDTO.setCreatedBy(groupMemeberOperation.getCustomerUserId());
resiGroupMemberService.save(resiGroupMemberDTO);
//5、修改群统计值
UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(formDTO.getApp(),
formDTO.getUserId(),
resiGroupDTO.getCustomerId());
resiGroupMemberDao.updateResiGroupStatistical(groupMemeberOperation.getGroupId(), userRoleDTO);
//6、发送消息 TODO
return new Result();
}
}

12
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/member/dao/ResiGroupMemberDao.java

@ -85,5 +85,15 @@ public interface ResiGroupMemberDao extends BaseDao<ResiGroupMemberEntity> {
* @Description 查看用户是否存在有效的入群申请
* @Date 2020/3/31 14:52
**/
GroupMemeberOperationDTO selectGroupMemberOperationUnderAudit(@Param("userId") String userId, @Param("groupId") String groupId);
GroupMemeberOperationDTO selectGroupMemberOperationLatest(@Param("userId") String userId, @Param("groupId") String groupId);
/**
* @return com.epmet.resi.group.dto.member.ResiGroupMemberDTO
* @param groupId
* @param userId
* @Author yinzuomei
* @Description 根据组id+用户id查询成员信息
* @Date 2020/3/31 16:06
**/
ResiGroupMemberDTO selectGroupMemberInfo(@Param("groupId") String groupId, @Param("userId")String userId);
}

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

@ -20,22 +20,18 @@ package com.epmet.modules.member.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.EpmetRoleKeyConstant;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.form.UserRoleFormDTO;
import com.epmet.dto.result.UserRoleResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
import com.epmet.modules.group.service.ResiGroupService;
import com.epmet.modules.member.dao.ResiGroupMemberDao;
import com.epmet.modules.member.entity.ResiGroupMemberEntity;
import com.epmet.modules.member.redis.ResiGroupMemberRedis;
import com.epmet.modules.member.service.GroupMemeberOperationService;
import com.epmet.modules.member.service.ResiGroupMemberService;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.resi.group.constant.EnterGroupTypeConstant;
import com.epmet.resi.group.constant.LeaderFlagConstant;
import com.epmet.resi.group.constant.MemberStateConstant;
@ -66,8 +62,6 @@ import java.util.Map;
@Service
public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberDao, ResiGroupMemberEntity> implements ResiGroupMemberService {
private Logger logger = LoggerFactory.getLogger(getClass());
@Autowired
private ResiGroupMemberRedis resiGroupMemberRedis;
@Autowired
private GroupMemeberOperationService groupMemeberOperationService;
@ -78,9 +72,6 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
@Autowired
private ResiGroupMemberService resiGroupMemberService;
@Autowired
private EpmetUserFeignClient epmetUserFeignClient;
@Override
public PageData<ResiGroupMemberDTO> page(Map<String, Object> params) {
IPage<ResiGroupMemberEntity> page = baseDao.selectPage(
@ -162,26 +153,23 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
**/
@Override
public Result applyJoinGroup(ApplyJoinGroupFormDTO applyJoinGroupFormDTO) {
//校验是否已经注册
//校验是否已经注册居民
ResiGroupDTO resiGroupDTO = resiGroupService.get(applyJoinGroupFormDTO.getGroupId());
if (null != resiGroupDTO) {
UserRoleDTO userRoleDTO = this.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(applyJoinGroupFormDTO.getApp(),
applyJoinGroupFormDTO.getUserId(),
resiGroupDTO.getCustomerId());
if (NumConstant.ZERO_STR.equals(userRoleDTO.getRegisteredResiFlag())) {
Result errorResult = new Result();
errorResult.setCode(EpmetErrorCode.CANNOT_CREATE_GROUP.getValue());
errorResult.setMsg(EpmetErrorCode.CANNOT_CREATE_GROUP.getName());
return errorResult;
return new Result().error(EpmetErrorCode.CANNOT_JOIN_GROUP.getValue(),EpmetErrorCode.CANNOT_JOIN_GROUP.getName());
}
}
//校验是否存在待审核的入群记录
GroupMemeberOperationDTO groupMember = baseDao.selectGroupMemberOperationUnderAudit(applyJoinGroupFormDTO.getUserId(),applyJoinGroupFormDTO.getGroupId());
if(null!=groupMember){
Result errorResult = new Result();
errorResult.setCode(EpmetErrorCode.ALREADY_APPLIED_GROUP.getValue());
errorResult.setMsg(EpmetErrorCode.ALREADY_APPLIED_GROUP.getName());
return errorResult;
//查看用户最新一条成员处理记录,避免重复申请
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());
}
if(null!=groupMember&&MemberStateConstant.APPROVED.equals(groupMember.getOperateStatus())){
return new Result().error(ModuleConstant.ALREADY_IN_GROUP);
}
//插入一条待审核的记录
GroupMemeberOperationDTO groupMemeberOperation = new GroupMemeberOperationDTO();
@ -209,6 +197,13 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
int pageIndex = (groupMemberListFormDTO.getPageNo() - NumConstant.ONE) * groupMemberListFormDTO.getPageSize();
groupMemberListFormDTO.setPageNo(pageIndex);
List<GroupMemberListResultDTO> list = baseDao.selectListGroupMember(groupMemberListFormDTO);
if (null != list && list.size() > 0) {
for (GroupMemberListResultDTO groupMemberListResultDTO : list) {
groupMemberListResultDTO.setUserShowName("测试昵称");
groupMemberListResultDTO.setHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
}
}
return new Result<List<GroupMemberListResultDTO>>().ok(list);
}
@ -224,6 +219,12 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
int pageIndex = (applyingMemberFormDTO.getPageNo() - NumConstant.ONE) * applyingMemberFormDTO.getPageSize();
applyingMemberFormDTO.setPageNo(pageIndex);
List<ApplyingMemberResultDTO> list = baseDao.selectListApplyingMember(applyingMemberFormDTO);
if (null != list && list.size() > 0) {
for (ApplyingMemberResultDTO applyingMemberResultDTO : list) {
applyingMemberResultDTO.setApplyUserName("测试昵称");
applyingMemberResultDTO.setApplyUserHeadPhoto("https://wx.qlogo.cn/mmopen/vi_32/PiajxSqBRaEIXGqhj0JakGnhk0L4x31XuWyQM4OxnriaKD4GuAgr8GdLpwu8jphH0oQPbPy0pepWU5iciaIeQwUJPg/132");
}
}
return new Result<List<ApplyingMemberResultDTO>>().ok(list);
}
@ -236,10 +237,20 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
**/
@Override
public Result agreeApply(AgreeApplyFormDTO agreeApplyFormDTO) {
//修改操作状态
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(agreeApplyFormDTO.getApplyId());
//当前申请单是否是待审核
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
return new Result().error(ModuleConstant.APPLY_NOEXISTS);
}
//只有群主才可以审批入群申请
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), agreeApplyFormDTO.getUserId());
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
}
//修改操作状态
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.APPROVED);
groupMemeberOperationDTO.setUpdatedBy(agreeApplyFormDTO.getUserId());
groupMemeberOperationDTO.setOperateUserId(agreeApplyFormDTO.getUserId());
groupMemeberOperationService.update(groupMemeberOperationDTO);
//加入群成员关系表
ResiGroupMemberDTO resiGroupMemberDTO = new ResiGroupMemberDTO();
@ -251,10 +262,11 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
resiGroupMemberDTO.setCreatedBy(groupMemeberOperationDTO.getCustomerUserId());
resiGroupMemberService.save(resiGroupMemberDTO);
//修改群统计值
UserRoleDTO userRoleDTO = checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
UserRoleDTO userRoleDTO = resiGroupService.checkPartyMemberOrWarmHeated(agreeApplyFormDTO.getApp(),
groupMemeberOperationDTO.getCustomerUserId(),
agreeApplyFormDTO.getCustomerId());
baseDao.updateResiGroupStatistical(groupMemeberOperationDTO.getGroupId(), userRoleDTO);
//给用户发送消息 TODO
return new Result();
}
@ -268,39 +280,22 @@ public class ResiGroupMemberServiceImpl extends BaseServiceImpl<ResiGroupMemberD
@Override
public Result disAgreeApply(DisagreeApplyFormDTO disagreeApplyFormDTO) {
GroupMemeberOperationDTO groupMemeberOperationDTO = groupMemeberOperationService.get(disagreeApplyFormDTO.getApplyId());
//当前申请单是否是待审核
if (null == groupMemeberOperationDTO || !MemberStateConstant.UNDER_AUDITTING.equals(groupMemeberOperationDTO.getOperateStatus())) {
return new Result().error(ModuleConstant.APPLY_NOEXISTS);
}
//只有群主才可以审批入群申请
ResiGroupMemberDTO leaderMember = baseDao.selectGroupMemberInfo(groupMemeberOperationDTO.getGroupId(), disagreeApplyFormDTO.getUserId());
if (!LeaderFlagConstant.GROUP_LEADER.equals(leaderMember.getGroupLeaderFlag())) {
return new Result().error(ModuleConstant.CANNOT_AUDIT_APPLY);
}
//修改操作状态
groupMemeberOperationDTO.setOperateStatus(MemberStateConstant.REJECTED);
groupMemeberOperationDTO.setOperateDes(disagreeApplyFormDTO.getOperateDesc());
groupMemeberOperationDTO.setUpdatedBy(disagreeApplyFormDTO.getUserId());
groupMemeberOperationDTO.setOperateUserId(disagreeApplyFormDTO.getUserId());
groupMemeberOperationService.update(groupMemeberOperationDTO);
//给用户发送消息 TODO
return new Result();
}
private UserRoleDTO checkPartyMemberOrWarmHeated(String app, String userId, String customerId) {
UserRoleDTO userRoleDTO = new UserRoleDTO();
UserRoleFormDTO userRoleFormDTO = new UserRoleFormDTO();
userRoleFormDTO.setApp(app);
userRoleFormDTO.setCustomerId(customerId);
userRoleFormDTO.setUserId(userId);
Result<List<UserRoleResultDTO>> userRoleListResult = epmetUserFeignClient.getUserRoleInfo(userRoleFormDTO);
if (!userRoleListResult.success()) {
logger.info("获取用户角色feign调用失败" + userRoleListResult.getMsg());
return userRoleDTO;
}
List<UserRoleResultDTO> userRoleList = userRoleListResult.getData();
if (null == userRoleList || userRoleList.size() == 0) {
return userRoleDTO;
}
for (UserRoleResultDTO userRoleResultDTO : userRoleList) {
if (EpmetRoleKeyConstant.PARTYMEMBER.equals(userRoleResultDTO.getRoleKey())) {
userRoleDTO.setPartymemberFlag(NumConstant.ONE_STR);
}
if (EpmetRoleKeyConstant.WARMHEARTED.equals(userRoleResultDTO.getRoleKey())) {
userRoleDTO.setWarmHeartedFlag(NumConstant.ONE_STR);
}
if (EpmetRoleKeyConstant.REGISTERED_RESI.equals(userRoleResultDTO.getRoleKey())) {
userRoleDTO.setRegisteredResiFlag(NumConstant.ONE_STR);
}
}
return userRoleDTO;
}
}

20
epmet-module/resi-group/resi-group-server/src/main/java/com/epmet/modules/utils/ModuleConstant.java

@ -77,4 +77,24 @@ public interface ModuleConstant extends Constant {
* 逻辑删除标识 未删除
* */
String DEL_FLAG = "0";
/**
* 组长审批时校验申请单是否存在
*/
String APPLY_NOEXISTS="申请单被删除";
/**
* 组长审批时校验当前用户身份
*/
String CANNOT_AUDIT_APPLY="只有群主才可以审批入群申请";
/**
* 申请入群是校验是否已经在群内
*/
String ALREADY_IN_GROUP="已经在群内,无需申请";
/**
* 生成邀请新成员链接时判断群状态
*/
String CANNOT_SHARED="只有讨论中的群才可以邀请新成员";
}

25
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/invitation/GroupInvitationDao.xml

@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.epmet.modules.invitation.dao.GroupInvitationDao">
<!-- 根据群邀请连接查询群基本信息 -根据groupId 查询群基本信息 -->
<select id="selectLinkGroupInfo" parameterType="map" resultType="com.epmet.resi.group.dto.invitation.result.LinkGroupInfoResultDTO">
SELECT
rg.id AS groupId,
rg.GROUP_HEAD_PHOTO AS groupHeadPhoto,
rg.GROUP_NAME AS groupName,
rg.GROUP_INTRODUCTION AS groupIntroduction,
rgs.TOTAL_MEMBERS AS totalMember,
rgs.TOTAL_PARTY_MEMBERS AS totalPartyMember
FROM
resi_group rg
LEFT JOIN resi_group_statistical rgs ON ( rg.id = rgs.RESI_GROUP_ID )
WHERE
rg.DEL_FLAG = '0'
AND rgs.DEL_FLAG = '0'
and rg.id=#{groupId}
</select>
</mapper>

17
epmet-module/resi-group/resi-group-server/src/main/resources/mapper/member/ResiGroupMemberDao.xml

@ -74,11 +74,24 @@
</select>
<!-- 查看用户是否存在有效的入群申请 -->
<select id="selectGroupMemberOperationUnderAudit" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
<select id="selectGroupMemberOperationLatest" parameterType="map" resultType="com.epmet.resi.group.dto.member.GroupMemeberOperationDTO">
select gmo.* from group_memeber_operation gmo
where gmo.DEL_FLAG='0'
and gmo.OPERATE_STATUS='under_auditting'
and gmo.CUSTOMER_USER_ID=#{userId}
and gmo.GROUP_ID=#{groupId}
order by gmo.CREATED_TIME desc
limit 1
</select>
<!-- 根据组id+用户id查询成员信息 -->
<select id="selectGroupMemberInfo" parameterType="map" resultType="com.epmet.resi.group.dto.member.ResiGroupMemberDTO">
SELECT
rgm.*
FROM
resi_group_member rgm
WHERE
rgm.DEL_FLAG = '0'
AND rgm.RESI_GROUP_ID = #{groupId}
AND rgm.CUSTOMER_USER_ID=#{userId}
</select>
</mapper>

8
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@ -2,6 +2,7 @@ package com.epmet.modules.feign;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
@ -35,4 +36,11 @@ public interface EpmetUserFeignClient {
**/
@PostMapping(value = "epmetuser/userresiregistervisit/init")
Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO);
/**
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping(value = "epmetuser/userresiinfo/submit")
Result submit(UserResiInfoDTO userResiInfoDTO);
}

8
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/ResiPartymemberFeignClient.java

@ -4,6 +4,7 @@ import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.feign.fallback.ResiPartymemberFeignClientFallBack;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
@ -22,4 +23,11 @@ public interface ResiPartymemberFeignClient {
**/
@PostMapping(value = "resi/partymember/resiwarmheartedapply/init")
Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
/**
* @Author sun
* @Description 居民端-热心居民申请-提交申请数据
**/
@PostMapping(value = "resi/partymember/resiwarmheartedapply/submit")
Result submit(ResiWarmheartedSubmitFormDTO formDTO);
}

13
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@ -3,6 +3,7 @@ package com.epmet.modules.feign.fallback;
import com.epmet.commons.tools.constant.ServiceConstant;
import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.result.LatestGridInfoResultDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
@ -39,4 +40,16 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
public Result<ResiRegisterResultDTO> init(ResiRegisterFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "init", formDTO);
}
/**
* @Author sun
* @Description 居民端-居民注册信息提交
* @Date 2020/3/30
**/
@Override
public Result submit(UserResiInfoDTO userResiInfoDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO);
}
}

11
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/feign/fallback/ResiPartymemberFeignClientFallBack.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.utils.ModuleUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.feign.ResiPartymemberFeignClient;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.stereotype.Component;
@ -26,4 +27,14 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", formDTO);
}
/**
* @Author sun
* @Description 居民端-热心居民申请-提交申请数据
* @Date 2020/3/30
**/
@Override
public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "submit", formDTO);
}
}

17
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java

@ -3,9 +3,11 @@ package com.epmet.modules.resiregister.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
import com.epmet.modules.resiregister.service.ResiRegisterService;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@ -22,7 +24,7 @@ import org.springframework.web.bind.annotation.RestController;
@RequestMapping("resiregister")
public class ResiRegisterController {
@Autowired
private ResiRegisterService resiMineGridService;
private ResiRegisterService resiRegisterService;
/**
* @param
@ -32,7 +34,18 @@ public class ResiRegisterController {
**/
@PostMapping("init")
public Result<ResiRegisterResultDTO> init(@LoginUser TokenDto tokenDTO, @RequestBody ResiRegisterFormDTO resiRegisterFormDTO) {
return resiMineGridService.init(tokenDTO, resiRegisterFormDTO);
return resiRegisterService.init(tokenDTO, resiRegisterFormDTO);
}
/**
* @param
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping("submit")
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) {
return resiRegisterService.submit(tokenDTO, userResiInfoDTO);
}
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java

@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
@ -22,4 +23,13 @@ public interface ResiRegisterService {
*/
Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO);
/**
* 居民端-居民注册信息提交
*
* @param
* @return void
* @author sun
*/
Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO);
}

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

@ -2,6 +2,7 @@ package com.epmet.modules.resiregister.service.impl;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
import com.epmet.modules.feign.EpmetUserFeignClient;
@ -30,4 +31,13 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
formDTO.setUserId(tokenDTO.getUserId());
return epmetUserFeignClient.init(formDTO);
}
@Override
public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) {
if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
}
userResiInfoDTO.setUserId(tokenDTO.getUserId());
return epmetUserFeignClient.submit(userResiInfoDTO);
}
}

5
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedController.java

@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.PostMapping;
@ -39,8 +40,8 @@ public class ResiWarmheartedController {
* @Description 居民端-热心居民申请-提交申请数据
**/
@PostMapping("submit")
public Result<ResiWarmheartedResultDTO> submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO) {
return resiWarmheartedService.init(tokenDTO, resiWarmheartedFormDTO);
public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiWarmheartedSubmitFormDTO formDTO) {
return resiWarmheartedService.submit(tokenDTO, formDTO);
}

10
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedService.java

@ -3,6 +3,7 @@ package com.epmet.modules.warmhearted.service;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.Result;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
/**
@ -21,4 +22,13 @@ public interface ResiWarmheartedService {
*/
Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请-提交申请数据
*
* @param
* @return void
* @author sun
*/
Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO);
}

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

@ -6,6 +6,7 @@ import com.epmet.modules.feign.ResiPartymemberFeignClient;
import com.epmet.modules.utils.ModuleConstant;
import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -30,4 +31,13 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
formDTO.setUserId(tokenDTO.getUserId());
return resiPartymemberFeignClient.init(formDTO);
}
@Override
public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
}
formDTO.setUserId(tokenDTO.getUserId());
return resiPartymemberFeignClient.submit(formDTO);
}
}

65
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/form/ResiWarmheartedSubmitFormDTO.java

@ -0,0 +1,65 @@
/**
* Copyright 2018 人人开源 https://www.renren.io
* <p>
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* <p>
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
* <p>
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package com.epmet.resi.partymember.dto.warmhearted.form;
import lombok.Data;
import javax.validation.constraints.NotBlank;
import java.io.Serializable;
/**
* 居民端-热心居民申请-提交申请数据-配置入参
* @author sun
*/
@Data
public class ResiWarmheartedSubmitFormDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 客户Id CUSTOMER.id
*/
@NotBlank(message = "客户ID不能为空")
private String customerId;
/**
* 网格Id
*/
@NotBlank(message = "网格ID不能为空")
private String gridId;
/**
* 热心居民申请行为记录表Id
*/
@NotBlank(message = "行为记录表ID不能为空")
private String resiWarmVisitId;
/**
* 申请理由(300字)
*/
@NotBlank(message = "申请理由不能为空")
private String reason;
/**
* 用户Id
*/
@NotBlank(message = "用户ID不能为空")
private String userId;
}

2
epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/warmhearted/result/ResiWarmheartedResultDTO.java

@ -40,6 +40,6 @@ public class ResiWarmheartedResultDTO implements Serializable {
/**
* 热心居民申请访问记录表(resi_warmhearted_visit)Id
*/
private String resiWarmheartedVisitId;
private String resiWarmVisitId;
}

23
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/constant/ResiWarmheartedVisitConstant.java

@ -10,6 +10,7 @@ package com.epmet.modules.warmhearted.constant;
/**
* 常量
*
* @author sun
* @since 1.0.0
*/
@ -28,5 +29,25 @@ public interface ResiWarmheartedVisitConstant {
/**
* 最后一次操作行为-提交失败
*/
String FAILD="faild";
String FAILD = "faild";
/**
* 热心居民申请-审核状态-待审核
*/
String UNDER_AUDITTING = "under_auditting";
/**
* 热心居民申请-审核状态-审核通过
*/
String APPROVED = "approved";
/**
* 热心居民申请-审核状态-未通过
*/
String REJECTED = "rejected";
/**
* 数据库操作异常
*/
String OPERATION_EXCEPTION = "数据库操作异常!";
}

10
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/controller/ResiWarmheartedApplyController.java

@ -29,6 +29,7 @@ import com.epmet.modules.warmhearted.excel.ResiWarmheartedApplyExcel;
import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -94,8 +95,13 @@ public class ResiWarmheartedApplyController {
}
@PostMapping("init")
public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO resiWarmheartedFormDTO){
return resiWarmheartedApplyService.getResiWarmheartedApply(resiWarmheartedFormDTO);
public Result<ResiWarmheartedResultDTO> init(@RequestBody ResiWarmheartedFormDTO formDTO){
return resiWarmheartedApplyService.init(formDTO);
}
@PostMapping("submit")
public Result submit(@RequestBody ResiWarmheartedSubmitFormDTO formDTO){
return resiWarmheartedApplyService.submit(formDTO);
}
}

3
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedApplyDao.java

@ -18,6 +18,7 @@
package com.epmet.modules.warmhearted.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
@ -38,4 +39,6 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
* @return
*/
ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
void saveResiWarmApply(ResiWarmheartedApplyDTO entity);
}

4
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/dao/ResiWarmheartedVisitDao.java

@ -18,10 +18,13 @@
package com.epmet.modules.warmhearted.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import org.apache.ibatis.annotations.Mapper;
import javax.management.relation.RelationSupport;
/**
* 热心居民申请行为记录表
*
@ -32,4 +35,5 @@ import org.apache.ibatis.annotations.Mapper;
public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
void updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
}

14
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedApplyService.java

@ -23,13 +23,14 @@ import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import java.util.List;
import java.util.Map;
/**
* 热心居民申请表
* 热心居民申请表
*
* @author generator generator@elink-cn.com
* @since v1.0.0 2020-03-30
@ -103,5 +104,14 @@ public interface ResiWarmheartedApplyService extends BaseService<ResiWarmhearted
* @return void
* @author sun
*/
Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请-提交申请数据
*
* @param
* @return void
* @author sun
*/
Result submit(ResiWarmheartedSubmitFormDTO formDTO);
}

11
epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/warmhearted/service/ResiWarmheartedVisitService.java

@ -19,9 +19,11 @@ package com.epmet.modules.warmhearted.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.warmhearted.entity.ResiWarmheartedVisitEntity;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import java.util.List;
@ -103,4 +105,13 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
* @author sun
*/
ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
/**
* 居民端-热心居民申请提交-更新行为记录数据
*
* @param
* @return void
* @author sun
*/
void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO);
}

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

@ -19,12 +19,14 @@ package com.epmet.modules.warmhearted.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
import com.epmet.modules.warmhearted.dao.ResiWarmheartedApplyDao;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedApplyEntity;
import com.epmet.modules.warmhearted.redis.ResiWarmheartedApplyRedis;
@ -32,6 +34,7 @@ import com.epmet.modules.warmhearted.service.ResiWarmheartedApplyService;
import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -39,9 +42,13 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
* 热心居民申请表
*
@ -51,6 +58,7 @@ import java.util.Map;
@Service
public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmheartedApplyDao, ResiWarmheartedApplyEntity> implements ResiWarmheartedApplyService {
private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedApplyServiceImpl.class);
@Autowired
private ResiWarmheartedApplyRedis resiWarmheartedApplyRedis;
@Autowired
@ -112,7 +120,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
@Override
@Transactional(rollbackFor = Exception.class)
public Result<ResiWarmheartedResultDTO> getResiWarmheartedApply(ResiWarmheartedFormDTO formDTO) {
public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
//1:热心居民申请行为记录表新增数据
ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
//2:查询是否已申请热心居民
@ -126,5 +134,39 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
return new Result<ResiWarmheartedResultDTO>().ok(resiWarmheartedResultDTO);
}
@Override
public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
//1:将申请记录存入热心居民申请表中
saveResiWarmApply(formDTO);
//2:将最后一次操作行为更新到热心居民申请行为记录表中
resiWarmheartedVisitService.updateResiWarmVisit(formDTO);
return new Result();
}
/**
* 热心居民申请表新增数据
* @param formDTO
* @return
*/
@Transactional(rollbackFor = Exception.class)
public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
Date date = new Date();
ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
resiWarmheartedApplyDTO.setCustomerId(formDTO.getCustomerId());
resiWarmheartedApplyDTO.setGridId(formDTO.getGridId());
resiWarmheartedApplyDTO.setUserId(formDTO.getUserId());
resiWarmheartedApplyDTO.setReason(formDTO.getReason());
resiWarmheartedApplyDTO.setResiWarmVisitId(formDTO.getResiWarmVisitId());
resiWarmheartedApplyDTO.setAuditStatus(ResiWarmheartedVisitConstant.UNDER_AUDITTING);
//UUID
resiWarmheartedApplyDTO.setId(IdWorker.get32UUID());
resiWarmheartedApplyDTO.setDelFlag(NumConstant.ZERO);
resiWarmheartedApplyDTO.setRevision(NumConstant.ZERO);
resiWarmheartedApplyDTO.setCreatedBy(formDTO.getUserId());
resiWarmheartedApplyDTO.setCreatedTime(date);
resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
resiWarmheartedApplyDTO.setUpdatedTime(date);
resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO);
}
}

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

@ -25,6 +25,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.modules.warmhearted.constant.ResiWarmheartedVisitConstant;
import com.epmet.modules.warmhearted.dao.ResiWarmheartedVisitDao;
import com.epmet.modules.warmhearted.entity.ResiWarmheartedVisitEntity;
@ -32,6 +33,7 @@ import com.epmet.modules.warmhearted.redis.ResiWarmheartedVisitRedis;
import com.epmet.modules.warmhearted.service.ResiWarmheartedVisitService;
import com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedSubmitFormDTO;
import com.epmet.resi.partymember.dto.warmhearted.result.ResiWarmheartedResultDTO;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
@ -73,8 +75,8 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
return ConvertUtils.sourceToTarget(entityList, ResiWarmheartedVisitDTO.class);
}
private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<ResiWarmheartedVisitEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<ResiWarmheartedVisitEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -130,8 +132,26 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
resiWarmheartedVisitDTO.setUpdatedTime(date);
resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
resiWarmheartedResultDTO.setResiWarmheartedVisitId(resiWarmheartedVisitDTO.getId());
resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
return resiWarmheartedResultDTO;
}
@Override
@Transactional(rollbackFor = Exception.class)
public void updateResiWarmVisit(ResiWarmheartedSubmitFormDTO formDTO) {
ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
/*if (true) {
//最后一次操作行为-提交成功
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.SUCCESS);
} else {
//最后一次操作行为-提交失败
resiWarmheartedVisitDTO.setOperateVisit(ResiWarmheartedVisitConstant.FAILD);
}*/
resiWarmheartedVisitDTO.setId(formDTO.getResiWarmVisitId());
resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
resiWarmheartedVisitDTO.setUpdatedTime(new Date());
resiWarmheartedVisitDao.updateResiWarmVisitById(resiWarmheartedVisitDTO);
}
}

40
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedApplyDao.xml

@ -26,9 +26,9 @@
rw.grid_id AS "gridid",
rw.user_id AS "userid",
rw.reason AS "reason",
rw.audit_status AS "auditstatus",
rw.refuse_reason AS "refusereason",
rw.resi_warm_visit_id AS "resiwarmvisitid",
rw.audit_status AS "auditStatus",
rw.refuse_reason AS "refuseReason",
rw.resi_warm_visit_id AS "resiWarmVisitId",
rw.del_flag AS "delflag",
rw.revision AS "revision",
rw.created_by AS "createdby",
@ -37,6 +37,40 @@
rw.updated_time AS "updatedtime"
</sql>
<insert id="saveResiWarmApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
INSERT INTO resi_warmhearted_apply (
id,
customer_id,
grid_id,
user_id,
reason,
audit_status,
refuse_reason,
resi_warm_visit_id,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)VALUES(
#{id},
#{customerId},
#{gridId},
#{userId},
#{reason},
#{auditStatus},
#{refuseReason},
#{resiWarmVisitId},
#{delFlag},
#{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
#{updatedTime}
)
</insert>
<select id="selectResiWarmheartedApply" parameterType="com.epmet.resi.partymember.dto.warmhearted.form.ResiWarmheartedFormDTO"
resultType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedApplyDTO">
SELECT

12
epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/warmhearted/ResiWarmheartedVisitDao.xml

@ -19,7 +19,8 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveResiWarmheartedVisit" parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
<insert id="saveResiWarmheartedVisit"
parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
INSERT INTO resi_warmhearted_visit (
id,
customer_id,
@ -50,5 +51,14 @@
#{updatedTime}
)
</insert>
<update id="updateResiWarmVisitById"
parameterType="com.epmet.resi.partymember.dto.warmhearted.ResiWarmheartedVisitDTO">
UPDATE resi_warmhearted_visit
SET operate_visit = #{operateVisit},
updated_by = #{updatedBy},
updated_time = #{updatedTime}
WHERE
id = #{id}
</update>
</mapper>

21
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserResiInfoDTO.java

@ -33,6 +33,11 @@ public class UserResiInfoDTO implements Serializable {
private static final long serialVersionUID = 1L;
/**
* 唯一标识
*/
private String id;
/**
* 用户Id(主键) user.id
*/
@ -108,4 +113,20 @@ public class UserResiInfoDTO implements Serializable {
*/
private String showName;
/**
* 客户Id (customer.id)
*/
private String customerId;
/**
* 网格Id (customer_grid.id)
*/
private String gridId;
/**
* 手机验证码
*/
private String mobileCode;
}

2
epmet-user/epmet-user-client/src/main/java/com/epmet/dto/result/ResiRegisterResultDTO.java

@ -34,7 +34,7 @@ public class ResiRegisterResultDTO implements Serializable {
/**
* 用户居民端注册访问记录表(user_resi_register_visit)Id
*/
private String userResiRegisterVisitId;
private String resiVisitId;
}

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

@ -34,4 +34,9 @@ public interface UserResiRegisterConstant {
* 最后一次操作行为-提交失败
*/
String FAILD="faild";
/**
* 最后一次操作行为-提交失败
*/
String MOBILECODE_EXCEPTION="手机验证码输入错误!";
}

20
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserResiInfoController.java

@ -51,19 +51,19 @@ public class UserResiInfoController {
private UserResiInfoService userResiInfoService;
@GetMapping("page")
public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params){
public Result<PageData<UserResiInfoDTO>> page(@RequestParam Map<String, Object> params) {
PageData<UserResiInfoDTO> page = userResiInfoService.page(params);
return new Result<PageData<UserResiInfoDTO>>().ok(page);
}
@GetMapping("{id}")
public Result<UserResiInfoDTO> get(@PathVariable("id") String id){
public Result<UserResiInfoDTO> get(@PathVariable("id") String id) {
UserResiInfoDTO data = userResiInfoService.get(id);
return new Result<UserResiInfoDTO>().ok(data);
}
@PostMapping
public Result save(@RequestBody UserResiInfoDTO dto){
public Result save(@RequestBody UserResiInfoDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
userResiInfoService.save(dto);
@ -71,7 +71,7 @@ public class UserResiInfoController {
}
@PutMapping
public Result update(@RequestBody UserResiInfoDTO dto){
public Result update(@RequestBody UserResiInfoDTO dto) {
//效验数据
ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
userResiInfoService.update(dto);
@ -79,7 +79,7 @@ public class UserResiInfoController {
}
@DeleteMapping
public Result delete(@RequestBody String[] ids){
public Result delete(@RequestBody String[] ids) {
//效验数据
AssertUtils.isArrayEmpty(ids, "id");
userResiInfoService.delete(ids);
@ -104,4 +104,14 @@ public class UserResiInfoController {
ValidatorUtils.validateEntity(userResiInfoFormDTO);
return userResiInfoService.getUserResiInfoDTO(userResiInfoFormDTO);
}
/**
* @param userResiInfoDTO
* @Author sun
* @Description 居民端-居民注册信息提交
**/
@PostMapping("submit")
public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) {
return userResiInfoService.submit(userResiInfoDTO);
}
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/OperUserDao.java

@ -32,8 +32,8 @@ import org.apache.ibatis.annotations.Mapper;
public interface OperUserDao extends BaseDao<OperUserEntity> {
/**
* 根据id查询运营人员信息
* @param id
* @param userId
* @return OperUserDTO
*/
OperUserDTO selectOperUserInfoById(String id);
}
OperUserDTO selectOperUserInfoById(String userId);
}

3
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RegisterRelationDao.java

@ -18,6 +18,7 @@
package com.epmet.dao;
import com.epmet.commons.mybatis.dao.BaseDao;
import com.epmet.dto.RegisterRelationDTO;
import com.epmet.entity.RegisterRelationEntity;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
@ -34,6 +35,6 @@ import java.util.List;
public interface RegisterRelationDao extends BaseDao<RegisterRelationEntity> {
List<RegisterRelationEntity> getListByUserId(@Param("userId") String userId);
boolean saveRegisterRelation(RegisterRelationDTO registerRelationDTO);
}

6
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiInfoDao.java

@ -40,4 +40,10 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
* @Date 2020/3/30 11:10
**/
UserResiInfoDTO selectUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
/**
* @Author sun
* @Description 用户居民端注册信息表新增数据
**/
void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
}

2
epmet-user/epmet-user-server/src/main/java/com/epmet/dao/UserResiRegisterVisitDao.java

@ -36,4 +36,6 @@ public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitE
void saveUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
List<UserResiRegisterVisitDTO> selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
}

8
epmet-user/epmet-user-server/src/main/java/com/epmet/service/RegisterRelationService.java

@ -21,6 +21,7 @@ import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dto.RegisterRelationDTO;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.EnterGridFormDTO;
import com.epmet.dto.result.UserInfoOnEnterGridResultDTO;
import com.epmet.entity.RegisterRelationEntity;
@ -104,4 +105,11 @@ public interface RegisterRelationService extends BaseService<RegisterRelationEnt
* @Date 2020.03.30 15:06
**/
Result<UserInfoOnEnterGridResultDTO> getUserInfoAndRoles(EnterGridFormDTO enterGridFormDTO);
/**
* @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
* @Param userResiInfoDTO
* @Author sun
**/
Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO);
}

9
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiInfoService.java

@ -103,4 +103,13 @@ public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
* @Date 2020/3/30 11:07
**/
Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
/**
* 居民端-居民注册信息提交
*
* @param userResiInfoDTO
* @return void
* @author sun
*/
Result submit(UserResiInfoDTO userResiInfoDTO);
}

11
epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserResiRegisterVisitService.java

@ -21,8 +21,10 @@ 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.dto.UserResiInfoDTO;
import com.epmet.dto.UserResiRegisterVisitDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
import com.epmet.entity.UserResiRegisterVisitEntity;
@ -105,4 +107,13 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
* @author sun
*/
Result<ResiRegisterResultDTO> saveUserResiRegisterVisit(ResiRegisterFormDTO formDTO);
/**
* 居民端-居民注册信息提交-更新访问行为记录表数据
*
* @param bl userResiInfoDTO
* @return void
* @author sun
*/
Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO);
}

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

@ -19,7 +19,9 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
@ -78,6 +80,9 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
@Autowired
private UserCustomerDao userCustomerDao;
@Autowired
private RegisterRelationDao registerRelationDao;
@Override
public PageData<RegisterRelationDTO> page(Map<String, Object> params) {
@ -249,4 +254,34 @@ public class RegisterRelationServiceImpl extends BaseServiceImpl<RegisterRelatio
return result;
}
/**
* @Description 居民注册成功-居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
* @Param userResiInfoDTO
* @Author sun
**/
@Override
@Transactional(rollbackFor = Exception.class)
public Result saveRegisterRelation(UserResiInfoDTO userResiInfoDTO) {
Date date = new Date();
RegisterRelationDTO registerRelationDTO = new RegisterRelationDTO();
registerRelationDTO.setCustomerId(userResiInfoDTO.getCustomerId());
registerRelationDTO.setGridId(userResiInfoDTO.getGridId());
registerRelationDTO.setUserId(userResiInfoDTO.getUserId());
//首次注册用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setFirstRegister(NumConstant.ONE_STR);
//注册用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setRegister(NumConstant.ONE_STR);
//参与用户 (0表示不参与计数 1表示参与计数)
registerRelationDTO.setParticipation(NumConstant.ONE_STR);
registerRelationDTO.setId(IdWorker.get32UUID());
registerRelationDTO.setDelFlag(NumConstant.ZERO);
registerRelationDTO.setRevision(NumConstant.ZERO);
registerRelationDTO.setCreatedBy(userResiInfoDTO.getUserId());
registerRelationDTO.setCreatedTime(date);
registerRelationDTO.setUpdatedBy(userResiInfoDTO.getUserId());
registerRelationDTO.setUpdatedTime(date);
registerRelationDao.saveRegisterRelation(registerRelationDTO);
return new Result();
}
}

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

@ -19,23 +19,29 @@ package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.core.toolkit.IdWorker;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
import com.epmet.commons.tools.constant.NumConstant;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.UserResiRegisterConstant;
import com.epmet.dao.UserResiInfoDao;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.entity.UserResiInfoEntity;
import com.epmet.redis.UserResiInfoRedis;
import com.epmet.service.RegisterRelationService;
import com.epmet.service.UserResiInfoService;
import com.epmet.service.UserResiRegisterVisitService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -50,6 +56,12 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
@Autowired
private UserResiInfoRedis userResiInfoRedis;
@Autowired
private UserResiRegisterVisitService userResiRegisterVisitService;
@Autowired
private UserResiInfoDao userResiInfoDao;
@Autowired
private RegisterRelationService registerRelationService;
@Override
public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
@ -67,8 +79,8 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class);
}
private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params){
String id = (String)params.get(FieldConstant.ID_HUMP);
private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) {
String id = (String) params.get(FieldConstant.ID_HUMP);
QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>();
wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
@ -120,4 +132,42 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, Us
return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
}
@Override
public Result submit(UserResiInfoDTO userResiInfoDTO) {
Result result = new Result();
//1:手机验证码数据校验//TODO
//2:验证码校验失败则更新行为记录表数据 返回前台结果
if (false) {
userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
return result;
}
//3:校验成功 数据存入居民注册表 更新行为记录表数据
saveUserResiInfo(userResiInfoDTO);
result = userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
result = registerRelationService.saveRegisterRelation(userResiInfoDTO);
return result;
}
/**
* 居民注册信息表新增数据
*
* @param userResiInfoDTO
* @Author sun
*/
@Transactional(rollbackFor = Exception.class)
public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
Date date = new Date();
userResiInfoDTO.setId(IdWorker.get32UUID());
userResiInfoDTO.setDelFlag(NumConstant.ZERO);
userResiInfoDTO.setRevision(NumConstant.ZERO);
userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
userResiInfoDTO.setCreatedTime(date);
userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
userResiInfoDTO.setUpdatedTime(date);
userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
}
}

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

@ -28,8 +28,10 @@ import com.epmet.commons.tools.utils.ConvertUtils;
import com.epmet.commons.tools.utils.Result;
import com.epmet.constant.UserResiRegisterConstant;
import com.epmet.dao.UserResiRegisterVisitDao;
import com.epmet.dto.UserResiInfoDTO;
import com.epmet.dto.UserResiRegisterVisitDTO;
import com.epmet.dto.form.ResiRegisterFormDTO;
import com.epmet.dto.form.UserResiInfoFormDTO;
import com.epmet.dto.result.ResiRegisterResultDTO;
import com.epmet.entity.UserResiRegisterVisitEntity;
import com.epmet.redis.UserResiRegisterVisitRedis;
@ -132,8 +134,26 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
userResiRegisterVisitDTO.setUpdatedTime(date);
userResiRegisterVisitDao.saveUserResiRegisterVisit(userResiRegisterVisitDTO);
ResiRegisterResultDTO resiRegisterResultDTO = new ResiRegisterResultDTO();
resiRegisterResultDTO.setUserResiRegisterVisitId(userResiRegisterVisitDTO.getId());
resiRegisterResultDTO.setResiVisitId(userResiRegisterVisitDTO.getId());
return new Result<ResiRegisterResultDTO>().ok(resiRegisterResultDTO);
}
@Override
@Transactional(rollbackFor = Exception.class)
public Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) {
UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
if (bl) {
//最后一次操作行为-提交成功
userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.SUCCESS);
} else {
//最后一次操作行为-提交失败
userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.FAILD);
}
userResiRegisterVisitDTO.setId(userResiInfoDTO.getResiVisitId());
userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
userResiRegisterVisitDTO.setUpdatedTime(new Date());
userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO);
return new Result();
}
}

4
epmet-user/epmet-user-server/src/main/resources/mapper/OperUserDao.xml

@ -30,8 +30,8 @@
FROM
oper_user
WHERE
id = #{id}
USER_ID = #{userId}
</select>
</mapper>
</mapper>

34
epmet-user/epmet-user-server/src/main/resources/mapper/RegisterRelationDao.xml

@ -19,6 +19,40 @@
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveRegisterRelation" parameterType="com.epmet.dto.RegisterRelationDTO">
INSERT INTO register_relation (
id,
customer_id,
grid_id,
user_id,
first_register,
register,
participation,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
(
#{id},
#{customerId},
#{gridId},
#{userId},
#{firstRegister},
#{register},
#{participation},
#{delFlag},
#{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
#{updatedTime}
)
</insert>
<select id="getListByUserId" parameterType="string" resultType="com.epmet.entity.RegisterRelationEntity">
SELECT *

37
epmet-user/epmet-user-server/src/main/resources/mapper/UserResiInfoDao.xml

@ -19,6 +19,43 @@
<result property="updatedBy" column="UPDATED_BY"/>
<result property="updatedTime" column="UPDATED_TIME"/>
</resultMap>
<insert id="saveUserResiInfo" parameterType="com.epmet.dto.UserResiInfoDTO">
INSERT INTO user_resi_info (
id,
user_id,
reg_mobile,
surname,
`name`,
street,
district,
building_address,
resi_visit_id,
del_flag,
revision,
created_by,
created_time,
updated_by,
updated_time
)
VALUES
(
#{id},
#{userId},
#{regMobile},
#{surname},
#{name},
#{street},
#{district},
#{buildingAddress},
#{resiVisitId},
#{delFlag},
#{revision},
#{createdBy},
#{createdTime},
#{updatedBy},
#{updatedTime}
)
</insert>
<!-- 查询用户注册信息 -->
<select id="selectUserResiInfoDTO" parameterType="com.epmet.dto.form.UserResiInfoFormDTO"

7
epmet-user/epmet-user-server/src/main/resources/mapper/UserResiRegisterVisitDao.xml

@ -50,6 +50,13 @@
#{updatedTime}
)
</insert>
<update id="updateResiRegisterVisit" parameterType="com.epmet.dto.UserResiRegisterVisitDTO">
UPDATE user_resi_register_visit
SET last_operate_visit = #{lastOperateVisit},
updated_by = #{updatedBy},
updated_time = #{updatedTime}
WHERE id = #{id}
</update>
</mapper>
Loading…
Cancel
Save