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

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

@@ -11,7 +11,13 @@ public enum EpmetErrorCode {
 	GROUP_ALREADY_EXISTED(8003,"您的组名已存在，请重新修改"),
 	ALREADY_APPLIED_GROUP(8004,"该群已申请过，请耐心等待审核"),
 	ONLY_LEADER_CAN_INVITE(8005,"抱歉，只有群主才可以邀请新成员"),
-	LOSE_EFFICACY(8006,"链接已失效");
+	LOSE_EFFICACY(8006,"链接已失效"),
+
+	MOBILE_HAS_BEEN_USED(8101, "该手机已被使用，请更换手机或使用原绑定的微信用户登录"),
+	MOBILE_CODE_ERROR(8102, "手机验证码错误"),
+	AUTO_CONFIRM_FAILED(8103, "自动认证失败");
+
+
 
 	private int value;
 	private String name;

epmet-gateway/pom.xml

@@ -111,14 +111,11 @@
 <!--                <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>-->
                 <gateway.routes.epmet-auth-server.uri>http://127.0.0.1:8081</gateway.routes.epmet-auth-server.uri>
                 <!--  2、Admin服务  -->
-                <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
+<!--                <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>-->
-<!--                <gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri>-->
+                <gateway.routes.epmet-admin-server.uri>http://127.0.0.1:8082</gateway.routes.epmet-admin-server.uri>
-                <!--  3、监控服务  -->
-                <gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
-<!--                <gateway.routes.epmet-monitor-server.uri>http://127.0.0.1:8100</gateway.routes.epmet-monitor-server.uri>-->
                 <!--  4、OSS服务 -->
-                <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
+<!--                <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>-->
-<!--                <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>-->
+                <gateway.routes.epmet-oss-server.uri>http://127.0.0.1:8083</gateway.routes.epmet-oss-server.uri>
                 <!--  5、消息服务  -->
 <!--                <gateway.routes.epmet-message-server.uri>lb://epmet-message-server</gateway.routes.epmet-message-server.uri>-->
                 <gateway.routes.epmet-message-server.uri>http://127.0.0.1:8085</gateway.routes.epmet-message-server.uri>
@@ -183,8 +180,6 @@
                 <gateway.routes.epmet-auth-server.uri>lb://epmet-auth-server</gateway.routes.epmet-auth-server.uri>
                 <!--  2、Admin服务  -->
                 <gateway.routes.epmet-admin-server.uri>lb://epmet-admin-server</gateway.routes.epmet-admin-server.uri>
-                <!--  3、监控服务  -->
-                <gateway.routes.epmet-monitor-server.uri>lb://epmet-monitor-server</gateway.routes.epmet-monitor-server.uri>
                 <!--  4、OSS服务 -->
                 <gateway.routes.epmet-oss-server.uri>lb://epmet-oss-server</gateway.routes.epmet-oss-server.uri>
                 <!--  5、消息服务  -->

epmet-gateway/src/main/resources/bootstrap.yml

@@ -44,14 +44,6 @@ spring:
           filters:
             - StripPrefix=1
             - CpAuth=true
-        #监控服务
-        - id: epmet-monitor-server
-          uri: @gateway.routes.epmet-monitor-server.uri@
-          order: 3
-          predicates:
-            - Path=${server.servlet.context-path}/monitor/**
-          filters:
-            - StripPrefix=1
         #OSS服务
         - id: epmet-oss-server
           uri: @gateway.routes.epmet-oss-server.uri@

epmet-module/epmet-message/epmet-message-server/pom.xml

@@ -129,7 +129,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
@@ -156,7 +156,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_message?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailLogController.java

@@ -8,7 +8,6 @@
 
 package com.epmet.controller;
 
-import com.epmet.commons.tools.annotation.LogOperation;
 import com.epmet.commons.tools.constant.Constant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
@@ -57,7 +56,7 @@ public class MailLogController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    @LogOperation("删除")
+//    @LogOperation("删除")
     public Result delete(@RequestBody Long[] ids){
         sysMailLogService.deleteBatchIds(Arrays.asList(ids));
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/MailTemplateController.java

@@ -75,7 +75,7 @@ public class MailTemplateController {
 
     @PostMapping("saveConfig")
     @ApiOperation("保存配置信息")
-    @LogOperation("保存配置信息")
+//    @LogOperation("保存配置信息")
     public Result saveConfig(@RequestBody EmailConfig config){
         //校验数据
         ValidatorUtils.validateEntity(config);
@@ -95,7 +95,7 @@ public class MailTemplateController {
 
     @PostMapping
     @ApiOperation("保存")
-    @LogOperation("保存")
+//    @LogOperation("保存")
     public Result save(SysMailTemplateDTO dto){
         //校验类型
         ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
@@ -107,7 +107,7 @@ public class MailTemplateController {
 
     @PutMapping
     @ApiOperation("修改")
-    @LogOperation("修改")
+//    @LogOperation("修改")
     public Result update(SysMailTemplateDTO dto){
         //校验类型
         ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
@@ -119,7 +119,7 @@ public class MailTemplateController {
 
     @DeleteMapping
     @ApiOperation("删除")
-    @LogOperation("删除")
+//    @LogOperation("删除")
     public Result delete(@RequestBody Long[] ids){
         sysMailTemplateService.deleteBatchIds(Arrays.asList(ids));
 
@@ -128,7 +128,7 @@ public class MailTemplateController {
 
     @PostMapping("send")
     @ApiOperation("发送邮件")
-    @LogOperation("发送邮件")
+//    @LogOperation("发送邮件")
     public Result send(Long id, String mailTo, String mailCc, String params) throws Exception{
         boolean flag = sysMailTemplateService.sendMail(id, mailTo, mailCc, params);
         if(flag){

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java

@@ -75,7 +75,7 @@ public class SmsController {
 
 	@PostMapping("saveConfig")
 	@ApiOperation("保存配置短信")
-	@LogOperation("保存配置短信")
+//	@LogOperation("保存配置短信")
 	public Result saveConfig(@RequestBody SmsConfig config){
 		//校验类型
 		ValidatorUtils.validateEntity(config);
@@ -95,7 +95,7 @@ public class SmsController {
 
     @PostMapping("send")
 	@ApiOperation("发送短信")
-	@LogOperation("发送短信")
+//	@LogOperation("发送短信")
 	@ApiImplicitParams({
 		@ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"),
 		@ApiImplicitParam(name = "params", value = "参数", paramType = "query", required = true, dataType="String")
@@ -108,7 +108,7 @@ public class SmsController {
 
 	@DeleteMapping
 	@ApiOperation("删除")
-	@LogOperation("删除")
+//	@LogOperation("删除")
 	public Result delete(@RequestBody Long[] ids){
 		sysSmsService.deleteBatchIds(Arrays.asList(ids));
 

epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/dao/SysSmsDao.java

@@ -11,6 +11,7 @@ package com.epmet.dao;
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.entity.SysSmsEntity;
 import org.apache.ibatis.annotations.Mapper;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 短信
@@ -20,4 +21,9 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface SysSmsDao extends BaseDao<SysSmsEntity> {
 
+
+	int tempInsert(@Param("platform") Integer platform, @Param("mobile") String mobile,
+				   @Param("params1") String params1, @Param("params2") String params2,
+				   @Param("params3") String params3, @Param("params4") String params4,
+				   @Param("status") Integer status);
 }

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

@@ -26,6 +26,7 @@ import com.epmet.sms.SmsFactory;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Service;
 
+import java.util.Date;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -95,7 +96,13 @@ public class SysSmsServiceImpl extends BaseServiceImpl<SysSmsDao, SysSmsEntity>
         }
 
         sms.setStatus(status);
-
+        sms.setCreateDate(new Date());
-        this.insert(sms);
+        baseDao.tempInsert(sms.getPlatform(),
+                sms.getMobile(),
+                sms.getParams1(),
+                sms.getParams2(),
+                sms.getParams3(),
+                sms.getParams4(),
+                sms.getStatus());
     }
 }

epmet-module/epmet-message/epmet-message-server/src/main/resources/mapper/SysSmsDao.xml

@@ -3,5 +3,27 @@
 
 <mapper namespace="com.epmet.dao.SysSmsDao">
 
+   <insert id="tempInsert" parameterType="map">
+    INSERT INTO `sys_sms` (
+        `platform`,
+       `mobile`,
+       `params_1`,
+       `params_2`,
+       `params_3`,
+       `params_4`,
+       `status`,
+       `creator`,
+       `create_date`)
+       VALUES
+           ( #{platform},
+            #{mobile},
+       #{params1},
+       #{params2},
+       #{params3},
+       #{params4},
+       #{status},
+           "1",
+       now())
+   </insert>
 
 </mapper>

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

@@ -131,7 +131,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>
@@ -161,7 +161,7 @@
 
                 <!-- 数据库配置-->
                 <spring.datasource.druid.url>
-                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_admin?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
+                    <![CDATA[jdbc:mysql://47.104.224.45:3308/epmet_oss?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8&useSSL=false&serverTimezone=Asia/Shanghai]]>
                 </spring.datasource.druid.url>
                 <spring.datasource.druid.username>epmet</spring.datasource.druid.username>
                 <spring.datasource.druid.password>elink@833066</spring.datasource.druid.password>

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/controller/OssController.java

@@ -71,7 +71,7 @@ public class OssController {
 
 	@PostMapping
 	@ApiOperation(value = "保存云存储配置信息")
-	@LogOperation("保存云存储配置信息")
+//	@LogOperation("保存云存储配置信息")
 	public Result saveConfig(@RequestBody CloudStorageConfig config){
 		//校验类型
 		ValidatorUtils.validateEntity(config);
@@ -107,7 +107,7 @@ public class OssController {
 		OssEntity ossEntity = new OssEntity();
 		ossEntity.setUrl(url);
 		ossEntity.setCreateDate(new Date());
-		ossService.insert(ossEntity);
+		ossService.insertOssEntity(ossEntity);
 
 		//文件信息
 		UploadDTO dto = new UploadDTO();
@@ -119,7 +119,7 @@ public class OssController {
 
 	@DeleteMapping
 	@ApiOperation(value = "删除")
-	@LogOperation("删除")
+//	@LogOperation("删除")
 	public Result delete(@RequestBody Long[] ids){
 		ossService.deleteBatchIds(Arrays.asList(ids));
 

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/dao/OssDao.java

@@ -20,4 +20,5 @@ import org.apache.ibatis.annotations.Mapper;
 @Mapper
 public interface OssDao extends BaseDao<OssEntity> {
 
+	int insertOssEntity(String url);
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/OssService.java

@@ -22,4 +22,6 @@ import java.util.Map;
 public interface OssService extends BaseService<OssEntity> {
 
 	PageData<OssEntity> page(Map<String, Object> params);
+
+	int insertOssEntity(OssEntity ossEntity);
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/java/com/epmet/service/impl/OssServiceImpl.java

@@ -31,4 +31,9 @@ public class OssServiceImpl extends BaseServiceImpl<OssDao, OssEntity> implement
 		);
 		return getPageData(page, OssEntity.class);
 	}
+
+	@Override
+	public int insertOssEntity(OssEntity ossEntity) {
+		return baseDao.insertOssEntity(ossEntity.getUrl());
+	}
 }

epmet-module/epmet-oss/epmet-oss-server/src/main/resources/mapper/SysOssDao.xml

@@ -3,5 +3,11 @@
 
 <mapper namespace="com.epmet.dao.OssDao">
 
-
+    <insert id="insertOssEntity" parameterType="java.lang.String">
+        INSERT INTO `sys_oss` ( `url`, `creator`, `create_date` )
+        VALUES
+            ( #{url},
+            "1",
+            now( ) )
+    </insert>
 </mapper>

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/PartyMemberSubmitFromDTO.java

@@ -0,0 +1,34 @@
+package com.epmet.resi.mine.dto.from;
+
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import lombok.Data;
+
+import java.io.Serializable;
+
+/**
+ * @author zhaoqifeng
+ * @dscription
+ * @date 2020/3/31 13:31
+ */
+@Data
+public class PartyMemberSubmitFromDTO implements Serializable {
+
+	private static final long serialVersionUID = 2869322535180774823L;
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+	/**
+	 * 网格ID
+	 */
+	private String gridId;
+	/**
+	 * 党员认证行为记录表Id
+	 */
+	private String visitId;
+	/**
+	 * 党员认证信息
+	 */
+	private PartymemberInfoDTO partyMemberInfo;
+
+}

epmet-module/resi-mine/resi-mine-client/src/main/java/com/epmet/resi/mine/dto/from/VerificationCodeFromDTO.java

@@ -15,6 +15,11 @@ public class VerificationCodeFromDTO implements Serializable {
 
 	private static final long serialVersionUID = 1L;
 
+	/**
+	 * 客户ID
+	 */
+	private String customerId;
+
 	/**
 	 * 用户ID
 	 */

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

@@ -4,6 +4,7 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
@@ -43,4 +44,11 @@ public interface EpmetUserFeignClient {
      **/
     @PostMapping(value = "epmetuser/userresiinfo/submit")
     Result submit(UserResiInfoDTO userResiInfoDTO);
+
+    /**
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
+    @PostMapping(value = "epmetuser/userresiinfo/getverificationcode")
+    Result getVerificationCode(VerificationCodeFormDTO formDTO);
 }

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

@@ -1,25 +0,0 @@
-package com.epmet.modules.feign;
-
-import com.epmet.commons.tools.constant.ServiceConstant;
-import com.epmet.commons.tools.utils.Result;
-import com.epmet.modules.feign.fallback.PartyMemberConfirmFeignClientFallBack;
-import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
-import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
-import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
-import org.springframework.cloud.openfeign.FeignClient;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2020/3/30 16:03
- */
-@FeignClient(name = ServiceConstant.RESI_PARTYMEMBER_SERVER, fallback = PartyMemberConfirmFeignClientFallBack.class)
-public interface PartyMemberConfirmFeignClient {
-	@PostMapping("/resi/partymember/confirm/init")
-	Result<PartyMemberInitResultDTO> init(@RequestBody PartyMemberInitFromDTO fromDto);
-
-	@PostMapping("/resi/partymember/confirm/getverificationcode")
-	Result getVerificationCode(@RequestBody VerificationCodeFromDTO fromDto);
-}

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

@@ -3,11 +3,16 @@ package com.epmet.modules.feign;
 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.mine.dto.from.PartyMemberInitFromDTO;
+import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
+import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 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;
+import org.springframework.web.bind.annotation.RequestBody;
 
 /**
  * @Description 居民端陌生人导览  调用epmet-user服务
@@ -30,4 +35,45 @@ public interface ResiPartymemberFeignClient {
      **/
     @PostMapping(value = "resi/partymember/resiwarmheartedapply/submit")
     Result submit(ResiWarmheartedSubmitFormDTO formDTO);
+
+    /**
+     * 党员认证页面初始化
+     *
+     * @param fromDto 参数
+     * @return Result<PartyMemberInitResultDto>
+     * @date 2020/3/30 13:50
+     */
+    @PostMapping("/resi/partymember/confirm/init")
+    Result<PartyMemberInitResultDTO> init(@RequestBody PartyMemberInitFromDTO fromDto);
+
+
+    /**
+     * 党员认证页获取手机验证码
+     *
+     * @param fromDto 参数
+     * @return Result<PartyMemberInitResultDto>
+     * @date 2020/3/30 13:50
+     */
+    @PostMapping("/resi/partymember/confirm/getverificationcode")
+    Result getVerificationCode(@RequestBody VerificationCodeFromDTO fromDto);
+
+
+    /**
+     * 党员认证信息提交
+     *
+     * @param partyMemberInfoDTO 参数
+     * @return Result
+     * @date 2020/3/31 10:50
+     */
+    @PostMapping("/resi/partymember/confirm/submit")
+    Result submit(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
+
+    /**
+     * 党员认证信息补充
+     *
+     * @param partyMemberInfoDTO 参数
+     * @return Result
+     */
+    @PostMapping("extra")
+    Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO);
 }

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

@@ -5,6 +5,7 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.LatestGridInfoResultDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
@@ -51,5 +52,14 @@ public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
         return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "submit", userResiInfoDTO);
     }
 
