diff --git a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java index 051796e71c..bd7d0619fd 100644 --- a/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java +++ b/epmet-commons/epmet-commons-mybatis/src/main/java/com/epmet/commons/mybatis/handler/FieldMetaObjectHandler.java @@ -82,7 +82,6 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { public void updateFill(MetaObject metaObject) { Object originalObject = metaObject.getOriginalObject(); - Long id = SecurityUser.getUserId(); boolean fillEntity = false; boolean fillEsuaEntity = false; @@ -101,13 +100,15 @@ public class FieldMetaObjectHandler implements MetaObjectHandler { } } if (fillEntity) { + Long id = SecurityUser.getUserId(); id = null == id ? NumConstant.ZERO_L : id; //更新者 setFieldValByName(UPDATER, id, metaObject); //更新时间 setFieldValByName(UPDATE_DATE, new Date(), metaObject); } else if (fillEsuaEntity) { - String userId = null == id ? Constant.APP_USER_FLAG : String.valueOf(id); + String loginUserId = LoginUserUtil.getLoginUserId(); + String userId = StringUtils.isBlank(loginUserId) ? Constant.APP_USER_FLAG : loginUserId; setFieldValByName(FieldConstant.UPDATED_BY_HUMP, userId, metaObject); setFieldValByName(FieldConstant.UPDATED_TIME_HUMP, new Date(), metaObject); } diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java index 50faadb87f..c136164acc 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/constant/ServiceConstant.java @@ -63,4 +63,9 @@ public interface ServiceConstant { * 党员认证、热心居民申请端访问权限控制 */ String RESI_PARTYMEMBER_SERVER = "resi-partymember-server"; + + /** + * 消息服务 + */ + String EPMET_MESSAGE_SERVER = "epmet-message-server"; } diff --git a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java index 4c83d810da..d6d2396a15 100644 --- a/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java +++ b/epmet-gateway/src/main/java/com/epmet/filter/AuthFilter.java @@ -40,8 +40,8 @@ import java.util.List; * @author Mark sunlightcs@gmail.com * @since 1.0.0 */ -@Configuration -@ConfigurationProperties(prefix = "renren") +//@Configuration +//@ConfigurationProperties(prefix = "renren") public class AuthFilter implements GlobalFilter { private Logger logger = LoggerFactory.getLogger(getClass()); private final AntPathMatcher antPathMatcher = new AntPathMatcher(); diff --git a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java index 3340d12ff4..91eff10e8b 100644 --- a/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java +++ b/epmet-module/epmet-message/epmet-message-client/src/main/java/com/epmet/dto/SysSmsDTO.java @@ -52,4 +52,7 @@ public class SysSmsDTO implements Serializable { @ApiModelProperty(value = "创建时间") private Date createDate; + @ApiModelProperty(value = "参数列表") + private String params; + } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java index 4a109c5482..ea698fa6e5 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/controller/SmsController.java @@ -31,6 +31,7 @@ import org.springframework.web.bind.annotation.*; import springfox.documentation.annotations.ApiIgnore; import java.util.Arrays; +import java.util.HashMap; import java.util.Map; /** @@ -100,9 +101,8 @@ public class SmsController { @ApiImplicitParam(name = "mobile", value = "手机好号", paramType = "query", required = true, dataType="String"), @ApiImplicitParam(name = "params", value = "参数", paramType = "query", required = true, dataType="String") }) - public Result send(String mobile, String params){ - sysSmsService.send(mobile, params); - + public Result send(@RequestBody SysSmsDTO sysSmsDTO){ + sysSmsService.send(sysSmsDTO.getMobile(), sysSmsDTO.getParams()); return new Result(); } @@ -115,4 +115,21 @@ public class SmsController { return new Result(); } + /** + * 发送短信验证码 + * @return + */ + @PostMapping("captcha") + @ApiOperation("发送短信验证码") + //@LogOperation("发送短信验证码") + @ApiImplicitParams({ + @ApiImplicitParam(name = "mobile", value = "手机号", paramType = "query", required = true, dataType="String") + }) + public Result sendSmsCaptcha(@RequestBody SysSmsDTO sysSmsDTO) { + String mobile = sysSmsDTO.getMobile(); + String captcha = sysSmsService.sendSmsCaptcha(mobile); + HashMap map = new HashMap<>(); + map.put("code", captcha); + return new Result().ok(map); + } } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java new file mode 100644 index 0000000000..82a9516e7a --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/MessageFeignClient.java @@ -0,0 +1,24 @@ +package com.epmet.feign; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.SysSmsDTO; +import com.epmet.feign.fallback.MessageFeignClientFallback; +import org.springframework.cloud.openfeign.FeignClient; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; + +@FeignClient(name = ServiceConstant.EPMET_MESSAGE_SERVER, fallback = MessageFeignClientFallback.class, url = "http://localhost:8085") +public interface MessageFeignClient { + + /** + * 发送短信 + * @return + */ + @PostMapping(value = "message/sms/send") + Result send(@RequestBody SysSmsDTO smsDTO); + + //@PostMapping(value = "message/sms/send", consumes = "application/x-www-form-urlencoded") + //Result send(Map entityBody); + +} \ No newline at end of file diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java new file mode 100644 index 0000000000..3010195b34 --- /dev/null +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/feign/fallback/MessageFeignClientFallback.java @@ -0,0 +1,21 @@ +package com.epmet.feign.fallback; + +import com.epmet.commons.tools.constant.ServiceConstant; +import com.epmet.commons.tools.utils.ModuleUtils; +import com.epmet.commons.tools.utils.Result; +import com.epmet.dto.SysSmsDTO; +import com.epmet.feign.MessageFeignClient; +import org.springframework.stereotype.Component; + +/** + * 消息服务降级 + */ +@Component +public class MessageFeignClientFallback implements MessageFeignClient { + + + @Override + public Result send(SysSmsDTO smsDTO) { + return ModuleUtils.feignConError(ServiceConstant.EPMET_MESSAGE_SERVER, "send", smsDTO); + } +} diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java index 5e4d887f56..dedc0afb6c 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/SysSmsService.java @@ -40,5 +40,12 @@ public interface SysSmsService extends BaseService { * @param status 发送状态 */ void save(Integer platform, String mobile, LinkedHashMap params, Integer status); + + /** + * 发送短信验证码 + * @param mobile + * @return + */ + String sendSmsCaptcha(String mobile); } diff --git a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java index 6b9c9314d9..82e3369020 100644 --- a/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java +++ b/epmet-module/epmet-message/epmet-message-server/src/main/java/com/epmet/service/impl/SysSmsServiceImpl.java @@ -16,23 +16,29 @@ import com.epmet.commons.tools.constant.Constant; import com.epmet.commons.tools.exception.ErrorCode; import com.epmet.commons.tools.exception.RenException; import com.epmet.commons.tools.page.PageData; +import com.epmet.commons.tools.utils.Result; import com.epmet.dao.SysSmsDao; import com.epmet.dto.SysSmsDTO; import com.epmet.entity.SysSmsEntity; import com.epmet.exception.ModuleErrorCode; +import com.epmet.feign.MessageFeignClient; import com.epmet.service.SysSmsService; import com.epmet.sms.AbstractSmsService; import com.epmet.sms.SmsFactory; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import java.util.Date; -import java.util.LinkedHashMap; -import java.util.Map; +import java.util.*; @Service public class SysSmsServiceImpl extends BaseServiceImpl implements SysSmsService { + @Autowired + private MessageFeignClient messageFeignClient; + @Override public PageData page(Map params) { IPage page = baseDao.selectPage( @@ -99,4 +105,26 @@ public class SysSmsServiceImpl extends BaseServiceImpl //sms.setCreateDate(new Date()); baseDao.insert(sms); } + + @Override + public String sendSmsCaptcha(String mobile) { + Integer code = (int) ((Math.random() * 9 + 1) * 100000); + String codeStr = String.valueOf(code); + HashMap map = new HashMap<>(); + map.put("code", codeStr); + + try { + String paramJson = new ObjectMapper().writeValueAsString(map); + + SysSmsDTO sysSmsDTO = new SysSmsDTO(); + sysSmsDTO.setMobile(mobile); + sysSmsDTO.setParams(paramJson); + + Result result = messageFeignClient.send(sysSmsDTO); + System.out.println(result); + } catch (JsonProcessingException e) { + e.printStackTrace(); + } + return codeStr; + } } diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java index a3a2b7cfc6..1574ded95c 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/controller/ResiRegisterController.java @@ -3,7 +3,7 @@ package com.epmet.modules.resiregister.controller; import com.epmet.commons.tools.annotation.LoginUser; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -43,8 +43,8 @@ public class ResiRegisterController { * @Description 居民端-居民注册信息提交 **/ @PostMapping("submit") - public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody UserResiInfoDTO userResiInfoDTO) { - return resiRegisterService.submit(tokenDTO, userResiInfoDTO); + public Result submit(@LoginUser TokenDto tokenDTO, @RequestBody ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { + return resiRegisterService.submit(tokenDTO, resiInfoSubmitFormDTO); } /** diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java index 6a675b15f2..8a4864d862 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/ResiRegisterService.java @@ -2,7 +2,7 @@ package com.epmet.modules.resiregister.service; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; -import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -31,7 +31,7 @@ public interface ResiRegisterService { * @return void * @author sun */ - Result submit(TokenDto tokenDTO, UserResiInfoDTO userResiInfoDTO); + Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO); /** * 居民端-居民注册根据手机号获取验证码 diff --git a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java index de4cbcb0a6..f026af7dfd 100644 --- a/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java +++ b/epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/resiregister/service/impl/ResiRegisterServiceImpl.java @@ -3,6 +3,7 @@ package com.epmet.modules.resiregister.service.impl; import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; import com.epmet.dto.result.ResiRegisterResultDTO; @@ -49,18 +50,22 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { * @Description 居民端-居民注册信息提交 **/ @Override - public Result submit(TokenDto tokenDTO, UserResiInfoDTO formDTO) { + public Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { if (null == tokenDTO || StringUtils.isBlank(tokenDTO.getUserId())) { - return new Result().error(ModuleConstant.USER_NOT_NULL); + return new Result().error(ModuleConstant.USER_NOT_NULL); } - if (null == formDTO || StringUtils.isBlank(formDTO.getCustomerId()) - || StringUtils.isBlank(formDTO.getGridId()) - || StringUtils.isBlank(formDTO.getResiVisitId())) { - return new Result().error(ModuleConstant.PARAMETER_EXCEPTION); + if (null == resiInfoSubmitFormDTO || StringUtils.isBlank(resiInfoSubmitFormDTO.getCustomerId()) + || StringUtils.isBlank(resiInfoSubmitFormDTO.getGridId()) + || StringUtils.isBlank(resiInfoSubmitFormDTO.getResiVisitId())) { + return new Result().error(ModuleConstant.PARAMETER_EXCEPTION); } - formDTO.setUserId(tokenDTO.getUserId()); - formDTO.setApp(tokenDTO.getApp()); - return epmetUserFeignClient.submit(formDTO); + UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo(); + userResiInfoDTO.setUserId(tokenDTO.getUserId()); + userResiInfoDTO.setApp(tokenDTO.getApp()); + userResiInfoDTO.setCustomerId(resiInfoSubmitFormDTO.getCustomerId()); + userResiInfoDTO.setGridId(resiInfoSubmitFormDTO.getGridId()); + userResiInfoDTO.setResiVisitId(resiInfoSubmitFormDTO.getResiVisitId()); + return epmetUserFeignClient.submit(userResiInfoDTO); } /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java index a544a768d9..777e83dcbe 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/constant/PartyMemberConstant.java @@ -47,9 +47,13 @@ public interface PartyMemberConstant { String BENCHMARK = "110010"; /** - * 比对结果大部分相同最低值 + * 比对结果相同 */ + Double EQUALS = 1.0; + /** + * 比对结果大部分相同最低值 + */ Double MOST = 0.8; /** diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index ff7c2ca523..63c36c221c 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java @@ -156,6 +156,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService saveOrUpdateVisit(partyMemberInfoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_AUTO_SUCCESS); //添加用户党员角色关系 UserRoleDTO userRole = new UserRoleDTO(); + userRole.setCustomerId(partyMemberInfoDTO.getCustomerId()); userRole.setUserId(partyMemberInfoDTO.getUserId()); userRole.setRoleKey(EpmetRoleKeyConstant.PARTYMEMBER); userRole.setApp(partyMemberInfoDTO.getApp()); diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java index 37d11ff2db..656daf2032 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartymemberBaseInfoServiceImpl.java @@ -33,6 +33,7 @@ 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.jetbrains.annotations.NotNull; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; @@ -188,7 +189,7 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl PartyMemberConstant.MOST) { - result.concat("10"); - } else if (idCardResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + double nameResult = jw.similarity(baseInfo.getName(), info.getSurname() + info.getName()); + result = getString(result, idCardResult); - if (mobileResult > PartyMemberConstant.MOST) { - result.concat("10"); - } else if (mobileResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + result = getString(result, mobileResult); - if (nameResult > PartyMemberConstant.MOST) { - result.concat("10"); - } else if (nameResult < PartyMemberConstant.SMALL) { - result.concat("00"); - } else { - result.concat("01"); - } + result = getString(result, nameResult); return result; } + @NotNull + private String getString(String result, double comparisonResult) { + if(comparisonResult == PartyMemberConstant.EQUALS) { + result = result + "11"; + } else if (comparisonResult > PartyMemberConstant.MOST) { + result = result + "10"; + } else if (comparisonResult < PartyMemberConstant.SMALL) { + result = result + "00"; + } else { + result = result + "01"; + } + return result; + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java new file mode 100644 index 0000000000..7834468c46 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/ResiInfoSubmitFormDTO.java @@ -0,0 +1,60 @@ +/** + * Copyright 2018 人人开源 https://www.renren.io + *

+ * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + *

+ * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + *

+ * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + */ + +package com.epmet.dto.form; + +import com.epmet.dto.UserResiInfoDTO; +import lombok.Data; + +import java.io.Serializable; +import java.util.Date; + + +/** + * 用户居民端注册接口 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-30 + */ +@Data +public class ResiInfoSubmitFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + + /** + * 客户Id (customer.id) + */ + private String customerId; + + /** + * 网格Id (customer_grid.id) + */ + private String gridId; + + /** + * 居民注册行为记录表Id resi_visit.id + */ + private String resiVisitId; + + /** + * 用户在居民端完善的个人信息 + */ + private UserResiInfoDTO resiInfo; + + +} diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java index 764d260d41..26ff34860b 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserRoleServiceImpl.java @@ -126,6 +126,7 @@ public class UserRoleServiceImpl extends BaseServiceImpl