diff --git a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java index 9d0d310866..b0deec2e02 100644 --- a/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java +++ b/epmet-commons/epmet-commons-tools/src/main/java/com/epmet/commons/tools/redis/RedisKeys.java @@ -135,6 +135,18 @@ public class RedisKeys { return rootPrefix.concat("party:member:confirm:").concat(userId).concat("-").concat(mobile).concat("-").concat(code); } + /** + * + * 党员认证手机验证码key（模糊查询） + * + * @param userId 用户id + * @param mobile 手机号 + * @return String + */ + public static String getUserMobileCodeKey(String userId, String mobile) { + return rootPrefix.concat("party:member:confirm:").concat(userId).concat("-").concat(mobile).concat("-*"); + } + /** * * 居民注册手机验证码key @@ -149,4 +161,17 @@ public class RedisKeys { return rootPrefix.concat("resiregister:confirm:").concat(userId).concat("-").concat(mobile).concat("-").concat(code); } + /** + * + * 居民注册手机验证码key（模糊检索Key） + * + * @param userId 用户id + * @param mobile 手机号 + * @return String + * @author sun + */ + public static String getResiRegisterMobileCodeKey(String userId, String mobile) { + return rootPrefix.concat("resiregister:confirm:").concat(userId).concat("-").concat(mobile).concat("-*"); + } + } 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 7b48c66926..25f9def7c8 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 @@ -1,8 +1,10 @@ package com.epmet.modules.resiregister.service.impl; import com.epmet.commons.tools.security.dto.TokenDto; +import com.epmet.commons.tools.utils.ConvertUtils; import com.epmet.commons.tools.utils.Result; import com.epmet.dto.UserResiInfoDTO; +import com.epmet.dto.form.InfoSubmitFromDTO; import com.epmet.dto.form.ResiInfoSubmitFormDTO; import com.epmet.dto.form.ResiRegisterFormDTO; import com.epmet.dto.form.VerificationCodeFormDTO; @@ -46,7 +48,8 @@ public class ResiRegisterServiceImpl implements ResiRegisterService { **/ @Override public Result submit(TokenDto tokenDTO, ResiInfoSubmitFormDTO resiInfoSubmitFormDTO) { - UserResiInfoDTO userResiInfoDTO = resiInfoSubmitFormDTO.getResiInfo(); + InfoSubmitFromDTO infoSubmitFromDTO = resiInfoSubmitFormDTO.getResiInfo(); + UserResiInfoDTO userResiInfoDTO = ConvertUtils.sourceToTarget(infoSubmitFromDTO, UserResiInfoDTO.class); userResiInfoDTO.setUserId(tokenDTO.getUserId()); userResiInfoDTO.setApp(tokenDTO.getApp()); userResiInfoDTO.setCustomerId(resiInfoSubmitFormDTO.getCustomerId()); 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 777e83dcbe..6fcea577b8 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 @@ -44,7 +44,7 @@ public interface PartyMemberConstant { /** * 党员自动认证是否成功基准 */ - String BENCHMARK = "110010"; + String BENCHMARK = "101011"; /** * 比对结果相同 @@ -52,14 +52,34 @@ public interface PartyMemberConstant { Double EQUALS = 1.0; /** - * 比对结果大部分相同最低值 + * 身份证比对结果大部分相同最低值 */ - Double MOST = 0.8; + Double ID_MOST = 0.88; /** - * 比对结果小部分相同最低值 + * 身份证比对结果小部分相同最低值 */ - Double SMALL = 0.5; + Double ID_SMALL = 0.5; + + /** + * 手机号比对结果大部分相同最低值 + */ + Double MOBILE_MOST = 0.81; + + /** + * 手机号比对结果小部分相同最低值 + */ + Double MOBILE_SMALL = 0.5; + + /** + * 姓名比对结果大部分相同最低值 + */ + Double NAME_MOST = 0.66; + + /** + * 姓名比对结果小部分相同最低值 + */ + Double NAME_SMALL = 0.5; /** * 比对结果相同 diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java index d97754ad04..ff20d1ffac 100644 --- a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java +++ b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/redis/PartymemberInfoRedis.java @@ -47,7 +47,7 @@ public class PartymemberInfoRedis { public void setUserMobileCode(String userId, String mobile, String code){ String key = RedisKeys.getUserMobileCodeKey(userId, mobile, code); - redisUtils.set(key, code, RedisUtils.MINUTE_TEN_EXPIRE); + redisUtils.set(key, code, RedisUtils.MINUTE_THIRTY_EXPIRE); } public String getUserMobileCode(String userId, String mobile, String code){ @@ -60,4 +60,9 @@ public class PartymemberInfoRedis { redisUtils.delete(key); } + public void deleteUserMobileCodeByPattern(String userId, String mobile){ + String key = RedisKeys.getUserMobileCodeKey(userId, mobile); + redisUtils.deleteByPattern(key); + } + } \ No newline at end of file diff --git a/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java b/epmet-module/resi-partymember/resi-partymember-server/src/main/java/com/epmet/modules/partymember/service/impl/PartyMemberConfirmServiceImpl.java index be143e7bab..518ee941e8 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 @@ -105,6 +105,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService //手机是否可用 PartymemberInfoEntity partyMemberInfoParam = new PartymemberInfoEntity(); partyMemberInfoParam.setMobile(fromDTO.getMobile()); + partyMemberInfoParam.setCustomerId(fromDTO.getCustomerId()); PartymemberInfoDTO partyMemberInfoResult = partymemberInfoService.getPartyMemberInfoByMobile(partyMemberInfoParam); if (null != partyMemberInfoResult) { result.setCode(EpmetErrorCode.MOBILE_HAS_BEEN_USED.getValue()); @@ -119,6 +120,8 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); return result; } + //删除旧验证码 + partyMemberInfoRedis.deleteUserMobileCodeByPattern(fromDTO.getUserId(), fromDTO.getMobile()); //将验证码存入Redis partyMemberInfoRedis.setUserMobileCode(fromDTO.getUserId(), fromDTO.getMobile(), message.get("code")); @@ -144,10 +147,6 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService result.setCode(EpmetErrorCode.MOBILE_CODE_ERROR.getValue()); result.setMsg(EpmetErrorCode.MOBILE_CODE_ERROR.getName()); return result; - } else { - partyMemberInfoRedis.delUserMobileCode(partyMemberInfoDTO.getUserId(), - partyMemberInfoDTO.getMobile(), - partyMemberInfoDTO.getCode()); } //获取党员基本信息 @@ -201,6 +200,7 @@ public class PartyMemberConfirmServiceImpl implements PartyMemberConfirmService } @Override + @Transactional(rollbackFor = Exception.class) public Result partyMemberInfoExtra(PartymemberInfoDTO infoDTO) { //将访问记录更新到热心居民申请行为记录表 saveOrUpdateVisit(infoDTO.getPartymemberVisitId(), null, PartyMemberConstant.OPERATE_EXTRA); 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 656daf2032..c70c32c7d8 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 @@ -241,23 +241,23 @@ public class PartymemberBaseInfoServiceImpl extends BaseServiceImpl PartyMemberConstant.MOST) { + } else if (comparisonResult > most) { result = result + "10"; - } else if (comparisonResult < PartyMemberConstant.SMALL) { + } else if (comparisonResult < small) { result = result + "00"; } else { result = result + "01"; diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java new file mode 100644 index 0000000000..3f61da4667 --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/InfoSubmitFromDTO.java @@ -0,0 +1,84 @@ +/** + * 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 lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; +import java.util.Date; + + +/** + * 用户居民端注册信息表 用户在居民端完善的个人信息 + * + * @author generator generator@elink-cn.com + * @since v1.0.0 2020-03-30 + */ +@Data +public class InfoSubmitFromDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + /** + * 手机号(注册手机号) + */ + @NotBlank(message = "手机号不能为空") + private String regMobile; + + /** + * 姓氏 + */ + @NotBlank(message = "姓氏不能为空") + private String surname; + + /** + * 名称 + */ + @NotBlank(message = "名称不能为空") + private String name; + + /** + * 街道 + */ + @NotBlank(message = "所在街道不能为空") + private String street; + + /** + * 小区名称 + */ + private String district; + + /** + * 楼栋单元 + */ + private String buildingAddress; + + /** + * 居民注册行为记录表Id resi_visit.id + */ + private String resiVisitId; + + /** + * 手机验证码 + */ + @NotBlank(message = "手机验证码不能为空") + private String mobileCode; + + +} 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 index 9d39274f2d..c675b309dc 100644 --- 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 @@ -20,6 +20,7 @@ package com.epmet.dto.form; import com.epmet.dto.UserResiInfoDTO; import lombok.Data; +import javax.validation.Valid; import javax.validation.constraints.NotBlank; import java.io.Serializable; import java.util.Date; @@ -58,8 +59,8 @@ public class ResiInfoSubmitFormDTO implements Serializable { /** * 用户在居民端完善的个人信息 */ - @NotBlank(message = "个人信息不能为空") - private UserResiInfoDTO resiInfo; + @Valid + private InfoSubmitFromDTO resiInfo; } diff --git a/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java new file mode 100644 index 0000000000..2e1fee31da --- /dev/null +++ b/epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/WxUserInfoFormDTO.java @@ -0,0 +1,42 @@ +package com.epmet.dto.form; + +import lombok.Data; + +import javax.validation.constraints.NotBlank; +import java.io.Serializable; + +/** + * @Description 同步用户微信信息接口入参DTO + * @Author sun + */ + +@Data +public class WxUserInfoFormDTO implements Serializable { + + private static final long serialVersionUID = 1L; + + //@NotBlank(message = "用户Id不能为空") + private String userId; + + //@NotBlank(message = "昵称不能为空") + private String nickName; + + /** + * 性别0未知1男性2女性 + */ + @NotBlank(message = "性别不能为空") + private String gender; + + @NotBlank(message = "头像不能为空") + private String avatarUrl; + + //@NotBlank(message = "所在省份不能为空") + private String province; + + //@NotBlank(message = "所在国家不能为空") + private String country; + + //@NotBlank(message = "所在城市不能为空") + private String city; + +} diff --git a/epmet-user/epmet-user-server/Dockerfile b/epmet-user/epmet-user-server/Dockerfile new file mode 100644 index 0000000000..899b4d8bcc --- /dev/null +++ b/epmet-user/epmet-user-server/Dockerfile @@ -0,0 +1,11 @@ +FROM java:8 + +RUN export LANG="zh_CN.UTF-8" +RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime +RUN echo 'Asia/Shanghai' > /etc/timezone + +COPY ./target/*.jar ./app.jar + +EXPOSE 8087 + +ENTRYPOINT ["java","-jar","./app.jar"] \ No newline at end of file diff --git a/epmet-user/epmet-user-server/docker-compose.yml b/epmet-user/epmet-user-server/docker-compose.yml new file mode 100644 index 0000000000..97af53a921 --- /dev/null +++ b/epmet-user/epmet-user-server/docker-compose.yml @@ -0,0 +1,6 @@ +version: "3.7" +services: + web: + image: registry-vpc.cn-qingdao.aliyuncs.com/epmet-cloud/epmet-user-server:2.0.0 + ports: + - "8087:8087" \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java index 1f471bcca0..6081d38fe1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/controller/UserController.java @@ -1,5 +1,7 @@ package com.epmet.controller; +import com.epmet.commons.tools.annotation.LoginUser; +import com.epmet.commons.tools.security.dto.TokenDto; import com.epmet.commons.tools.utils.Result; import com.epmet.commons.tools.validator.ValidatorUtils; import com.epmet.commons.tools.validator.group.AddGroup; @@ -8,6 +10,7 @@ import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; +import com.epmet.dto.form.WxUserInfoFormDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.service.UserService; import org.springframework.beans.factory.annotation.Autowired; @@ -70,4 +73,17 @@ public class UserController { Result result= userService.selectLoginUserInfoByPassword(passwordLoginUserInfoFormDTO); return result; } + + /** + * @param wxUserInfoFormDTO + * @Author sun + * @Description 居民端个人信息-同步用户微信信息 + **/ + @PostMapping("updatewxuserinfo") + public Result updateWxUserInfo(@LoginUser TokenDto tokenDTO, @RequestBody WxUserInfoFormDTO wxUserInfoFormDTO) { + wxUserInfoFormDTO.setUserId(tokenDTO.getUserId()); + ValidatorUtils.validateEntity(wxUserInfoFormDTO); + return userService.updateWxUserInfo(wxUserInfoFormDTO); + } + } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java index 837d0cd229..1ce33a14da 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/redis/UserResiInfoRedis.java @@ -56,4 +56,9 @@ public class UserResiInfoRedis { return (String) redisUtils.get(key); } + public void deleteOldUserMobileCode(String userId, String mobile){ + String key = RedisKeys.getResiRegisterMobileCodeKey(userId, mobile); + redisUtils.deleteByPattern(key); + } + } \ No newline at end of file diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java index 887d7ede43..09cd2e5bd1 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/UserService.java @@ -7,6 +7,7 @@ import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; +import com.epmet.dto.form.WxUserInfoFormDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; @@ -47,4 +48,11 @@ public interface UserService extends BaseService { * @Date 2020/3/16 15:49 **/ Result selectLoginUserInfoByPassword(PasswordLoginUserInfoFormDTO passwordLoginUserInfoFormDTO); + + /** + * @param wxUserInfoFormDTO + * @Author sun + * @Description 居民端个人信息-同步用户微信信息 + **/ + Result updateWxUserInfo(WxUserInfoFormDTO wxUserInfoFormDTO); } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java index 37912e61f4..3bab0b3fdf 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserResiInfoServiceImpl.java @@ -212,8 +212,15 @@ public class UserResiInfoServiceImpl extends BaseServiceImpl map = (Map) result.getData(); + if(null == map) { + result.setCode(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getValue()); + result.setMsg(EpmetErrorCode.MOBILE_GET_CODE_ERROR.getName()); + return result; + } + //4:删除缓存中可能存在的旧验证码 + userResiInfoRedis.deleteOldUserMobileCode(verificationCodeFormDTO.getUserId(), verificationCodeFormDTO.getMobile()); + //5:将验证码存入redis userResiInfoRedis.setUserResiMobileCode(verificationCodeFormDTO.getUserId(),verificationCodeFormDTO.getMobile(),map.get("code").toString()); return result; } diff --git a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java index 3f84f91f72..ad18ef11d4 100644 --- a/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java +++ b/epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/UserServiceImpl.java @@ -11,6 +11,7 @@ import com.epmet.dto.UserDTO; import com.epmet.dto.UserWechatDTO; import com.epmet.dto.form.PasswordLoginUserInfoFormDTO; import com.epmet.dto.form.WxLoginUserInfoFormDTO; +import com.epmet.dto.form.WxUserInfoFormDTO; import com.epmet.dto.result.PasswordLoginUserInfoResultDTO; import com.epmet.entity.UserEntity; import com.epmet.entity.UserWechatEntity; @@ -19,6 +20,8 @@ import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import java.util.Date; + /** * @Description @@ -33,7 +36,7 @@ public class UserServiceImpl extends BaseServiceImpl implem /** * 根据openId、app查询对应终端用户信息 - * + *

* 居民端用户与政府端用户都在一张表内且都有微信登录的入口 * user_wechat表保存每一个用户和微信(openId)的绑定关系 * @@ -43,7 +46,7 @@ public class UserServiceImpl extends BaseServiceImpl implem */ @Override public Result selecWxLoginUserInfo(WxLoginUserInfoFormDTO formDTO) { - UserDTO userDTO=userWechatDao.selectUserDTOByOpenId(formDTO); + UserDTO userDTO = userWechatDao.selectUserDTOByOpenId(formDTO); return new Result().ok(userDTO); } @@ -90,4 +93,26 @@ public class UserServiceImpl extends BaseServiceImpl implem } return new Result().ok(passwordLoginUserInfoResultDTO); } + + /** + * @param wxUserInfoFormDTO + * @Author sun + * @Description 居民端个人信息-同步用户微信信息 + **/ + @Override + public Result updateWxUserInfo(WxUserInfoFormDTO wxUserInfoFormDTO) { + UserWechatDTO userWechatDTO = new UserWechatDTO(); + //前台和后台已有实体字段不对于 需要挨个赋值 + userWechatDTO.setUserId(wxUserInfoFormDTO.getUserId()); + userWechatDTO.setNickname(wxUserInfoFormDTO.getNickName() == null ? null : wxUserInfoFormDTO.getNickName()); + userWechatDTO.setSex(Integer.parseInt(wxUserInfoFormDTO.getGender())); + userWechatDTO.setHeadImgUrl(wxUserInfoFormDTO.getAvatarUrl()); + userWechatDTO.setCountry(wxUserInfoFormDTO.getCountry() == null ? null : wxUserInfoFormDTO.getCountry()); + userWechatDTO.setProvince(wxUserInfoFormDTO.getProvince() == null ? null : wxUserInfoFormDTO.getProvince()); + userWechatDTO.setCity(wxUserInfoFormDTO.getCity() == null ? null : wxUserInfoFormDTO.getCity()); + userWechatDTO.setUpdatedTime(new Date()); + userWechatDTO.setUpdatedBy(wxUserInfoFormDTO.getUserId()); + userWechatDao.updateByUserId(userWechatDTO); + return new Result(); + } } diff --git a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml index c177b6fe84..08e6a3ad9e 100644 --- a/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml +++ b/epmet-user/epmet-user-server/src/main/resources/mapper/UserWechatDao.xml @@ -31,7 +31,8 @@ SEX = #{sex}, - UPDATED_TIME = sysdate + UPDATED_BY = #{updatedBy}, + UPDATED_TIME = #{updatedTime} WHERE USER_ID = #{userId}