+    /**
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
+    @Override
+    public Result getVerificationCode(VerificationCodeFormDTO formDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getVerificationCode", formDTO);
+    }
+
 
 }

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

@@ -1,28 +0,0 @@
-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.modules.feign.PartyMemberConfirmFeignClient;
-import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
-import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
-import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
-import org.springframework.stereotype.Component;
-
-/**
- * @author zhaoqifeng
- * @dscription
- * @date 2020/3/30 16:04
- */
-@Component
-public class PartyMemberConfirmFeignClientFallBack implements PartyMemberConfirmFeignClient {
-	@Override
-	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
-		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", fromDto);
-	}
-
-	@Override
-	public Result getVerificationCode(VerificationCodeFromDTO fromDto) {
-		return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getVerificationCode", fromDto);
-	}
-}

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

@@ -4,6 +4,10 @@ import com.epmet.commons.tools.constant.ServiceConstant;
 import com.epmet.commons.tools.utils.ModuleUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
+import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
+import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
+import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 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;
@@ -37,4 +41,24 @@ public class ResiPartymemberFeignClientFallBack implements ResiPartymemberFeignC
     public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
         return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "submit", formDTO);
     }
+
+    @Override
+    public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "init", fromDto);
+    }
+
+    @Override
+    public Result getVerificationCode(VerificationCodeFromDTO fromDto) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "getVerificationCode", fromDto);
+    }
+
+    @Override
+    public Result submit(PartymemberInfoDTO partyMemberInfoDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "submit", partyMemberInfoDTO);
+    }
+
+    @Override
+    public Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO) {
+        return ModuleUtils.feignConError(ServiceConstant.RESI_PARTYMEMBER_SERVER, "partyMemberInfoExtra", partyMemberInfoDTO);
+    }
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberController.java

@@ -5,6 +5,7 @@ import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.modules.partymember.service.PartyMemberService;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
+import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -49,4 +50,28 @@ public class PartyMemberController {
 	public Result getVerificationCode(@LoginUser TokenDto tokenDto, @RequestBody VerificationCodeFromDTO fromDto) {
 		return partyMemberService.getVerificationCode(tokenDto, fromDto);
 	}
+
+	/**
+	 * 党员认证信息提交
+	 *
+	 * @param fromDto 参数
+	 * @return Result
+	 * @date 2020/3/30 13:50
+	 */
+	@PostMapping("submit")
+	public Result submit(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
+		return partyMemberService.submit(tokenDto, fromDto);
+	}
+
+	/**
+	 * 党员认证信息补充
+	 *
+	 * @param fromDto 参数
+	 * @return Result
+	 * @date 2020/3/30 13:50
+	 */
+	@PostMapping("extra")
+	public Result partyMemberInfoExtra(@LoginUser TokenDto tokenDto, @RequestBody PartyMemberSubmitFromDTO fromDto) {
+		return partyMemberService.partyMemberInfoExtra(tokenDto, fromDto);
+	}
 }

epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/partymember/service/PartyMemberService.java

@@ -3,6 +3,7 @@ package com.epmet.modules.partymember.service;
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
+import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 
@@ -29,4 +30,22 @@ public interface PartyMemberService {
 	 * @return Result
 	 */
 	Result getVerificationCode(TokenDto tokenDto, VerificationCodeFromDTO fromDTO);
+
+	/**
+	 * 党员认证信息提交
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  参数
+	 * @return Result
+	 */
+	Result submit(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO);
+
+	/**
+	 * 党员认证信息补充
+	 *
+	 * @param tokenDto token
+	 * @param fromDTO  参数
+	 * @return Result
+	 */
+	Result partyMemberInfoExtra(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO);
 }

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

@@ -2,11 +2,13 @@ package com.epmet.modules.partymember.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
-import com.epmet.modules.feign.PartyMemberConfirmFeignClient;
+import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.partymember.service.PartyMemberService;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
+import com.epmet.resi.mine.dto.from.PartyMemberSubmitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -20,16 +22,36 @@ import org.springframework.stereotype.Service;
 public class PartyMemberServiceImpl implements PartyMemberService {
 
 	@Autowired
-	PartyMemberConfirmFeignClient partyMemberConfirmFeignClient;
+	ResiPartymemberFeignClient resiPartymemberFeignClient;
 
 	@Override
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
-		return partyMemberConfirmFeignClient.init(fromDto);
+		return resiPartymemberFeignClient.init(fromDto);
 	}
 
 	@Override
 	public Result getVerificationCode(TokenDto tokenDto, VerificationCodeFromDTO fromDTO) {
 		fromDTO.setUserId(tokenDto.getUserId());
-		return partyMemberConfirmFeignClient.getVerificationCode(fromDTO);
+		return resiPartymemberFeignClient.getVerificationCode(fromDTO);
+	}
+
+	@Override
+	public Result submit(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO) {
+		PartymemberInfoDTO partyMemberInfo = fromDTO.getPartyMemberInfo();
+		partyMemberInfo.setCustomerId(fromDTO.getCustomerId());
+		partyMemberInfo.setGridId(fromDTO.getGridId());
+		partyMemberInfo.setUserId(tokenDto.getUserId());
+		partyMemberInfo.setPartymemberVisitId(fromDTO.getVisitId());
+		return resiPartymemberFeignClient.submit(partyMemberInfo);
+	}
+
+	@Override
+	public Result partyMemberInfoExtra(TokenDto tokenDto, PartyMemberSubmitFromDTO fromDTO) {
+		PartymemberInfoDTO partyMemberInfo = fromDTO.getPartyMemberInfo();
+		partyMemberInfo.setCustomerId(fromDTO.getCustomerId());
+		partyMemberInfo.setGridId(fromDTO.getGridId());
+		partyMemberInfo.setUserId(tokenDto.getUserId());
+		partyMemberInfo.setPartymemberVisitId(fromDTO.getVisitId());
+		return resiPartymemberFeignClient.partyMemberInfoExtra(partyMemberInfo);
 	}
 }

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

@@ -5,9 +5,9 @@ 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.form.VerificationCodeFormDTO;
 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;
@@ -47,5 +47,15 @@ public class ResiRegisterController {
         return resiRegisterService.submit(tokenDTO, userResiInfoDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
+    @PostMapping("getverificationcode")
+    public Result getVerificationCode(@LoginUser TokenDto tokenDTO, @RequestBody VerificationCodeFormDTO formDTO) {
+        return resiRegisterService.getVerificationCode(tokenDTO, formDTO);
+    }
+
 
 }

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

@@ -4,6 +4,7 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 
 /**
@@ -32,4 +33,13 @@ public interface ResiRegisterService {
      */
     Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO);
 
+    /**
+     * 居民端-居民注册根据手机号获取验证码
+     *
+     * @param
+     * @return void
+     * @author sun
+     */
+    Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO);
+
 }

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

@@ -4,6 +4,7 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.EpmetUserFeignClient;
 import com.epmet.modules.resiregister.service.ResiRegisterService;
@@ -23,21 +24,60 @@ public class ResiRegisterServiceImpl implements ResiRegisterService {
     @Autowired
     private EpmetUserFeignClient epmetUserFeignClient;
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册页面初始化-居民注册访问记录表新增数据
+     **/
     @Override
     public Result<ResiRegisterResultDTO> init(TokenDto tokenDTO, ResiRegisterFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getVisitFrom())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return epmetUserFeignClient.init(formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册信息提交
+     **/
     @Override
-    public Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO) {
+    public Result submit(TokenDto tokenDTO, UserResiInfoDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiRegisterResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
-        userResiInfoDTO.setUserId(tokenDTO.getUserId());
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
-        return epmetUserFeignClient.submit(userResiInfoDTO);
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getResiVisitId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return epmetUserFeignClient.submit(formDTO);
     }
+
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
+    @Override
+    public Result getVerificationCode(TokenDto tokenDTO, VerificationCodeFormDTO formDTO) {
+        if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
+            return new Result().error(ModuleConstant.USER_NOT_NULL);
+        }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getMobile())
+                || StringUtils.isBlank(formDTO.getResiVisitId())) {
+            return new Result<ResiRegisterResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
+        formDTO.setUserId(tokenDTO.getUserId());
+        return epmetUserFeignClient.getVerificationCode(formDTO);
+    }
+
 }

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

@@ -27,4 +27,9 @@ public interface ModuleConstant extends Constant {
 	 * 接口只限居民端调用
 	 */
 	String FOR_RESI_CALL="当前接口只限居民端调用";
+
+	/**
+	 * 参数异常-必要参数存在空值
+	 */
+	String PARAMETER_EXCEPTION="必要参数存在空值，请检查参数赋值情况！";
 }

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

@@ -2,6 +2,7 @@ package com.epmet.modules.warmhearted.service.impl;
 
 import com.epmet.commons.tools.security.dto.TokenDto;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.modules.feign.ResiPartymemberFeignClient;
 import com.epmet.modules.utils.ModuleConstant;
 import com.epmet.modules.warmhearted.service.ResiWarmheartedService;
@@ -23,20 +24,41 @@ public class ResiWarmheartedServiceImpl implements ResiWarmheartedService {
     @Autowired
     private ResiPartymemberFeignClient resiPartymemberFeignClient;
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-热心居民申请页面初始化-查询有无申请、新增访问行为记录数据
+     **/
     @Override
     public Result<ResiWarmheartedResultDTO> init(TokenDto tokenDTO, ResiWarmheartedFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getVisitFrom())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.init(formDTO);
     }
 
+    /**
+     * @param
+     * @Author sun
+     * @Description 居民端-热心居民申请-提交申请数据
+     **/
     @Override
     public Result submit(TokenDto tokenDTO, ResiWarmheartedSubmitFormDTO formDTO) {
         if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) {
             return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.USER_NOT_NULL);
         }
+        if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId())
+                || StringUtils.isBlank(formDTO.getGridId())
+                || StringUtils.isBlank(formDTO.getResiWarmVisitId())
+                || StringUtils.isBlank(formDTO.getReason())) {
+            return new Result<ResiWarmheartedResultDTO>().error(ModuleConstant.PARAMETER_EXCEPTION);
+        }
         formDTO.setUserId(tokenDTO.getUserId());
         return resiPartymemberFeignClient.submit(formDTO);
     }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberInfoDTO.java

@@ -99,6 +99,11 @@ public class PartymemberInfoDTO implements Serializable {
      */
 	private String building;
 
+	/**
+	 * 组织关系类型 0:工作单位 1：其他街道
+	 */
+	private String organizationType;
+
     /**
      * 党组织关系(工作单位或其他街道)
      */
@@ -144,4 +149,9 @@ public class PartymemberInfoDTO implements Serializable {
      */
 	private Date updatedTime;
 
+	/**
+	 * 验证码
+	 */
+	private String code;
+
 }

epmet-module/resi-partymember/resi-partymember-client/src/main/java/com/epmet/resi/partymember/dto/partymember/PartymemberRegisterRelationDTO.java

@@ -57,17 +57,17 @@ public class PartymemberRegisterRelationDTO implements Serializable {
     /**
      * 首次注册用户 (0表示不参与计数  1表示参与计数)
      */
-	private String firstRegister;
+	private Integer firstRegister;
 
     /**
      * 注册用户 (0表示不参与计数  1表示参与计数)
      */
-	private String register;
+	private Integer register;
 
     /**
      * 参与用户 (0表示不参与计数  1表示参与计数)
      */
-	private String partake;
+	private Integer partake;
 
     /**
      * 删除标识：0.未删除 1.已删除

epmet-module/resi-partymember/resi-partymember-server/pom.xml

@@ -70,6 +70,23 @@
             <version>2.0.0</version>
             <scope>compile</scope>
         </dependency>
+        <dependency>
+            <groupId>info.debatty</groupId>
+            <artifactId>java-string-similarity</artifactId>
+            <version>1.2.1</version>
+        </dependency>
+        <dependency>
+            <groupId>org.jetbrains</groupId>
+            <artifactId>annotations</artifactId>
+            <version>RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.epmet</groupId>
+            <artifactId>epmet-user-server</artifactId>
+            <version>2.0.0</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
     <build>

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java

@@ -29,7 +29,7 @@ public interface PartyMemberConstant {
 	/**
 	 * 信息补充
 	 */
-	String OPERATE_EXTRA = "auto_extra";
+	String OPERATE_EXTRA = "extra";
 
 	/**
 	 * 未提交
@@ -40,4 +40,45 @@ public interface PartyMemberConstant {
 	 * 已提交
 	 */
 	String SUBMITTED = "1";
+
+	/**
+	 * 党员自动认证是否成功基准
+	 */
+	String BENCHMARK = "110010";
+
+	/**
+	 * 比对结果大部分相同最低值
+	 */
+
+	Double MOST = 0.8;
+
+	/**
+	 * 比对结果小部分相同最低值
+	 */
+	Double SMALL = 0.5;
+
+	/**
+	 * 比对结果相同
+	 */
+	String SAME = "1";
+
+	/**
+	 * 比对结果不同
+	 */
+	String DIFF = "0";
+
+	/**
+	 * 审核状态 待审核
+	 */
+	String UNDER_AUDITTING = "under_auditting";
+
+	/**
+	 * 审核状态 通过
+	 */
+	String APPROVED = "approved";
+
+	/**
+	 * 审核状态 未通过
+	 */
+	String REJECTED = "rejected";
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/UserResiInfoFeignClient.java → epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/EpmetUserFeignClient.java

@@ -3,8 +3,9 @@ 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.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.modules.feign.fallback.UserResiInfoFeignClientFallBack;
+import com.epmet.modules.feign.fallback.EpmetUserFeignClientFallBack;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -14,8 +15,8 @@ import org.springframework.web.bind.annotation.RequestBody;
  * @dscription
  * @date 2020/3/30 14:51
  */
-@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = UserResiInfoFeignClientFallBack.class)
+@FeignClient(name = ServiceConstant.EPMET_USER_SERVER, fallback = EpmetUserFeignClientFallBack.class)
-public interface UserResiInfoFeignClient {
+public interface EpmetUserFeignClient {
 
 	/**
 	 * 查询用户注册信息
@@ -25,4 +26,21 @@ public interface UserResiInfoFeignClient {
 	@PostMapping("/epmetuser/userresiinfo/getUserResiInfoDTO")
 	Result<UserResiInfoDTO> getUserResiInfoDTO(@RequestBody UserResiInfoFormDTO userResiInfoFormDTO);
 
+	/**
+	 * 党员认证时，如果没有注册居民，则注册居民信息
+	 * @param userResiInfoDTO
+	 * @author zhaoqifeng
+	 **/
+	@PostMapping("/epmetuser/userresiinfo/saveResiInfo")
+	Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO);
+
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("/epmetuser/userrole/saveUserRole")
+	Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/UserResiInfoFeignClientFallBack.java → epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/feign/fallback/EpmetUserFeignClientFallBack.java

@@ -4,8 +4,9 @@ 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.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.modules.feign.UserResiInfoFeignClient;
+import com.epmet.modules.feign.EpmetUserFeignClient;
 import org.springframework.stereotype.Component;
 
 /**
@@ -14,9 +15,19 @@ import org.springframework.stereotype.Component;
  * @date 2020/3/30 14:53
  */
 @Component
-public class UserResiInfoFeignClientFallBack implements UserResiInfoFeignClient {
+public class EpmetUserFeignClientFallBack implements EpmetUserFeignClient {
 	@Override
 	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
 		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getUserResiInfoDTO", userResiInfoFormDTO);
 	}
+
+	@Override
+	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveResiInfo", userResiInfoDTO);
+	}
+
+	@Override
+	public Result saveUserRole(UserRoleDTO userRoleDTO) {
+		return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "saveUserRole", userRoleDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/controller/PartyMemberConfirmController.java

@@ -5,6 +5,7 @@ import com.epmet.modules.partymember.service.PartyMemberConfirmService;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
@@ -12,7 +13,6 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- *
  * 党员认证
  *
  * @author zhaoqifeng
@@ -48,4 +48,27 @@ public class PartyMemberConfirmController {
 	public Result getVerificationCode(@RequestBody VerificationCodeFromDTO fromDto) {
 		return partyMemberConfirmService.getVerificationCode(fromDto);
 	}
+
+	/**
+	 * 党员认证信息提交
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 * @return Result
+	 * @date 2020/3/31 10:50
+	 */
+	@PostMapping("submit")
+	public Result submit(@RequestBody PartymemberInfoDTO partyMemberInfoDTO) {
+		return partyMemberConfirmService.submit(partyMemberInfoDTO);
+	}
+
+	/**
+	 * 党员认证信息补充
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("extra")
+	public Result partyMemberInfoExtra(@RequestBody PartymemberInfoDTO partyMemberInfoDTO) {
+		return partyMemberConfirmService.partyMemberInfoExtra(partyMemberInfoDTO);
+	}
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/dao/PartymemberBaseInfoDao.java

@@ -19,15 +19,42 @@ package com.epmet.modules.partymember.dao;
 
 import com.epmet.commons.mybatis.dao.BaseDao;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
- * 党员库基本信息表 
+ * 党员库基本信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
  */
 @Mapper
 public interface PartymemberBaseInfoDao extends BaseDao<PartymemberBaseInfoEntity> {
-	
+
+	/**
+	 * 根据身份证匹配数据
+	 *
+	 * @param param 参数
+	 * @return List
+	 */
+	List<PartymemberBaseInfoEntity> selectBaseInfoByIdCard(PartymemberInfoDTO param);
+
+	/**
+	 * 手根据机号匹配数据
+	 *
+	 * @param param 参数
+	 * @return List
+	 */
+	List<PartymemberBaseInfoEntity> selectBaseInfoByMobile(PartymemberInfoDTO param);
+
+	/**
+	 * 根据姓名匹配数据
+	 *
+	 * @param param 参数
+	 * @return List
+	 */
+	List<PartymemberBaseInfoEntity> selectBaseInfoByName(PartymemberInfoDTO param);
+
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberInfoEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党员认证信息表 
  *
@@ -98,6 +95,11 @@ public class PartymemberInfoEntity extends BaseEpmetEntity {
      */
 	private String building;
 
+	/**
+	 * 组织关系类型 0:工作单位 1：其他街道
+	 */
+	private String organizationType;
+
     /**
      * 党组织关系(工作单位或其他街道)
      */

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/entity/PartymemberRegisterRelationEntity.java

@@ -18,13 +18,10 @@
 package com.epmet.modules.partymember.entity;
 
 import com.baomidou.mybatisplus.annotation.TableName;
-
 import com.epmet.commons.mybatis.entity.BaseEpmetEntity;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
-import java.util.Date;
-
 /**
  * 党员注册关系表  用于统计客户网格的认证党员数
  *
@@ -56,16 +53,16 @@ public class PartymemberRegisterRelationEntity extends BaseEpmetEntity {
     /**
      * 首次注册用户 (0表示不参与计数  1表示参与计数)
      */
-	private String firstRegister;
+	private Integer firstRegister;
 
     /**
      * 注册用户 (0表示不参与计数  1表示参与计数)
      */
-	private String register;
+	private Integer register;
 
     /**
      * 参与用户 (0表示不参与计数  1表示参与计数)
      */
-	private String partake;
+	private Integer partake;
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberInfoExcel.java

@@ -70,6 +70,9 @@ public class PartymemberInfoExcel {
     @Excel(name = "楼栋单元")
     private String building;
 
+    @Excel(name = "组织关系类型 0:工作单位 1：其他街道")
+    private String organizationType;
+
     @Excel(name = "党组织关系(工作单位或其他街道)")
     private String extraOrganization;
 

epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/excel/PartymemberRegisterRelationExcel.java

@@ -44,13 +44,13 @@ public class PartymemberRegisterRelationExcel {
     private String userId;
 
     @Excel(name = "首次注册用户 (0表示不参与计数  1表示参与计数)")
-    private String firstRegister;
+    private Integer firstRegister;
 
     @Excel(name = "注册用户 (0表示不参与计数  1表示参与计数)")
-    private String register;
+    private Integer register;
 
     @Excel(name = "参与用户 (0表示不参与计数  1表示参与计数)")
-    private String partake;
+    private Integer partake;
 
     @Excel(name = "删除标识：0.未删除 1.已删除")
     private Integer delFlag;

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

@@ -4,9 +4,9 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 
 /**
- *
  * 党员认证
  *
  * @author zhaoqifeng
@@ -15,7 +15,6 @@ import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
 public interface PartyMemberConfirmService {
 
 	/**
-	 *
 	 * 党员认证页面初始化
 	 *
 	 * @param fromDto 参数
@@ -25,9 +24,26 @@ public interface PartyMemberConfirmService {
 
 	/**
 	 * 获取手机验证码
+	 *
 	 * @param fromDTO 参数
 	 * @return Result
 	 */
-	Result getVerificationCode( VerificationCodeFromDTO fromDTO);
+	Result getVerificationCode(VerificationCodeFromDTO fromDTO);
+
+	/**
+	 * 党员认证信息提交
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 * @return Result
+	 */
+	Result submit(PartymemberInfoDTO partyMemberInfoDTO);
+
+	/**
+	 * 党员信息补充
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 * @return Result
+	 */
+	Result partyMemberInfoExtra(PartymemberInfoDTO partyMemberInfoDTO);
 
 }

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

@@ -21,6 +21,8 @@ import com.epmet.commons.mybatis.service.BaseService;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 
 import java.util.List;
 import java.util.Map;
@@ -92,4 +94,11 @@ public interface PartymemberBaseInfoService extends BaseService<PartymemberBaseI
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 根据身份证，手机号，姓名匹配党员基本信息
+     * @param partyMemberInfoDTO 参数
+     * @return GetPartyMemberBaseInfoResultDTO
+     */
+    PartymemberConfirmAutoDTO getPartyMemberBaseInfo(PartymemberInfoDTO partyMemberInfoDTO);
 }

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

@@ -1,23 +1,25 @@
 package com.epmet.modules.partymember.service.impl;
 
+import com.epmet.commons.tools.exception.EpmetErrorCode;
 import com.epmet.commons.tools.utils.ConvertUtils;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.constant.PartyMemberConstant;
+import com.epmet.constant.UserConstant;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
-import com.epmet.modules.feign.UserResiInfoFeignClient;
+import com.epmet.modules.feign.EpmetUserFeignClient;
-import com.epmet.modules.partymember.entity.PartymemberInfoEntity;
+import com.epmet.modules.partymember.entity.*;
-import com.epmet.modules.partymember.entity.PartymemberVisitEntity;
 import com.epmet.modules.partymember.redis.PartymemberInfoRedis;
-import com.epmet.modules.partymember.service.PartyMemberConfirmService;
+import com.epmet.modules.partymember.service.*;
-import com.epmet.modules.partymember.service.PartymemberInfoService;
-import com.epmet.modules.partymember.service.PartymemberVisitService;
 import com.epmet.resi.mine.dto.from.PartyMemberInitFromDTO;
 import com.epmet.resi.mine.dto.from.VerificationCodeFromDTO;
 import com.epmet.resi.mine.dto.result.PartyMemberInitResultDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
 import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
 
 import java.util.Date;
 
@@ -31,15 +33,26 @@ import java.util.Date;
 public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService {
 
 	@Autowired
-	private UserResiInfoFeignClient userResiInfoFeignClient;
+	private EpmetUserFeignClient epmetUserFeignClient;
 	@Autowired
 	private PartymemberInfoService partymemberInfoService;
 	@Autowired
 	private PartymemberVisitService partymemberVisitService;
 	@Autowired
 	private PartymemberInfoRedis partyMemberInfoRedis;
+	@Autowired
+	private PartymemberBaseInfoService partymemberBaseInfoService;
+	@Autowired
+	private PartymemberConfirmAutoService partymemberConfirmAutoService;
+	@Autowired
+	private PartymemberConfirmManualService partymemberConfirmManualService;
+	@Autowired
+	private PartymemberRegisterRelationService partymemberRegisterRelationService;
+
+	private final static String BENCHMARK = "110010";
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result<PartyMemberInitResultDTO> init(PartyMemberInitFromDTO fromDto) {
 
 		PartyMemberInitResultDTO result = new PartyMemberInitResultDTO();
@@ -61,36 +74,30 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 			UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
 			userResiInfoFormDTO.setCustomerId(fromDto.getCustomerId());
 			userResiInfoFormDTO.setUserId(fromDto.getUserId());
-			Result<UserResiInfoDTO> userResiInfoResult = userResiInfoFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+			Result<UserResiInfoDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
 			result.setPartyMemberInfo(ConvertUtils.sourceToTarget(userResiInfoResult.getData(), PartymemberInfoDTO.class));
 		}
 
 		// 将访问行为存入热心居民申请行为记录表
-		PartymemberVisitEntity partymemberVisitEntity = new PartymemberVisitEntity();
+		String visitId = saveOrUpdateVisit(null, fromDto, PartyMemberConstant.OPERATE_INITIALIZE);
-		partymemberVisitEntity.setCustomerId(fromDto.getCustomerId());
-		partymemberVisitEntity.setGridId(fromDto.getGridId());
-		partymemberVisitEntity.setUserId(fromDto.getUserId());
-		partymemberVisitEntity.setOperateVisit(PartyMemberConstant.OPERATE_INITIALIZE);
-		partymemberVisitEntity.setVisitFrom(fromDto.getVisitFrom());
-		partymemberVisitEntity.setVisitTime(new Date());
-		partymemberVisitService.insert(partymemberVisitEntity);
 
-		result.setVisitId(partymemberVisitEntity.getId());
+		result.setVisitId(visitId);
 
 		return new Result<PartyMemberInitResultDTO>().ok(result);
 	}
 
 	@Override
+	@Transactional(rollbackFor = Exception.class)
 	public Result getVerificationCode(VerificationCodeFromDTO fromDTO) {
 		Result result = new Result();
 		//手机是否可用
-		PartymemberInfoEntity partyMemberInfoParam= new PartymemberInfoEntity();
+		PartymemberInfoEntity partyMemberInfoParam = new PartymemberInfoEntity();
 		partyMemberInfoParam.setMobile(fromDTO.getMobile());
 		PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam);
 		if (null != partyMemberInfoResult) {
-			//TODO
+			//TODO code待定
-			result.setCode(0);
+			result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue());
-			result.setMsg("");
+			result.setMsg(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getName());
 			return result;
 		}
 
@@ -101,12 +108,157 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService
 		partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), code);
 
 		//将访问记录更新到热心居民申请行为记录表
-		PartymemberVisitEntity partymemberVisitEntity = new PartymemberVisitEntity();
+		saveOrUpdateVisit(fromDTO.getVisitId(), null, PartyMemberConstant.OPERATE_OPERATE_SMS_CODE);
-		partymemberVisitEntity.setId(fromDTO.getVisitId());
+
-		partymemberVisitEntity.setVisitTime(new Date());
+		return result;
-		partymemberVisitEntity.setOperateVisit(PartyMemberConstant.OPERATE_OPERATE_SMS_CODE);
+	}
-		partymemberVisitService.updateById(partymemberVisitEntity);
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public Result submit(PartymemberInfoDTO partyMemberInfoDTO) {
+		Result result = new Result();
+
+		//校验手机验证码是否正常
+		String code = partyMemberInfoRedis.getUserMobileCode(partyMemberInfoDTO.getUserId(),
+				partyMemberInfoDTO.getMobile(),
+				partyMemberInfoDTO.getCode());
+		if (null == code) {
+			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null,
+					PartyMemberConstant.OPERATE_AUTO_FAILED);
+			//TODO code待定
+			result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue());
+			result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName());
+			return result;
+		}
+
+		//获取党员基本信息
+		PartymemberConfirmAutoDTO confirmAutoDTO =
+				partymemberBaseInfoService.getPartyMemberBaseInfo(partyMemberInfoDTO);
+
+		//党员信息存入党员认证信息表
+		PartymemberInfoEntity partyMemberInfoEntity = ConvertUtils.sourceToTarget(partyMemberInfoDTO,
+				PartymemberInfoEntity.class);
+
+		if (confirmAutoDTO == null || confirmAutoDTO.getResult().compareTo(PartyMemberConstant.BENCHMARK) < 0) {
+			//自动认证失败
+			partyMemberInfoEntity.setConfirmResult("1");
+			partymemberInfoService.insert(partyMemberInfoEntity);
+			//将访问记录更新到热心居民申请行为记录表
+			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_FAILED);
+			//TODO code待定
+			result.setCode(EpmetErrorCode.AUTO_CONFIRM_FAILED.getValue());
+			result.setMsg(EpmetErrorCode.AUTO_CONFIRM_FAILED.getName());
+		} else {
+			//自动认证成功
+			partyMemberInfoEntity.setConfirmResult("0");
+			partymemberInfoService.insert(partyMemberInfoEntity);
+			//将访问记录更新到热心居民申请行为记录表
+			saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS);
+			//添加用户党员角色关系
+			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setUserId(partyMemberInfoDTO.getUserId());
+			userRole.setRoleKey(UserConstant.ROLE_PARTYMEMBER);
+			epmetUserFeignClient.saveUserRole(userRole);
+			//存入党员注册关系表  用于统计客户网格的认证党员数
+			saveRegisterRelation(partyMemberInfoDTO);
+		}
+
+		//将自动认证结果存入党员认证自动审核表
+		if (confirmAutoDTO != null) {
+			confirmAutoDTO.setPartymemberInfoId(partyMemberInfoEntity.getPartymemberVisitId());
+			partymemberConfirmAutoService.insert(ConvertUtils.sourceToTarget(confirmAutoDTO,
+					PartymemberConfirmAutoEntity.class));
+		}
+
+		//判断是否已注册居民，如果没有则注册居民
+		isResiRegister(partyMemberInfoDTO);
 
 		return result;
 	}
+
+	@Override
+	public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) {
+		//将访问记录更新到热心居民申请行为记录表
+		saveOrUpdateVisit(infoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_EXTRA);
+
+		//补充信息更新到党员基本信息表
+		PartymemberInfoDTO partyMemberInfo = partymemberInfoService.getPartyMemberInfo(infoDTO);
+		infoDTO.setId(partyMemberInfo.getId());
+		partymemberInfoService.updateById(ConvertUtils.sourceToTarget(infoDTO, PartymemberInfoEntity.class));
+
+		//待审核数据存入党员认证人工审核表
+		PartymemberConfirmManualEntity manualEntity = new PartymemberConfirmManualEntity();
+		manualEntity.setCustomerId(infoDTO.getCustomerId());
+		manualEntity.setGridId(infoDTO.getGridId());
+		manualEntity.setUserId(infoDTO.getUserId());
+		manualEntity.setPartymemberInfoId(infoDTO.getId());
+		manualEntity.setAuditStatus(PartyMemberConstant.UNDER_AUDITTING);
+		partymemberConfirmManualService.insert(manualEntity);
+
+		return new Result();
+	}
+
+	/**
+	 * 判断是否已注册居民，如果没有则注册居民
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 */
+	private void isResiRegister(PartymemberInfoDTO partyMemberInfoDTO) {
+		UserResiInfoFormDTO userResiInfoFormDTO = new UserResiInfoFormDTO();
+		userResiInfoFormDTO.setCustomerId(partyMemberInfoDTO.getCustomerId());
+		userResiInfoFormDTO.setUserId(partyMemberInfoDTO.getUserId());
+		Result<UserResiInfoDTO> userResiInfoResult = epmetUserFeignClient.getUserResiInfoDTO(userResiInfoFormDTO);
+		if (null == userResiInfoResult.getData()) {
+			UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(partyMemberInfoDTO, UserResiInfoDTO.class);
+			userResiInfoDTO.setRegMobile(partyMemberInfoDTO.getMobile());
+			userResiInfoDTO.setResiVisitId(partyMemberInfoDTO.getPartymemberVisitId());
+			epmetUserFeignClient.saveResiInfo(userResiInfoDTO);
+		}
+	}
+
+	/**
+	 * 存入党员注册关系表  用于统计客户网格的认证党员数
+	 *
+	 * @param partyMemberInfoDTO 参数
+	 */
+	private void saveRegisterRelation(PartymemberInfoDTO partyMemberInfoDTO) {
+		PartymemberRegisterRelationEntity registerRelationEntity = new PartymemberRegisterRelationEntity();
+		registerRelationEntity.setCustomerId(partyMemberInfoDTO.getCustomerId());
+		registerRelationEntity.setGridId(partyMemberInfoDTO.getGridId());
+		registerRelationEntity.setUserId(partyMemberInfoDTO.getUserId());
+		registerRelationEntity.setFirstRegister(1);
+		registerRelationEntity.setRegister(1);
+		registerRelationEntity.setPartake(1);
+		partymemberRegisterRelationService.insert(registerRelationEntity);
+	}
+
+
+	/**
+	 * 保存或者更新热心居民申请行为记录表
+	 *
+	 * @param visitId 主键
+	 * @param fromDTO 参数
+	 * @param operate 操作
+	 * @return String
+	 */
+	private String saveOrUpdateVisit(String visitId, PartyMemberInitFromDTO fromDTO, String operate) {
+		PartymemberVisitEntity partymemberVisitEntity = new PartymemberVisitEntity();
+		if (null == visitId) {
+			partymemberVisitEntity.setCustomerId(fromDTO.getCustomerId());
+			partymemberVisitEntity.setGridId(fromDTO.getGridId());
+			partymemberVisitEntity.setUserId(fromDTO.getUserId());
+			partymemberVisitEntity.setOperateVisit(operate);
+			partymemberVisitEntity.setVisitFrom(fromDTO.getVisitFrom());
+			partymemberVisitEntity.setVisitTime(new Date());
+			partymemberVisitService.insert(partymemberVisitEntity);
+		} else {
+			partymemberVisitEntity.setId(visitId);
+			partymemberVisitEntity.setVisitTime(new Date());
+			partymemberVisitEntity.setOperateVisit(operate);
+			partymemberVisitService.updateById(partymemberVisitEntity);
+		}
+
+		return partymemberVisitEntity.getId();
+	}
+
 }

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

@@ -23,22 +23,25 @@ import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
 import com.epmet.commons.tools.constant.FieldConstant;
 import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.ConvertUtils;
+import com.epmet.constant.PartyMemberConstant;
 import com.epmet.modules.partymember.dao.PartymemberBaseInfoDao;
 import com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity;
 import com.epmet.modules.partymember.redis.PartymemberBaseInfoRedis;
 import com.epmet.modules.partymember.service.PartymemberBaseInfoService;
 import com.epmet.resi.partymember.dto.partymember.PartymemberBaseInfoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberConfirmAutoDTO;
+import com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO;
+import info.debatty.java.stringsimilarity.JaroWinkler;
 import 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.*;
-import java.util.List;
+import java.util.stream.Collectors;
-import java.util.Map;
 
 /**
- * 党员库基本信息表 
+ * 党员库基本信息表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -46,59 +49,223 @@ import java.util.Map;
 @Service
 public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl<PartymemberBaseInfoDao, PartymemberBaseInfoEntity> implements PartymemberBaseInfoService {
 
-    @Autowired
+	@Autowired
-    private PartymemberBaseInfoRedis partymemberBaseInfoRedis;
+	private PartymemberBaseInfoRedis partymemberBaseInfoRedis;
-
+
-    @Override
+	private final static String EQUAL = "11";
-    public PageData<PartymemberBaseInfoDTO> page(Map<String, Object> params) {
+	private final static int START = 0;
-        IPage<PartymemberBaseInfoEntity> page = baseDao.selectPage(
+	private final static int ID_CARD_COUNT = 2;
-                getPage(params, FieldConstant.CREATED_TIME, false),
+	private final static int MOBILE_COUNT = 4;
-                getWrapper(params)
+	private final static int NAME_COUNT = 6;
-        );
+
-        return getPageData(page, PartymemberBaseInfoDTO.class);
+	@Override
-    }
+	public PageData<PartymemberBaseInfoDTO> page(Map<String, Object> params) {
-
+		IPage<PartymemberBaseInfoEntity> page = baseDao.selectPage(
-    @Override
+				getPage(params, FieldConstant.CREATED_TIME, false),
-    public List<PartymemberBaseInfoDTO> list(Map<String, Object> params) {
+				getWrapper(params)
-        List<PartymemberBaseInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+		);
-
+		return getPageData(page, PartymemberBaseInfoDTO.class);
-        return ConvertUtils.sourceToTarget(entityList, PartymemberBaseInfoDTO.class);
+	}
-    }
+
-
+	@Override
-    private QueryWrapper<PartymemberBaseInfoEntity> getWrapper(Map<String, Object> params){
+	public List<PartymemberBaseInfoDTO> list(Map<String, Object> params) {
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+		List<PartymemberBaseInfoEntity> entityList = baseDao.selectList(getWrapper(params));
-
+
-        QueryWrapper<PartymemberBaseInfoEntity> wrapper = new QueryWrapper<>();
+		return ConvertUtils.sourceToTarget(entityList, PartymemberBaseInfoDTO.class);
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+	}
-
+
-        return wrapper;
+	private QueryWrapper<PartymemberBaseInfoEntity> getWrapper(Map<String, Object> params) {
-    }
+		String id = (String) params.get(FieldConstant.ID_HUMP);
-
+
-    @Override
+		QueryWrapper<PartymemberBaseInfoEntity> wrapper = new QueryWrapper<>();
-    public PartymemberBaseInfoDTO get(String id) {
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-        PartymemberBaseInfoEntity entity = baseDao.selectById(id);
+
-        return ConvertUtils.sourceToTarget(entity, PartymemberBaseInfoDTO.class);
+		return wrapper;
-    }
+	}
-
+
-    @Override
+	@Override
-    @Transactional(rollbackFor = Exception.class)
+	public PartymemberBaseInfoDTO get(String id) {
-    public void save(PartymemberBaseInfoDTO dto) {
+		PartymemberBaseInfoEntity entity = baseDao.selectById(id);
-        PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberBaseInfoEntity.class);
+		return ConvertUtils.sourceToTarget(entity, PartymemberBaseInfoDTO.class);
-        insert(entity);
+	}
-    }
+
-
+	@Override
-    @Override
+	@Transactional(rollbackFor = Exception.class)
-    @Transactional(rollbackFor = Exception.class)
+	public void save(PartymemberBaseInfoDTO dto) {
-    public void update(PartymemberBaseInfoDTO dto) {
+		PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberBaseInfoEntity.class);
-        PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberBaseInfoEntity.class);
+		insert(entity);
-        updateById(entity);
+	}
-    }
+
-
+	@Override
-    @Override
+	@Transactional(rollbackFor = Exception.class)
-    @Transactional(rollbackFor = Exception.class)
+	public void update(PartymemberBaseInfoDTO dto) {
-    public void delete(String[] ids) {
+		PartymemberBaseInfoEntity entity = ConvertUtils.sourceToTarget(dto, PartymemberBaseInfoEntity.class);
-        // 逻辑删除（@TableLogic 注解）
+		updateById(entity);
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
-    }
+
+	@Override
+	@Transactional(rollbackFor = Exception.class)
+	public void delete(String[] ids) {
+		// 逻辑删除（@TableLogic 注解）
+		baseDao.deleteBatchIds(Arrays.asList(ids));
+	}
+
+	@Override
+	public PartymemberConfirmAutoDTO getPartyMemberBaseInfo(PartymemberInfoDTO partyMemberInfo) {
+
+		PartymemberConfirmAutoDTO confirmAutoDTO;
+
+		String name = partyMemberInfo.getSurname().concat(partyMemberInfo.getName());
+
+		List<PartymemberBaseInfoEntity> sortList = new ArrayList<>();
+
+		//根据身份证匹配数据
+		List<PartymemberBaseInfoEntity> idCardList = baseDao.selectBaseInfoByIdCard(partyMemberInfo);
+
+		if (null != idCardList && idCardList.size() > 0) {
+			//优先判断身份证和手机号
+			Optional<PartymemberBaseInfoEntity> matchingResult =
+					idCardList.stream().filter(baseInfo -> baseInfo.getMobile().equals(partyMemberInfo.getMobile())).findFirst();
+
+			if (matchingResult.isPresent()) {
+				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+				return confirmAutoDTO;
+			}
+
+			//判断身份证和姓名
+			matchingResult = idCardList.stream().filter(baseInfo -> baseInfo.getName().equals(name)).findFirst();
+
+			if (matchingResult.isPresent()) {
+				confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+				return confirmAutoDTO;
+			}
+
+			//获取匹配度最高的数据
+			sortList.add(idCardList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
+					getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0));
+
+		} else {
+			//根据手机号匹配数据
+			List<PartymemberBaseInfoEntity> mobileList = baseDao.selectBaseInfoByIdCard(partyMemberInfo);
+
+			if (null != mobileList && mobileList.size() > 0) {
+				//判断手机号和姓名
+				Optional<PartymemberBaseInfoEntity> matchingResult =
+						mobileList.stream().filter(baseInfo -> baseInfo.getName().equals(name)).findFirst();
+
+				if (matchingResult.isPresent()) {
+					confirmAutoDTO = getResult(matchingResult.get(), partyMemberInfo);
+					return confirmAutoDTO;
+				}
+
+				//获取匹配度最高的数据
+				sortList.add(mobileList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
+						getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0));
+			} else {
+				//根据姓名匹配数据
+				List<PartymemberBaseInfoEntity> nameList = baseDao.selectBaseInfoByIdCard(partyMemberInfo);
+
+				if (null != nameList && nameList.size() > 0) {
+					//获取匹配度最高的数据
+					sortList.add(nameList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
+							getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0));
+
+					PartymemberBaseInfoEntity similar =
+							nameList.stream().sorted(Comparator.comparing((PartymemberBaseInfoEntity p) ->
+									getSimilarity(p, partyMemberInfo)).reversed()).collect(Collectors.toList()).get(0);
+
+					confirmAutoDTO = getResult(similar, partyMemberInfo);
+					return confirmAutoDTO;
+
+				}
+			}
+		}
+		return null;
+	}
+
+
+	/**
+	 * 生成返回结果
+	 *
+	 * @param baseInfo 基本信息
+	 * @param info 录入信息
+	 * @return PartymemberConfirmAutoDTO
+	 */
+	private PartymemberConfirmAutoDTO getResult(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info) {
+		PartymemberConfirmAutoDTO confirmAutoDTO = new PartymemberConfirmAutoDTO();
+		confirmAutoDTO.setPatryMemberBaseInfoId(baseInfo.getId());
+		confirmAutoDTO.setBaseName(baseInfo.getName());
+		confirmAutoDTO.setInputName(info.getSurname().concat(info.getName()));
+		confirmAutoDTO.setBaseIdCard(baseInfo.getIdCard());
+		confirmAutoDTO.setInputIdCard(info.getIdCard());
+		confirmAutoDTO.setBaseMobile(baseInfo.getMobile());
+		confirmAutoDTO.setInputMobile(info.getIdCard());
+		confirmAutoDTO.setContrastTime(new Date());
+		String result = getSimilarity(baseInfo, info);
+		//身份证比对结果
+		if (EQUAL.equals(result.substring(START, ID_CARD_COUNT))) {
+			confirmAutoDTO.setIdCardResult(PartyMemberConstant.SAME);
+		} else {
+			confirmAutoDTO.setIdCardResult(PartyMemberConstant.DIFF);
+		}
+		//手机号比对结果
+		if (EQUAL.equals(result.substring(ID_CARD_COUNT, MOBILE_COUNT))) {
+			confirmAutoDTO.setMobileResult(PartyMemberConstant.SAME);
+		} else {
+			confirmAutoDTO.setMobileResult(PartyMemberConstant.DIFF);
+		}
+		//姓名比对结果
+		if (EQUAL.equals(result.substring(MOBILE_COUNT, NAME_COUNT))) {
+			confirmAutoDTO.setNameResult(PartyMemberConstant.SAME);
+		} else {
+			confirmAutoDTO.setNameResult(PartyMemberConstant.DIFF);
+		}
+		confirmAutoDTO.setResult(result);
+		return confirmAutoDTO;
+	}
+
+
+	/**
+	 * 相似度判断
+	 *
+	 * @param baseInfo 基本信息
+	 * @param info     录入信息
+	 * @return String
+	 */
+	private String getSimilarity(PartymemberBaseInfoEntity baseInfo, PartymemberInfoDTO info) {
+
+		String result = "";
+
+		JaroWinkler jw = new JaroWinkler();
+		double idCardResult = jw.similarity(baseInfo.getIdCard(), info.getIdCard());
+		double mobileResult = jw.similarity(baseInfo.getMobile(), info.getMobile());
+		double nameResult = jw.similarity(baseInfo.getName(), info.getName());
+		if (idCardResult > PartyMemberConstant.MOST) {
+			result.concat("10");
+		} else if (idCardResult < PartyMemberConstant.SMALL) {
+			result.concat("00");
+		} else {
+			result.concat("01");
+		}
+
+		if (mobileResult > PartyMemberConstant.MOST) {
+			result.concat("10");
+		} else if (mobileResult < PartyMemberConstant.SMALL) {
+			result.concat("00");
+		} else {
+			result.concat("01");
+		}
+
+		if (nameResult > PartyMemberConstant.MOST) {
+			result.concat("10");
+		} else if (nameResult < PartyMemberConstant.SMALL) {
+			result.concat("00");
+		} else {
+			result.concat("01");
+		}
+
+		return result;
+
+	}
 
 }

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

@@ -40,5 +40,5 @@ public interface ResiWarmheartedApplyDao extends BaseDao<ResiWarmheartedApplyEnt
      */
     ResiWarmheartedApplyDTO selectResiWarmheartedApply(ResiWarmheartedFormDTO formDTO);
 
-    void saveResiWarmApply(ResiWarmheartedApplyDTO entity);
+    boolean saveResiWarmApply(ResiWarmheartedApplyDTO entity);
 }

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

@@ -34,6 +34,6 @@ import javax.management.relation.RelationSupport;
 @Mapper
 public interface ResiWarmheartedVisitDao extends BaseDao<ResiWarmheartedVisitEntity> {
 
-    void saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
+    boolean saveResiWarmheartedVisit(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
-    void updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
+    boolean updateResiWarmVisitById(ResiWarmheartedVisitDTO resiWarmheartedVisitDTO);
 }

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

@@ -104,7 +104,7 @@ public interface ResiWarmheartedVisitService extends BaseService<ResiWarmhearted
      * @return void
      * @author sun
      */
-    ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
+    Result<ResiWarmheartedResultDTO> saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO);
 
     /**
      * 居民端-热心居民申请提交-更新行为记录数据

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

@@ -122,7 +122,11 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     @Transactional(rollbackFor = Exception.class)
     public Result<ResiWarmheartedResultDTO> init(ResiWarmheartedFormDTO formDTO) {
         //1:热心居民申请行为记录表新增数据
-        ResiWarmheartedResultDTO resiWarmheartedResultDTO = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
+        Result<ResiWarmheartedResultDTO> result = resiWarmheartedVisitService.saveResiWarmheartedVisit(formDTO);
+        if(!result.success()){
+            log.warn(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
+        ResiWarmheartedResultDTO resiWarmheartedResultDTO = result.getData();
         //2:查询是否已申请热心居民
         ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = resiWarmheartedApplyDao.selectResiWarmheartedApply(formDTO);
         if (null == resiWarmheartedApplyDTO || StringUtils.isEmpty(resiWarmheartedApplyDTO.getId())) {
@@ -135,6 +139,7 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
     }
 
     @Override
+    @Transactional(rollbackFor = Exception.class)
     public Result submit(ResiWarmheartedSubmitFormDTO formDTO) {
         //1:将申请记录存入热心居民申请表中
         saveResiWarmApply(formDTO);
@@ -148,7 +153,6 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
      * @param formDTO
      * @return
      */
-    @Transactional(rollbackFor = Exception.class)
     public void saveResiWarmApply(ResiWarmheartedSubmitFormDTO formDTO) {
         Date date = new Date();
         ResiWarmheartedApplyDTO resiWarmheartedApplyDTO = new ResiWarmheartedApplyDTO();
@@ -166,7 +170,9 @@ public class ResiWarmheartedApplyServiceImpl extends BaseServiceImpl<ResiWarmhea
         resiWarmheartedApplyDTO.setCreatedTime(date);
         resiWarmheartedApplyDTO.setUpdatedBy(formDTO.getUserId());
         resiWarmheartedApplyDTO.setUpdatedTime(date);
-        resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO);
+        if(!resiWarmheartedApplyDao.saveResiWarmApply(resiWarmheartedApplyDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
     }
 
 }

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

@@ -36,6 +36,8 @@ 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.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,6 +56,7 @@ import java.util.Map;
 @Service
 public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmheartedVisitDao, ResiWarmheartedVisitEntity> implements ResiWarmheartedVisitService {
 
+    private static final Logger log = LoggerFactory.getLogger(ResiWarmheartedVisitServiceImpl.class);
     @Autowired
     private ResiWarmheartedVisitRedis resiWarmheartedVisitRedis;
     @Autowired
@@ -112,7 +115,7 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
     }
 
     @Override
-    public ResiWarmheartedResultDTO saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) {
+    public Result<ResiWarmheartedResultDTO> saveResiWarmheartedVisit(ResiWarmheartedFormDTO formDTO) {
         Date date = new Date();
         ResiWarmheartedVisitDTO resiWarmheartedVisitDTO = new ResiWarmheartedVisitDTO();
         resiWarmheartedVisitDTO.setCustomerId(formDTO.getCustomerId());
@@ -130,28 +133,24 @@ public class ResiWarmheartedVisitServiceImpl extends BaseServiceImpl<ResiWarmhea
         resiWarmheartedVisitDTO.setCreatedTime(date);
         resiWarmheartedVisitDTO.setUpdatedBy(formDTO.getUserId());
         resiWarmheartedVisitDTO.setUpdatedTime(date);
-        resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO);
+        if(!resiWarmheartedVisitDao.saveResiWarmheartedVisit(resiWarmheartedVisitDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
         ResiWarmheartedResultDTO resiWarmheartedResultDTO = new ResiWarmheartedResultDTO();
         resiWarmheartedResultDTO.setResiWarmVisitId(resiWarmheartedVisitDTO.getId());
-        return resiWarmheartedResultDTO;
+        return new Result<ResiWarmheartedResultDTO>().ok(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);
+        if(!resiWarmheartedVisitDao.updateResiWarmVisitById(resiWarmheartedVisitDTO)){
+            log.error(ResiWarmheartedVisitConstant.OPERATION_EXCEPTION);
+        }
     }
 
 }

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberBaseInfoDao.xml

@@ -18,6 +18,41 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <!--  根据身份证，手机号，姓名匹配数据  -->
+    <select id="selectBaseInfoByIdCard"
+            resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity"
+            parameterType="com.epmet.resi.partymember.dto.partymember.PartymemberInfoDTO">
+        SELECT
+            *
+        FROM
+            partymember_base_info
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND ID_CARD = #{idCard}
+          AND DEL_FLAG = 0
+    </select>
+    <select id="selectBaseInfoByMobile"
+            resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
+        SELECT
+            *
+        FROM
+            partymember_base_info
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND MOBILE = #{mobile}
+          AND DEL_FLAG = 0
+    </select>
+    <select id="selectBaseInfoByName"
+            resultType="com.epmet.modules.partymember.entity.PartymemberBaseInfoEntity">
+        SELECT
+            *
+        FROM
+            partymember_base_info
+        WHERE
+            CUSTOMER_ID = #{customerId}
+          AND NAME = CONCAT(#{surname}, #{name})
+          AND DEL_FLAG = 0
+    </select>
 
 
 </mapper>

epmet-module/resi-partymember/resi-partymember-server/src/main/resources/mapper/partymember/PartymemberInfoDao.xml

@@ -17,6 +17,7 @@
         <result property="street" column="STREET"/>
         <result property="estate" column="ESTATE"/>
         <result property="building" column="BUILDING"/>
+        <result property="organizationType" column="ORGANIZATION_TYPE"/>
         <result property="extraOrganization" column="EXTRA_ORGANIZATION"/>
         <result property="extraCertifierName" column="EXTRA_CERTIFIER_NAME"/>
         <result property="extraCertifierMobile" column="EXTRA_CERTIFIER_MOBILE"/>
@@ -32,7 +33,7 @@
         SELECT
             *
         FROM
-            partymember_info
+            epmet_resi_partymember.partymember_info
         WHERE
             CUSTOMER_ID = #{customerId}
           AND GRID_ID = #{gridId}
@@ -40,14 +41,15 @@
           AND DEL_FLAG = 0
     </select>
     <select id="selectPartyMemberInfoByMobile"
-            parameterType="com.epmet.resi.partymember.dto.partymember.form.VerificationCodeFromDTO"
+            parameterType="com.epmet.modules.partymember.entity.PartymemberInfoEntity"
             resultType="com.epmet.modules.partymember.entity.PartymemberInfoEntity">
         SELECT
             *
         FROM
-            partymember_info
+            epmet_resi_partymember.partymember_info
         WHERE
-            MOBILE = #{mobile}
+            CUSTOMER_ID = #{customerId}
+          AND MOBILE = #{mobile}
           AND DEL_FLAG = 0
     </select>
 

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/UserRoleDTO.java

@@ -17,9 +17,10 @@
 
 package com.epmet.dto;
 
+import lombok.Data;
+
 import java.io.Serializable;
 import java.util.Date;
-import lombok.Data;
 
 
 /**
@@ -53,6 +54,11 @@ public class UserRoleDTO implements Serializable {
      */
 	private String roleId;
 
+	/**
+	 * 角色Key值
+	 */
+	private String roleKey;
+
     /**
      * 删除标识：0.未删除 1.已删除
      */

epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/VerificationCodeFormDTO.java

@@ -0,0 +1,33 @@
+package com.epmet.dto.form;
+
+import lombok.Data;
+
+import javax.validation.constraints.NotBlank;
+import java.io.Serializable;
+
+/**
+ * @Description 居民注册根据手机号获取获取验证码
+ * @Author sun
+ */
+
+@Data
+public class VerificationCodeFormDTO implements Serializable {
+
+    private static final long serialVersionUID = 1L;
+
+    /**
+     * 手机号(注册手机号)
+     */
+    private String mobile;
+
+    /**
+     * 居民注册行为记录表Id resi_visit.id
+     */
+    private String resiVisitId;
+
+    /**
+     * 用户ID
+     */
+    private String userId;
+
+}

epmet-user/epmet-user-server/src/main/java/com/epmet/constant/UserConstant.java

@@ -8,29 +8,43 @@ package com.epmet.constant;
  */
 public interface UserConstant {
 
-    /**
+	/**
-     * 政府端
+	 * 政府端
-     * */
+	 */
-    String APP_GOV = "gov";
+	String APP_GOV = "gov";
-
-    /**
-     * 居民端
-     * */
-    String APP_RESI = "resi";
-
-    /**
-     * 运营端
-     * */
-    String APP_OPER = "oper";
-
-    /**
-     * PC端
-     * */
-    String CLIENT_WEB = "web";
-
-    /**
-     * 微信端
-     * */
-    String CLIENT_WX = "wxmp";
 
+	/**
+	 * 居民端
+	 */
+	String APP_RESI = "resi";
+
+	/**
+	 * 运营端
+	 */
+	String APP_OPER = "oper";
+
+	/**
+	 * PC端
+	 */
+	String CLIENT_WEB = "web";
+
+	/**
+	 * 微信端
+	 */
+	String CLIENT_WX = "wxmp";
+
+	/**
+	 * 居民角色
+	 */
+	String ROLE_RESI = "registered_resi";
+
+	/**
+	 * 热心居民角色
+	 */
+	String ROLE_WARMHEARTED = "warmhearted";
+
+	/**
+	 * 党员角色
+	 */
+	String ROLE_PARTYMEMBER = "partymember";
 }

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

@@ -39,4 +39,19 @@ public interface UserResiRegisterConstant {
      * 最后一次操作行为-提交失败
      */
     String MOBILECODE_EXCEPTION="手机验证码输入错误！";
+
+    /**
+     * 参数错误
+     */
+    String PARAMETER_ERROR="参数错误！";
+
+    /**
+     * 数据更新异常
+     */
+    String UPDATE_EXCEPTION="用户居民注册访问记录表更新数据失败！";
+
+    /**
+     * 手机号已存在
+     */
+    String MOBILE_EXIST="该手机号已注册居民！";
 }

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

@@ -23,10 +23,11 @@ import com.epmet.commons.tools.utils.Result;
 import com.epmet.commons.tools.validator.AssertUtils;
 import com.epmet.commons.tools.validator.ValidatorUtils;
 import com.epmet.commons.tools.validator.group.AddGroup;
-import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.commons.tools.validator.group.DefaultGroup;
+import com.epmet.commons.tools.validator.group.UpdateGroup;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.excel.UserResiInfoExcel;
 import com.epmet.service.UserResiInfoService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -114,4 +115,25 @@ public class UserResiInfoController {
     public Result submit(@RequestBody UserResiInfoDTO userResiInfoDTO) {
         return userResiInfoService.submit(userResiInfoDTO);
     }
+
+    /**
+     * @param formDTO
+     * @Author sun
+     * @Description 居民端-居民注册根据手机号获取验证码
+     **/
+    @PostMapping("getverificationcode")
+    public Result getVerificationCode(@RequestBody VerificationCodeFormDTO formDTO) {
+        return userResiInfoService.getVerificationCode(formDTO);
+    }
+
+    /**
+     * 党员认证时，如果没有注册居民，则注册居民信息
+     * @param userResiInfoDTO
+     * @author zhaoqifeng
+     **/
+    @PostMapping("saveResiInfo")
+    public Result saveResiInfo (@RequestBody UserResiInfoDTO userResiInfoDTO) {
+        return userResiInfoService.saveResiInfo(userResiInfoDTO);
+    }
+
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserRoleController.java

@@ -39,7 +39,7 @@ import java.util.Map;
 
 
 /**
- * 用户角色关系表 
+ * 用户角色关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -47,65 +47,77 @@ import java.util.Map;
 @RestController
 @RequestMapping("userrole")
 public class UserRoleController {
-    
+
-    @Autowired
+	@Autowired
-    private UserRoleService userRoleService;
+	private UserRoleService userRoleService;
-
+
-    @GetMapping("page")
+	@GetMapping("page")
-    public Result<PageData<UserRoleDTO>> page(@RequestParam Map<String, Object> params){
+	public Result<PageData<UserRoleDTO>> page(@RequestParam Map<String, Object> params) {
-        PageData<UserRoleDTO> page = userRoleService.page(params);
+		PageData<UserRoleDTO> page = userRoleService.page(params);
-        return new Result<PageData<UserRoleDTO>>().ok(page);
+		return new Result<PageData<UserRoleDTO>>().ok(page);
-    }
+	}
-
+
-    @GetMapping("{id}")
+	@GetMapping("{id}")
-    public Result<UserRoleDTO> get(@PathVariable("id") String id){
+	public Result<UserRoleDTO> get(@PathVariable("id") String id) {
-        UserRoleDTO data = userRoleService.get(id);
+		UserRoleDTO data = userRoleService.get(id);
-        return new Result<UserRoleDTO>().ok(data);
+		return new Result<UserRoleDTO>().ok(data);
-    }
+	}
-
+
-    @PostMapping
+	@PostMapping
-    public Result save(@RequestBody UserRoleDTO dto){
+	public Result save(@RequestBody UserRoleDTO dto) {
-        //效验数据
+		//效验数据
-        ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
+		ValidatorUtils.validateEntity(dto, AddGroup.class, DefaultGroup.class);
-        userRoleService.save(dto);
+		userRoleService.save(dto);
-        return new Result();
+		return new Result();
-    }
+	}
-
+
-    @PutMapping
+	@PutMapping
-    public Result update(@RequestBody UserRoleDTO dto){
+	public Result update(@RequestBody UserRoleDTO dto) {
-        //效验数据
+		//效验数据
-        ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
+		ValidatorUtils.validateEntity(dto, UpdateGroup.class, DefaultGroup.class);
-        userRoleService.update(dto);
+		userRoleService.update(dto);
-        return new Result();
+		return new Result();
-    }
+	}
-
+
-    @DeleteMapping
+	@DeleteMapping
-    public Result delete(@RequestBody String[] ids){
+	public Result delete(@RequestBody String[] ids) {
-        //效验数据
+		//效验数据
-        AssertUtils.isArrayEmpty(ids, "id");
+		AssertUtils.isArrayEmpty(ids, "id");
-        userRoleService.delete(ids);
+		userRoleService.delete(ids);
-        return new Result();
+		return new Result();
-    }
+	}
-
+
-    @GetMapping("export")
+	@GetMapping("export")
-    public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
+	public void export(@RequestParam Map<String, Object> params, HttpServletResponse response) throws Exception {
-        List<UserRoleDTO> list = userRoleService.list(params);
+		List<UserRoleDTO> list = userRoleService.list(params);
-        ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class);
+		ExcelUtils.exportExcelToTarget(response, null, list, UserRoleExcel.class);
-    }
+	}
-
+
-    /**
+	/**
-     * @Description 根据用户Id、来源app、客户Id查询用户角色
+	 * @return UserRoleResultDTO
-     * @Param userRoleFormDTO
+	 * @Description 根据用户Id、来源app、客户Id查询用户角色
-     * @return UserRoleResultDTO
+	 * @Param userRoleFormDTO
-     * @Author wangc
+	 * @Author wangc
-     * @Date 2020.03.30 15:35
+	 * @Date 2020.03.30 15:35
-     **/
+	 **/
-    @PostMapping("getuserroleinfo")
+	@PostMapping("getuserroleinfo")
-    public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO){
+	public Result<List<UserRoleResultDTO>> getUserRoleInfo(@RequestBody UserRoleFormDTO userRoleFormDTO) {
-
+
-        ValidatorUtils.validateEntity(userRoleFormDTO);
+		ValidatorUtils.validateEntity(userRoleFormDTO);
-
+
-        return userRoleService.getUserRoleInfo(userRoleFormDTO);
+		return userRoleService.getUserRoleInfo(userRoleFormDTO);
-    }
+	}
+
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	@PostMapping("saveUserRole")
+	public Result saveUserRole(@RequestBody UserRoleDTO userRoleDTO) {
+		return userRoleService.saveUserRole(userRoleDTO);
+	}
+
 
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/dao/RoleDao.java

@@ -22,12 +22,20 @@ import com.epmet.entity.RoleEntity;
 import org.apache.ibatis.annotations.Mapper;
 
 /**
- * 角色表 
+ * 角色表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
  */
 @Mapper
 public interface RoleDao extends BaseDao<RoleEntity> {
-	
+
+	/**
+	 * 根据key值获取权限信息
+	 *
+	 * @param param 参数
+	 * @return RoleEntity
+	 */
+	RoleEntity selectRoleByKey(RoleEntity param);
+
 }

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

@@ -23,6 +23,8 @@ import com.epmet.dto.form.UserResiInfoFormDTO;
 import com.epmet.entity.UserResiInfoEntity;
 import org.apache.ibatis.annotations.Mapper;
 
+import java.util.List;
+
 /**
  * 用户居民端注册信息表  用户在居民端完善的个人信息
  *
@@ -46,4 +48,11 @@ public interface UserResiInfoDao extends BaseDao<UserResiInfoEntity> {
 	 * @Description 用户居民端注册信息表新增数据
 	 **/
 	void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO);
+
+	/**
+	 * @Author sun
+	 * @Description 根据手机号查询居民注册信息(user_resi_info)表数据
+	 **/
+	List<UserResiInfoDTO> selectResiInfoByMobile(String regMobile);
+
 }

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

@@ -37,5 +37,5 @@ public interface UserResiRegisterVisitDao extends BaseDao<UserResiRegisterVisitE
 
     List<UserResiRegisterVisitDTO> selectUserResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 
-    void updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
+    boolean updateResiRegisterVisit(UserResiRegisterVisitDTO userResiRegisterVisitDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/RoleService.java

@@ -92,4 +92,11 @@ public interface RoleService extends BaseService<RoleEntity> {
      * @date 2020-03-30
      */
     void delete(String[] ids);
+
+    /**
+     * 根据key获取role信息
+     * @param role
+     * @return RoleDTO
+     */
+    RoleDTO getRoleByKey(RoleDTO role);
 }

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

@@ -22,6 +22,7 @@ import com.epmet.commons.tools.page.PageData;
 import com.epmet.commons.tools.utils.Result;
 import com.epmet.dto.UserResiInfoDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.VerificationCodeFormDTO;
 import com.epmet.entity.UserResiInfoEntity;
 
 import java.util.List;
@@ -35,81 +36,98 @@ import java.util.Map;
  */
 public interface UserResiInfoService extends BaseService<UserResiInfoEntity> {
 
-    /**
+	/**
-     * 默认分页
+	 * 默认分页
-     *
+	 *
-     * @param params
+	 * @param params
-     * @return PageData<UserResiInfoDTO>
+	 * @return PageData<UserResiInfoDTO>
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    PageData<UserResiInfoDTO> page(Map<String, Object> params);
+	PageData<UserResiInfoDTO> page(Map<String, Object> params);
 
-    /**
+	/**
-     * 默认查询
+	 * 默认查询
-     *
+	 *
-     * @param params
+	 * @param params
-     * @return java.util.List<UserResiInfoDTO>
+	 * @return java.util.List<UserResiInfoDTO>
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    List<UserResiInfoDTO> list(Map<String, Object> params);
+	List<UserResiInfoDTO> list(Map<String, Object> params);
 
-    /**
+	/**
-     * 单条查询
+	 * 单条查询
-     *
+	 *
-     * @param id
+	 * @param id
-     * @return UserResiInfoDTO
+	 * @return UserResiInfoDTO
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    UserResiInfoDTO get(String id);
+	UserResiInfoDTO get(String id);
 
-    /**
+	/**
-     * 默认保存
+	 * 默认保存
-     *
+	 *
-     * @param dto
+	 * @param dto
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void save(UserResiInfoDTO dto);
+	void save(UserResiInfoDTO dto);
 
-    /**
+	/**
-     * 默认更新
+	 * 默认更新
-     *
+	 *
-     * @param dto
+	 * @param dto
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void update(UserResiInfoDTO dto);
+	void update(UserResiInfoDTO dto);
 
-    /**
+	/**
-     * 批量删除
+	 * 批量删除
-     *
+	 *
-     * @param ids
+	 * @param ids
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void delete(String[] ids);
+	void delete(String[] ids);
 
-    /**
+	/**
-     * @param userResiInfoFormDTO
+	 * @param userResiInfoFormDTO
-     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
-     * @Author yinzuomei
+	 * @Author yinzuomei
-     * @Description 查询用户注册信息
+	 * @Description 查询用户注册信息
-     * @Date 2020/3/30 11:07
+	 * @Date 2020/3/30 11:07
-     **/
+	 **/
-    Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
+	Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO);
 
-    /**
+	/**
-     * 居民端-居民注册信息提交
+	 * 居民端-居民注册信息提交
-     *
+	 *
-     * @param userResiInfoDTO
+	 * @param userResiInfoDTO
-     * @return void
+	 * @return void
-     * @author sun
+	 * @author sun
-     */
+	 */
-    Result submit(UserResiInfoDTO userResiInfoDTO);
+	Result submit(UserResiInfoDTO userResiInfoDTO);
+
+	/**
+	 * 居民端-居民注册根据手机号获取验证码
+	 *
+	 * @param formDTO
+	 * @author sun
+	 */
+	Result getVerificationCode(VerificationCodeFormDTO formDTO);
+
+	/**
+	 * 注册居民信息
+	 *
+	 * @param userResiInfoDTO 参数
+	 * @return Result
+	 * @author zhaoqifeng
+	 */
+	Result saveResiInfo(UserResiInfoDTO userResiInfoDTO);
 }

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

@@ -25,6 +25,7 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 
@@ -112,8 +113,15 @@ public interface UserResiRegisterVisitService extends BaseService<UserResiRegist
      * 居民端-居民注册信息提交-更新访问行为记录表数据
      *
      * @param bl userResiInfoDTO
-     * @return void
      * @author sun
      */
-    Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO);
+    void updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO);
+
+    /**
+     * 居民端-居民注册根据手机号获取验证码-更新访问记录表数据
+     *
+     * @param formDTO
+     * @author sun
+     */
+    void updateResiVisitOperate(VerificationCodeFormDTO formDTO);
 }

epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserRoleService.java

@@ -29,80 +29,88 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 用户角色关系表 
+ * 用户角色关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
  */
 public interface UserRoleService extends BaseService<UserRoleEntity> {
 
-    /**
+	/**
-     * 默认分页
+	 * 默认分页
-     *
+	 *
-     * @param params
+	 * @param params
-     * @return PageData<UserRoleDTO>
+	 * @return PageData<UserRoleDTO>
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    PageData<UserRoleDTO> page(Map<String, Object> params);
+	PageData<UserRoleDTO> page(Map<String, Object> params);
 
-    /**
+	/**
-     * 默认查询
+	 * 默认查询
-     *
+	 *
-     * @param params
+	 * @param params
-     * @return java.util.List<UserRoleDTO>
+	 * @return java.util.List<UserRoleDTO>
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    List<UserRoleDTO> list(Map<String, Object> params);
+	List<UserRoleDTO> list(Map<String, Object> params);
 
-    /**
+	/**
-     * 单条查询
+	 * 单条查询
-     *
+	 *
-     * @param id
+	 * @param id
-     * @return UserRoleDTO
+	 * @return UserRoleDTO
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    UserRoleDTO get(String id);
+	UserRoleDTO get(String id);
 
-    /**
+	/**
-     * 默认保存
+	 * 默认保存
-     *
+	 *
-     * @param dto
+	 * @param dto
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void save(UserRoleDTO dto);
+	void save(UserRoleDTO dto);
 
-    /**
+	/**
-     * 默认更新
+	 * 默认更新
-     *
+	 *
-     * @param dto
+	 * @param dto
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void update(UserRoleDTO dto);
+	void update(UserRoleDTO dto);
 
-    /**
+	/**
-     * 批量删除
+	 * 批量删除
-     *
+	 *
-     * @param ids
+	 * @param ids
-     * @return void
+	 * @return void
-     * @author generator
+	 * @author generator
-     * @date 2020-03-30
+	 * @date 2020-03-30
-     */
+	 */
-    void delete(String[] ids);
+	void delete(String[] ids);
 
-    /**
+	/**
-     * @Description 根据用户Id、来源app、客户Id查询用户角色
+	 * @return UserRoleResultDTO
-     * @Param userRoleFormDTO
+	 * @Description 根据用户Id、来源app、客户Id查询用户角色
-     * @return UserRoleResultDTO
+	 * @Param userRoleFormDTO
-     * @Author wangc
+	 * @Author wangc
-     * @Date 2020.03.30 15:35
+	 * @Date 2020.03.30 15:35
-     **/
+	 **/
-    Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+	Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO);
+
+	/**
+	 * 添加用户角色关系
+	 *
+	 * @param userRoleDTO 参数
+	 * @return Result
+	 */
+	Result saveUserRole(UserRoleDTO userRoleDTO);
 
 }

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

@@ -101,4 +101,10 @@ public class RoleServiceImpl extends BaseServiceImpl<RoleDao, RoleEntity> implem
         baseDao.deleteBatchIds(Arrays.asList(ids));
     }
 
+    @Override
+    public RoleDTO getRoleByKey(RoleDTO role) {
+        RoleEntity entity = baseDao.selectRoleByKey(ConvertUtils.sourceToTarget(role, RoleEntity.class));
+        return ConvertUtils.sourceToTarget(entity, RoleDTO.class);
+    }
+
 }

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

@@ -21,21 +21,27 @@ 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.constant.FieldConstant;
 import com.epmet.commons.tools.utils.Result;
+import com.epmet.constant.UserConstant;
 import com.epmet.constant.UserResiRegisterConstant;
 import com.epmet.dao.UserResiInfoDao;
 import com.epmet.dto.UserResiInfoDTO;
+import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserResiInfoFormDTO;
+import com.epmet.dto.form.VerificationCodeFormDTO;
 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 com.epmet.service.UserRoleService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -54,120 +60,184 @@ import java.util.Map;
 @Service
 public class UserResiInfoServiceImpl extends BaseServiceImpl<UserResiInfoDao, UserResiInfoEntity> implements UserResiInfoService {
 
-    @Autowired
+	private static final Logger log = LoggerFactory.getLogger(UserResiInfoServiceImpl.class);
-    private UserResiInfoRedis userResiInfoRedis;
+	@Autowired
-    @Autowired
+	private UserResiInfoRedis userResiInfoRedis;
-    private UserResiRegisterVisitService userResiRegisterVisitService;
+	@Autowired
-    @Autowired
+	private UserResiRegisterVisitService userResiRegisterVisitService;
-    private UserResiInfoDao userResiInfoDao;
+	@Autowired
-    @Autowired
+	private UserResiInfoDao userResiInfoDao;
-    private RegisterRelationService registerRelationService;
+	@Autowired
-
+	private RegisterRelationService registerRelationService;
-    @Override
+	@Autowired
-    public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
+	private UserRoleService userRoleService;
-        IPage<UserResiInfoEntity> page = baseDao.selectPage(
+
-                getPage(params, FieldConstant.CREATED_TIME, false),
+	@Override
-                getWrapper(params)
+	public PageData<UserResiInfoDTO> page(Map<String, Object> params) {
-        );
+		IPage<UserResiInfoEntity> page = baseDao.selectPage(
-        return getPageData(page, UserResiInfoDTO.class);
+				getPage(params, FieldConstant.CREATED_TIME, false),
-    }
+				getWrapper(params)
-
+		);
-    @Override
+		return getPageData(page, UserResiInfoDTO.class);
-    public List<UserResiInfoDTO> list(Map<String, Object> params) {
+	}
-        List<UserResiInfoEntity> entityList = baseDao.selectList(getWrapper(params));
+
-
+	@Override
-        return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class);
+	public List<UserResiInfoDTO> list(Map<String, Object> params) {
-    }
+		List<UserResiInfoEntity> entityList = baseDao.selectList(getWrapper(params));
-
+
-    private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) {
+		return ConvertUtils.sourceToTarget(entityList, UserResiInfoDTO.class);
-        String id = (String) params.get(FieldConstant.ID_HUMP);
+	}
-
+
-        QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>();
+	private QueryWrapper<UserResiInfoEntity> getWrapper(Map<String, Object> params) {
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+		String id = (String) params.get(FieldConstant.ID_HUMP);
-
+
-        return wrapper;
+		QueryWrapper<UserResiInfoEntity> wrapper = new QueryWrapper<>();
-    }
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-
+
-    @Override
+		return wrapper;
-    public UserResiInfoDTO get(String id) {
+	}
-        UserResiInfoEntity entity = baseDao.selectById(id);
+
-        return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class);
+	@Override
-    }
+	public UserResiInfoDTO get(String id) {
-
+		UserResiInfoEntity entity = baseDao.selectById(id);
-    @Override
+		return ConvertUtils.sourceToTarget(entity, UserResiInfoDTO.class);
-    @Transactional(rollbackFor = Exception.class)
+	}
-    public void save(UserResiInfoDTO dto) {
+
-        UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class);
+	@Override
-        insert(entity);
+	@Transactional(rollbackFor = Exception.class)
-    }
+	public void save(UserResiInfoDTO dto) {
-
+		UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class);
-    @Override
+		insert(entity);
-    @Transactional(rollbackFor = Exception.class)
+	}
-    public void update(UserResiInfoDTO dto) {
+
-        UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class);
+	@Override
-        updateById(entity);
+	@Transactional(rollbackFor = Exception.class)
-    }
+	public void update(UserResiInfoDTO dto) {
-
+		UserResiInfoEntity entity = ConvertUtils.sourceToTarget(dto, UserResiInfoEntity.class);
-    @Override
+		updateById(entity);
-    @Transactional(rollbackFor = Exception.class)
+	}
-    public void delete(String[] ids) {
+
-        // 逻辑删除（@TableLogic 注解）
+	@Override
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+	@Transactional(rollbackFor = Exception.class)
-    }
+	public void delete(String[] ids) {
-
+		// 逻辑删除（@TableLogic 注解）
-    /**
+		baseDao.deleteBatchIds(Arrays.asList(ids));
-     * @param userResiInfoFormDTO
+	}
-     * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
+
-     * @Author yinzuomei
+	/**
-     * @Description 查询用户注册信息
+	 * @param userResiInfoFormDTO
-     * @Date 2020/3/30 11:07
+	 * @return com.epmet.commons.tools.utils.Result<com.epmet.dto.UserResiInfoDTO>
-     **/
+	 * @Author yinzuomei
-    @Override
+	 * @Description 查询用户注册信息
-    public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
+	 * @Date 2020/3/30 11:07
-        UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
+	 **/
-        if (null != userResiInfoDTO) {
+	@Override
-            String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName();
+	public Result<UserResiInfoDTO> getUserResiInfoDTO(UserResiInfoFormDTO userResiInfoFormDTO) {
-            userResiInfoDTO.setShowName(showName);
+		UserResiInfoDTO userResiInfoDTO = baseDao.selectUserResiInfoDTO(userResiInfoFormDTO);
-        }
+		if (null != userResiInfoDTO) {
-        return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
+			String showName = userResiInfoDTO.getStreet() + "-" + userResiInfoDTO.getSurname() + userResiInfoDTO.getName();
-    }
+			userResiInfoDTO.setShowName(showName);
-
+		}
-    @Override
+		return new Result<UserResiInfoDTO>().ok(userResiInfoDTO);
-    public Result submit(UserResiInfoDTO userResiInfoDTO) {
+	}
-        Result result = new Result();
+
-        //1:手机验证码数据校验//TODO
+	@Override
-
+	public Result submit(UserResiInfoDTO userResiInfoDTO) {
-        //2:验证码校验失败则更新行为记录表数据 返回前台结果
+		Result result = new Result();
-        if (false) {
+		//1:手机验证码数据校验//TODO
-            userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
+
-            result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
+		//2:验证码校验失败则更新行为记录表数据 返回前台结果
-            return result;
+		if (false) {
-        }
+			userResiRegisterVisitService.updateResiRegisterVisit(false, userResiInfoDTO);
-        //3:校验成功 数据存入居民注册表 更新行为记录表数据
+			result.error(UserResiRegisterConstant.PARAMETER_ERROR);
-        saveUserResiInfo(userResiInfoDTO);
+			result.setMsg(UserResiRegisterConstant.MOBILECODE_EXCEPTION);
-        result = userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
+			return result;
-        //4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+		}
-        result = registerRelationService.saveRegisterRelation(userResiInfoDTO);
+		//3:校验成功 数据存入居民注册表 更新行为记录表数据
-        return result;
+		saveUserResiInfo(userResiInfoDTO);
-    }
+		userResiRegisterVisitService.updateResiRegisterVisit(true, userResiInfoDTO);
-
+		//4:居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
-    /**
+		registerRelationService.saveRegisterRelation(userResiInfoDTO);
-     * 居民注册信息表新增数据
+		return result;
-     *
+	}
-     * @param userResiInfoDTO
+
-     * @Author sun
+	/**
-     */
+	 * 居民注册信息表新增数据
-    @Transactional(rollbackFor = Exception.class)
+	 *
-    public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
+	 * @param userResiInfoDTO
-        Date date = new Date();
+	 * @Author sun
-        userResiInfoDTO.setId(IdWorker.get32UUID());
+	 */
-        userResiInfoDTO.setDelFlag(NumConstant.ZERO);
+	@Transactional(rollbackFor = Exception.class)
-        userResiInfoDTO.setRevision(NumConstant.ZERO);
+	public void saveUserResiInfo(UserResiInfoDTO userResiInfoDTO) {
-        userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
+		Date date = new Date();
-        userResiInfoDTO.setCreatedTime(date);
+		userResiInfoDTO.setId(IdWorker.get32UUID());
-        userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+		userResiInfoDTO.setDelFlag(NumConstant.ZERO);
-        userResiInfoDTO.setUpdatedTime(date);
+		userResiInfoDTO.setRevision(NumConstant.ZERO);
-        userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+		userResiInfoDTO.setCreatedBy(userResiInfoDTO.getUserId());
-    }
+		userResiInfoDTO.setCreatedTime(date);
+		userResiInfoDTO.setUpdatedBy(userResiInfoDTO.getUserId());
+		userResiInfoDTO.setUpdatedTime(date);
+		userResiInfoDao.saveUserResiInfo(userResiInfoDTO);
+	}
+
+	/**
+	 * @param verificationCodeFormDTO
+	 * @Author sun
+	 * @Description 居民端-居民注册根据手机号获取验证码
+	 **/
+	@Override
+	public Result getVerificationCode(VerificationCodeFormDTO verificationCodeFormDTO) {
+		Result result = new Result();
+		//1:更新居民注册访问记录表数据
+		userResiRegisterVisitService.updateResiVisitOperate(verificationCodeFormDTO);
+		//2:判断手机号是否可用
+		if (!getResiInfoByMobile(verificationCodeFormDTO.getMobile())) {
+			result.error(UserResiRegisterConstant.PARAMETER_ERROR);
+			result.setMsg(UserResiRegisterConstant.MOBILE_EXIST);
+			return result;
+		}
+		//3:调用短信服务 生成验证码发送短信 TODO
+
+		//4:将验证码存入redis TODO
+
+		return result;
+	}
+
+	@Override
+	public Result saveResiInfo(UserResiInfoDTO userResiInfoDTO) {
+		Result result = new Result();
+
+		//判断手机号是否可用
+		if (getResiInfoByMobile(userResiInfoDTO.getRegMobile())) {
+			//数据存入居民注册表
+			saveUserResiInfo(userResiInfoDTO);
+			//居民注册关系表新增数据 首次注册数加一 注册数加一 参与数加一
+			registerRelationService.saveRegisterRelation(userResiInfoDTO);
+			//将用户于居民角色关联
+			UserRoleDTO userRole = new UserRoleDTO();
+			userRole.setUserId(userResiInfoDTO.getUserId());
+			userRole.setRoleKey(UserConstant.ROLE_RESI);
+			userRoleService.saveUserRole(userRole);
+		}
+
+		return result;
+	}
+
+	/**
+	 * 判断手机号是否可用-根据手机号查询居民注册信息(user_resi_info)表数据
+	 *
+	 * @param mobile
+	 * @return
+	 * @Author sun
+	 */
+	private Boolean getResiInfoByMobile(String mobile) {
+		Boolean bl = true;
+
+		List<UserResiInfoDTO> list = userResiInfoDao.selectResiInfoByMobile(mobile);
+		if (list.size() > 0) {
+			bl = false;
+		}
+		return bl;
+	}
 
 }

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

@@ -31,12 +31,14 @@ 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.form.VerificationCodeFormDTO;
 import com.epmet.dto.result.ResiRegisterResultDTO;
 import com.epmet.entity.UserResiRegisterVisitEntity;
 import com.epmet.redis.UserResiRegisterVisitRedis;
 import com.epmet.service.UserResiRegisterVisitService;
 import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -55,6 +57,7 @@ import java.util.Map;
 @Service
 public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRegisterVisitDao, UserResiRegisterVisitEntity> implements UserResiRegisterVisitService {
 
+    private static final Logger log = LoggerFactory.getLogger(UserResiRegisterVisitServiceImpl.class);
     @Autowired
     private UserResiRegisterVisitRedis userResiRegisterVisitRedis;
     @Autowired
@@ -140,7 +143,7 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
 
     @Override
     @Transactional(rollbackFor = Exception.class)
-    public Result updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) {
+    public void updateResiRegisterVisit(boolean bl, UserResiInfoDTO userResiInfoDTO) {
         UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
         if (bl) {
             //最后一次操作行为-提交成功
@@ -152,8 +155,22 @@ public class UserResiRegisterVisitServiceImpl extends BaseServiceImpl<UserResiRe
         userResiRegisterVisitDTO.setId(userResiInfoDTO.getResiVisitId());
         userResiRegisterVisitDTO.setUpdatedBy(userResiInfoDTO.getUserId());
         userResiRegisterVisitDTO.setUpdatedTime(new Date());
-        userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO);
+        if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
-        return new Result();
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
+        }
+    }
+
+    @Override
+    @Transactional(rollbackFor = Exception.class)
+    public void updateResiVisitOperate(VerificationCodeFormDTO verificationCodeFormDTO) {
+        UserResiRegisterVisitDTO userResiRegisterVisitDTO = new UserResiRegisterVisitDTO();
+        userResiRegisterVisitDTO.setLastOperateVisit(UserResiRegisterConstant.SMS_CODE);
+        userResiRegisterVisitDTO.setId(verificationCodeFormDTO.getResiVisitId());
+        userResiRegisterVisitDTO.setUpdatedBy(verificationCodeFormDTO.getUserId());
+        userResiRegisterVisitDTO.setUpdatedTime(new Date());
+        if(!userResiRegisterVisitDao.updateResiRegisterVisit(userResiRegisterVisitDTO)){
+            log.warn(UserResiRegisterConstant.UPDATE_EXCEPTION);
+        }
     }
 
 }

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

@@ -24,12 +24,15 @@ 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.UserConstant;
 import com.epmet.dao.UserRoleDao;
+import com.epmet.dto.RoleDTO;
 import com.epmet.dto.UserRoleDTO;
 import com.epmet.dto.form.UserRoleFormDTO;
 import com.epmet.dto.result.UserRoleResultDTO;
 import com.epmet.entity.UserRoleEntity;
 import com.epmet.redis.UserRoleRedis;
+import com.epmet.service.RoleService;
 import com.epmet.service.UserRoleService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -41,7 +44,7 @@ import java.util.List;
 import java.util.Map;
 
 /**
- * 用户角色关系表 
+ * 用户角色关系表
  *
  * @author generator generator@elink-cn.com
  * @since v1.0.0 2020-03-30
@@ -49,71 +52,85 @@ import java.util.Map;
 @Service
 public class UserRoleServiceImpl extends BaseServiceImpl<UserRoleDao, UserRoleEntity> implements UserRoleService {
 
-    @Autowired
+	@Autowired
-    private UserRoleRedis userRoleRedis;
+	private UserRoleRedis userRoleRedis;
-
+	@Autowired
-    @Override
+	private RoleService roleService;
-    public PageData<UserRoleDTO> page(Map<String, Object> params) {
+
-        IPage<UserRoleEntity> page = baseDao.selectPage(
+	@Override
-                getPage(params, FieldConstant.CREATED_TIME, false),
+	public PageData<UserRoleDTO> page(Map<String, Object> params) {
-                getWrapper(params)
+		IPage<UserRoleEntity> page = baseDao.selectPage(
-        );
+				getPage(params, FieldConstant.CREATED_TIME, false),
-        return getPageData(page, UserRoleDTO.class);
+				getWrapper(params)
-    }
+		);
-
+		return getPageData(page, UserRoleDTO.class);
-    @Override
+	}
-    public List<UserRoleDTO> list(Map<String, Object> params) {
+
-        List<UserRoleEntity> entityList = baseDao.selectList(getWrapper(params));
+	@Override
-
+	public List<UserRoleDTO> list(Map<String, Object> params) {
-        return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.class);
+		List<UserRoleEntity> entityList = baseDao.selectList(getWrapper(params));
-    }
+
-
+		return ConvertUtils.sourceToTarget(entityList, UserRoleDTO.class);
-    private QueryWrapper<UserRoleEntity> getWrapper(Map<String, Object> params){
+	}
-        String id = (String)params.get(FieldConstant.ID_HUMP);
+
-
+	private QueryWrapper<UserRoleEntity> getWrapper(Map<String, Object> params) {
-        QueryWrapper<UserRoleEntity> wrapper = new QueryWrapper<>();
+		String id = (String) params.get(FieldConstant.ID_HUMP);
-        wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
+
-
+		QueryWrapper<UserRoleEntity> wrapper = new QueryWrapper<>();
-        return wrapper;
+		wrapper.eq(StringUtils.isNotBlank(id), FieldConstant.ID, id);
-    }
+
-
+		return wrapper;
-    @Override
+	}
-    public UserRoleDTO get(String id) {
+
-        UserRoleEntity entity = baseDao.selectById(id);
+	@Override
-        return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class);
+	public UserRoleDTO get(String id) {
-    }
+		UserRoleEntity entity = baseDao.selectById(id);
-
+		return ConvertUtils.sourceToTarget(entity, UserRoleDTO.class);
-    @Override
+	}
-    @Transactional(rollbackFor = Exception.class)
+
-    public void save(UserRoleDTO dto) {
+	@Override
-        UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
+	@Transactional(rollbackFor = Exception.class)
-        insert(entity);
+	public void save(UserRoleDTO dto) {
-    }
+		UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
-
+		insert(entity);
-    @Override
+	}
-    @Transactional(rollbackFor = Exception.class)
+
-    public void update(UserRoleDTO dto) {
+	@Override
-        UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
+	@Transactional(rollbackFor = Exception.class)
-        updateById(entity);
+	public void update(UserRoleDTO dto) {
-    }
+		UserRoleEntity entity = ConvertUtils.sourceToTarget(dto, UserRoleEntity.class);
-
+		updateById(entity);
-    @Override
+	}
-    @Transactional(rollbackFor = Exception.class)
+
-    public void delete(String[] ids) {
+	@Override
-        // 逻辑删除（@TableLogic 注解）
+	@Transactional(rollbackFor = Exception.class)
-        baseDao.deleteBatchIds(Arrays.asList(ids));
+	public void delete(String[] ids) {
-    }
+		// 逻辑删除（@TableLogic 注解）
-
+		baseDao.deleteBatchIds(Arrays.asList(ids));
-    /**
+	}
-     * @Description 根据用户Id、来源app、客户Id查询用户角色
+
-     * @Param userRoleFormDTO
+	/**
-     * @return UserRoleResultDTO
+	 * @return UserRoleResultDTO
-     * @Author wangc
+	 * @Description 根据用户Id、来源app、客户Id查询用户角色
-     * @Date 2020.03.30 15:35
+	 * @Param userRoleFormDTO
-     **/
+	 * @Author wangc
-    @Override
+	 * @Date 2020.03.30 15:35
-    public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+	 **/
-        return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+	@Override
-    }
+	public Result<List<UserRoleResultDTO>> getUserRoleInfo(UserRoleFormDTO userRoleFormDTO) {
+		return new Result<List<UserRoleResultDTO>>().ok(baseDao.getUserRoleInfo(userRoleFormDTO));
+	}
+
+	@Override
+	public Result saveUserRole(UserRoleDTO userRoleDTO) {
+		//获取角色ID
+		RoleDTO roleDTO = new RoleDTO();
+		roleDTO.setApp(UserConstant.APP_RESI);
+		roleDTO.setRoleKey(userRoleDTO.getRoleKey());
+		RoleDTO role = roleService.getRoleByKey(roleDTO);
+		userRoleDTO.setRoleId(role.getId());
+		baseDao.insert(ConvertUtils.sourceToTarget(userRoleDTO, UserRoleEntity.class));
+		return new Result();
+	}
 
 }

epmet-user/epmet-user-server/src/main/resources/mapper/RoleDao.xml

@@ -15,6 +15,18 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+    <select id="selectRoleByKey" resultType="com.epmet.entity.RoleEntity"
+            parameterType="com.epmet.entity.RoleEntity">
+        select
+               ID,
+               APP,
+               ROLE_NAME,
+               ROLE_KEY
+        from epmet_user.epmet_role
+        where APP = #{app}
+            and ROLE_KEY = #{roleKey}
+            and DEL_FLAG = 0
+    </select>
 
 
 </mapper>

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

@@ -19,6 +19,25 @@
         <result property="updatedBy" column="UPDATED_BY"/>
         <result property="updatedTime" column="UPDATED_TIME"/>
     </resultMap>
+
+    <sql id="sql">
+        uri.id AS "id",
+        uri.user_id AS "userId",
+        uri.reg_mobile AS "regMobile",
+        uri.surname AS "surname",
+        uri.`name` AS "name",
+        uri.street AS "street",
+        uri.district AS "district",
+        uri.building_address AS "buildingAddress",
+        uri.resi_visit_id AS "resiVisitId",
+        uri.del_flag AS "delflag",
+        uri.revision AS "revision",
+        uri.created_by AS "createdby",
+        uri.created_time AS "createdtime",
+        uri.updated_by AS "updatedby",
+        uri.updated_time AS "updatedtime"
+    </sql>
+
     <insert id="saveUserResiInfo" parameterType="com.epmet.dto.UserResiInfoDTO">
         INSERT INTO user_resi_info (
             id,
@@ -80,4 +99,13 @@
             AND uc.USER_ID = #{userId}
     </select>
 
+    <select id="selectResiInfoByMobile" parameterType="string"
+            resultType="com.epmet.dto.UserResiInfoDTO">
+        SELECT
+        <include refid="sql"></include>
+        FROM user_resi_info uri
+        WHERE uri.del_flag = '0'
+        AND uri.reg_mobile = #{regMobile}
+    </select>
+
 </mapper>