Browse Source

Merge remote-tracking branch 'remotes/origin/back' into pingyin_master

master
jianjun 4 years ago
parent
commit
b00fe6829b
  1. 6
      epmet-gateway/pom.xml
  2. 10
      epmet-gateway/src/main/resources/bootstrap.yml
  3. 1
      epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java
  4. 7
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java
  5. 9
      epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java
  6. 4
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantDataFormDTO.java
  7. 62
      epmet-user/epmet-user-client/src/main/java/com/epmet/dto/form/RentTenantFormDTO.java
  8. 10
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java
  9. 9
      epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java
  10. 27
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java
  11. 21
      epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java
  12. 51
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java
  13. 10
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java
  14. 69
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/IcResiUserServiceImpl.java
  15. 14
      epmet-user/epmet-user-server/src/main/java/com/epmet/service/impl/OperUserServiceImpl.java

6
epmet-gateway/pom.xml

@ -374,6 +374,8 @@
<!--问卷服务-->
<gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
<!--<gateway.routes.tduck-api.url>http://localhost:8116</gateway.routes.tduck-api.url>-->
<!-- 插件:数字底座动力主轴 -->
<gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@ -481,6 +483,8 @@
<!--宣传服务-->
<gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
<!-- 插件:数字底座动力主轴 -->
<gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
<!--钉钉 机器人地址-->
<dingTalk.robot.webHook>https://oapi.dingtalk.com/robot/send?access_token=e894e5690f9d6a527722974c71548ff6c0fe29bd956589a09e21b16442a35ed4</dingTalk.robot.webHook>
<dingTalk.robot.secret>SECfcc020bdc83bb17a2c00f39977b1fbc409ef4188c7beaea11c5caa90eeaf87fd</dingTalk.robot.secret>
@ -585,6 +589,8 @@
<!--宣传服务-->
<gateway.routes.epmet-openapi-adv-server.url>lb://epmet-openapi-adv-server</gateway.routes.epmet-openapi-adv-server.url>
<!-- 插件:数字底座动力主轴 -->
<gateway.routes.plugin.power-base-server.url>lb://pli-power-base-server</gateway.routes.plugin.power-base-server.url>
<!--问卷服务-->
<gateway.routes.tduck-api.url>lb://tduck-api</gateway.routes.tduck-api.url>
<!--生产钉钉 机器人地址-->

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

@ -368,6 +368,15 @@ spring:
filters:
- StripPrefix=1
- CpAuth=true
#数字底座动力主轴
- id: pli-power-base-server
uri: @gateway.routes.plugin.power-base-server.url@
order: 39
predicates:
- Path=${server.servlet.context-path}/pli/power/**
filters:
- StripPrefix=1
- CpAuth=true
nacos:
discovery:
@ -513,6 +522,7 @@ epmet:
- /gov/org/icbuildingunit/unitoption
- /gov/org/ichouse/houseoption
- /epmetuser/icresicollect/save
- /gov/org/customergrid/gridoption
# 外部应用认证,使用AccessToken等头进行认证
externalOpenUrls:
- /data/report/**

1
epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/controller/CustomerGridController.java

@ -308,6 +308,7 @@ public class CustomerGridController {
* @Return {@link Result<List<OptionResultDTO>>}
* @Author zhaoqifeng
* @Date 2021/10/26 14:02
* 此接口给城阳小程序使用已经在gateway中放开此接口无需校验token
*/
@PostMapping("gridoption")
public Result<List<OptionResultDTO>> getGridOption(@RequestBody GridOptionFormDTO formDTO){

7
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/controller/ResiMineGridController.java

@ -50,15 +50,16 @@ public class ResiMineGridController {
/**
* @return
* @param appId
* @Author sun
* @Description 单客户-获取用户最近访问网格
* @Date 2020/8/3
**/
@GetMapping("latestgridinfo")
public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) {
//public Result<LatestGridInfoResultDTO> latestGridInfo(@LoginUser TokenDto token, @RequestParam("appId") String appId) {
public Result<LatestGridInfoResultDTO> latestGridInfo_new(@LoginUser TokenDto token) {
LatestGridInfoFormDTO formDTO = new LatestGridInfoFormDTO();
formDTO.setAppId(appId);
//formDTO.setAppId(appId);
formDTO.setCustomerId(token.getCustomerId());
formDTO.setUserId(token.getUserId());
return new Result<LatestGridInfoResultDTO>().ok(resiMineGridService.latestGridInfo(formDTO));
}

9
epmet-module/resi-mine/resi-mine-server/src/main/java/com/epmet/modules/grid/service/impl/ResiMineGridServiceImpl.java

@ -130,7 +130,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
}
}
}
//1.调用third服务,根据appId获取客户Id
/*
//2022.4.29 应前端要求 入参不再传appid值
//1.调用third服务,根据appId获取客户Id
JSONObject jsonObject = new JSONObject();
String customerMsgUrl = "https://epmet-cloud.elinkservice.cn/api/third/customermp/getcustomermsg/";
String data = HttpClientManager.getInstance().sendPostByJSON(customerMsgUrl + formDTO.getAppId(), JSON.toJSONString(jsonObject)).getData();
@ -148,10 +151,10 @@ public class ResiMineGridServiceImpl implements ResiMineGridService {
JSONObject json = JSON.parseObject(PublicCustomerResultDTO.toString());
Map<String, Object> map = (Map) json.get("customer");
PaCustomerDTO customer = ConvertUtils.mapToEntity(map, PaCustomerDTO.class);
logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);
logger.info("小程序登陆third服务获取客户用户信息PaCustomerDTO->" + customer);*/
//2.调用epmet-user服务,根据客户Id和用户Id查询最后一次访问记录
formDTO.setCustomerId(customer.getId());
//formDTO.setCustomerId(customer.getId());
Result<LatestGridInfoResultDTO> userResult = epmetUserOpenFeignClient.latestGridInfo(formDTO);
if (!userResult.success()) {
logger.error(String.format("居民端获取用户最近访问网格失败,接口入参客户Id->%s,appId->%s,调用epmet-user-server服务返回->%s", formDTO.getCustomerId(), formDTO.getAppId(), JSON.toJSONString(userResult)));

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

@ -15,10 +15,10 @@ import java.io.Serializable;
public class RentTenantDataFormDTO implements Serializable {
private static final long serialVersionUID = 9156247659994638103L;
@NotBlank(message = "userId不能为空",groups = PersonDataFormDTO.PersonDataForm.class)
@NotBlank(message = "userId不能为空")
private String userId;
@NotBlank(message = "tokenDto获取customerId不能为空",groups = PersonDataFormDTO.PersonDataForm.class)
@NotBlank(message = "tokenDto获取customerId不能为空")
private String customerId;
}

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

@ -1,9 +1,10 @@
package com.epmet.dto.form;
import com.epmet.dto.IcResiUserAttachmentDTO;
import com.epmet.dto.IcResiUserDTO;
import lombok.Data;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.List;
/**
@ -19,7 +20,7 @@ public class RentTenantFormDTO implements Serializable {
/**
* 头像
*/
private String img;
private List<IcResiUserAttachmentDTO> images;
/**
* customerId
@ -27,63 +28,18 @@ public class RentTenantFormDTO implements Serializable {
private String customerId;
/**
* gridId
*/
private String gridId;
/**
*
*/
private String agencyId;
/**
*
*/
private String pids;
/**
* 所属小区ID
*/
private String villageId;
/**
* 所属楼宇Id
*/
private String buildId;
/**
* 单元id
*/
private String unitId;
/**
* 所属家庭Id
*/
private String homeId;
/**
* 是否本地户籍
*/
private String isBdhj;
/**
* 姓名
*/
private String name;
/**
* 手机号
* 身份证号
*/
private String mobile;
private String idCard;
/**
* 性别
* 人员类型 0房东 1租客
*/
private String gender;
private String type;
/**
* 身份证号
* 人员信息
*/
private String idCard;
private IcResiUserDTO user;
}

10
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/EpmetUserOpenFeignClient.java

@ -729,18 +729,18 @@ public interface EpmetUserOpenFeignClient {
* @author zhy
* @date 2022/4/26 10:48
*/
@PostMapping("/epmetuser/icresiuser/rent/rentUpdate")
Result rentUpdate(@RequestBody RentTenantFormDTO formDTO);
@PostMapping("/epmetuser/icresiuser/rent/updateimage")
Result updateImage(@RequestBody RentTenantFormDTO formDTO);
/**
* 租客房东根据身份证更新头像
* 查询居民信息
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/4/26 10:48
*/
@PostMapping("/epmetuser/icresiuser/rent/tenantData")
Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO);
@PostMapping("/epmetuser/icresiuser/rent/getrentresiuserinfo")
Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO);
}

9
epmet-user/epmet-user-client/src/main/java/com/epmet/feign/fallback/EpmetUserOpenFeignClientFallback.java

@ -535,12 +535,13 @@ public class EpmetUserOpenFeignClientFallback implements EpmetUserOpenFeignClien
}
@Override
public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "rentUpdate", formDTO);
public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "updateImage", formDTO);
}
@Override
public Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "tenantData", formDTO);
public Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) {
return ModuleUtils.feignConError(ServiceConstant.EPMET_USER_SERVER, "getRentResiUserInfo", formDTO);
}
}

27
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/IcResiUserController.java

@ -242,9 +242,9 @@ public class IcResiUserController implements ResultDataResolver {
* @author zhy
* @date 2022/4/26 10:48
*/
@PostMapping("rent/rentUpdate")
public Result rentUpdate(@RequestBody RentTenantFormDTO formDTO) {
String resiUserId = icResiUserService.rentUpdate(formDTO);
@PostMapping("rent/updateimage")
public Result updateImage(@RequestBody RentTenantFormDTO formDTO) {
String resiUserId = icResiUserService.updateImage(formDTO);
//推送MQ事件
editResiMq(formDTO.getCustomerId(), resiUserId);
return new Result();
@ -270,10 +270,23 @@ public class IcResiUserController implements ResultDataResolver {
* @author zhy
* @date 2022/4/26 15:51
*/
@PostMapping("rent/tenantData")
public Result<RentTenantDataResultDTO> tenantData(@RequestBody RentTenantDataFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO, RentTenantDataFormDTO.class);
return new Result<RentTenantDataResultDTO>().ok(icResiUserService.tenantData(formDTO));
@PostMapping("rent/getrentresiuserinfo")
public Result<RentTenantDataResultDTO> getRentResiUserInfo(@RequestBody RentTenantDataFormDTO formDTO) {
ValidatorUtils.validateEntity(formDTO);
return new Result<RentTenantDataResultDTO>().ok(icResiUserService.getRentResiUserInfo(formDTO));
}
/**
* 租客房东黑名单查询个人数据
*
* @param idCard
* @return com.epmet.commons.tools.utils.Result<com.epmet.dto.result.PersonDataResultDTO>
* @author zhy
* @date 2022/4/26 15:51
*/
@PostMapping("rent/getresiuserinfo/{idCard}")
public Result<List<RentTenantDataResultDTO>> getRentResiUserInfoByIdCard(@PathVariable("idCard") String idCard) {
return new Result<List<RentTenantDataResultDTO>>().ok(icResiUserService.getRentResiUserInfoByIdCard(idCard));
}
/**

21
epmet-user/epmet-user-server/src/main/java/com/epmet/controller/OperUserController.java

@ -18,6 +18,9 @@
package com.epmet.controller;
import com.epmet.commons.tools.annotation.LoginUser;
import com.epmet.commons.tools.constant.AppClientConstant;
import com.epmet.commons.tools.exception.EpmetErrorCode;
import com.epmet.commons.tools.exception.EpmetException;
import com.epmet.commons.tools.page.PageData;
import com.epmet.commons.tools.security.dto.TokenDto;
import com.epmet.commons.tools.utils.ConvertUtils;
@ -29,9 +32,11 @@ import com.epmet.commons.tools.validator.group.AddGroup;
import com.epmet.commons.tools.validator.group.DefaultGroup;
import com.epmet.commons.tools.validator.group.UpdateGroup;
import com.epmet.dto.OperUserDTO;
import com.epmet.dto.PasswordDTO;
import com.epmet.dto.result.QueryOperUserResultDto;
import com.epmet.excel.OperUserExcel;
import com.epmet.service.OperUserService;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;
@ -82,6 +87,22 @@ public class OperUserController {
return new Result();
}
/**
* desc:修改运营端用户 密码
* @param tokenDto
* @param dto
* @return
*/
@PostMapping(value = "updatePwd")
public Result updatePwd(@LoginUser TokenDto tokenDto,@RequestBody PasswordDTO dto) {
if (StringUtils.isBlank(dto.getNewPassword()) && AppClientConstant.APP_OPER.equals(tokenDto.getClient())){
throw new EpmetException(EpmetErrorCode.EPMET_COMMON_OPERATION_FAIL.getCode(),"参数错误","参数错误");
}
operUserService.updatePwd(tokenDto.getUserId(),dto);
return new Result();
}
@DeleteMapping
public Result delete(@RequestBody String[] ids) {
//效验数据

51
epmet-user/epmet-user-server/src/main/java/com/epmet/service/IcResiUserService.java

@ -58,16 +58,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
**/
String edit(TokenDto tokenDto, List<IcResiUserFormDTO> formDTO);
/**
* 租客房东根据身份证更新头像
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/4/26 10:48
*/
String rentUpdate(RentTenantFormDTO formDTO);
/**
* @Description 获取房间内人员
* @Param homeId
@ -105,16 +95,6 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
*/
PersonDataResultDTO personData(PersonDataFormDTO formDTO);
/**
* 租客房东黑名单查询个人数据
*
* @param formDTO
* @return com.epmet.dto.result.RentTenantDataResultDTO
* @author zhy
* @date 2022/4/26 16:03
*/
RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO);
/**
* @Description 根据名字搜索
* @param formDTO
@ -264,4 +244,35 @@ public interface IcResiUserService extends BaseService<IcResiUserEntity> {
* @Date 2022/3/29 16:25
*/
EpidemicPreventionInfoDTO getEpidemicPreventionInfo(EpidemicPreventionFormDTO formDTO);
/**
* 租客房东黑名单查询个人数据
*
* @param formDTO
* @return com.epmet.dto.result.RentTenantDataResultDTO
* @author zhy
* @date 2022/4/26 16:03
*/
RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO);
/**
* 租客房东黑名单查询个人数据
*
* @param idCard
* @return com.epmet.dto.result.RentTenantDataResultDTO
* @author zhy
* @date 2022/4/26 16:03
*/
List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard);
/**
* 租客房东根据身份证更新头像
*
* @param formDTO
* @return com.epmet.commons.tools.utils.Result
* @author zhy
* @date 2022/4/26 10:48
*/
String updateImage(RentTenantFormDTO formDTO);
}

10
epmet-user/epmet-user-server/src/main/java/com/epmet/service/OperUserService.java

@ -20,6 +20,7 @@ package com.epmet.service;
import com.epmet.commons.mybatis.service.BaseService;
import com.epmet.commons.tools.page.PageData;
import com.epmet.dto.OperUserDTO;
import com.epmet.dto.PasswordDTO;
import com.epmet.entity.OperUserEntity;
import java.util.List;
@ -99,4 +100,11 @@ public interface OperUserService extends BaseService<OperUserEntity> {
* @return
*/
OperUserDTO getOperUserInfoById(String id);
}
/**
* desc:修改密码
* @param userId
* @param dto
*/
void updatePwd(String userId, PasswordDTO dto);
}

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

@ -399,29 +399,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
return resiUserId;
}
@Override
@Transactional(rollbackFor = Exception.class)
public String rentUpdate(RentTenantFormDTO formDTO) {
String resiUserId;
IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId());
if (null != userDTO && null != userDTO.getIdCard()) {
GridInfoResultDTO deptInfo = govOrgFeignClient.queryGridInfo(formDTO.getGridId()).getData();
// 没有该居民,新增一个居民
IcResiUserEntity entity = new IcResiUserEntity();
insert(entity);
resiUserId = entity.getId();
} else {
resiUserId = userDTO.getId();
}
// 插入附件头像
IcResiUserAttachmentDTO dto = new IcResiUserAttachmentDTO();
dto.setUserId(resiUserId);
dto.setAttachmentUrl(formDTO.getImg());
icResiUserAttachmentService.save(dto);
return resiUserId;
}
/**
* @Author sun
* @Description 居民信息修改--生成变更记录和变更明细
@ -886,12 +863,6 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
return personData;
}
@Override
public RentTenantDataResultDTO tenantData(RentTenantDataFormDTO formDTO) {
IcResiUserEntity entity = selectById(formDTO.getUserId());
return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
}
/**
* @param formDTO
* @Description 根据名字搜索
@ -1627,4 +1598,44 @@ public class IcResiUserServiceImpl extends BaseServiceImpl<IcResiUserDao, IcResi
return new PageData<>(list, null == list ? NumConstant.ZERO : list.size());
}
@Override
public RentTenantDataResultDTO getRentResiUserInfo(RentTenantDataFormDTO formDTO) {
IcResiUserEntity entity = baseDao.selectById(formDTO.getUserId());
return ConvertUtils.sourceToTarget(entity, RentTenantDataResultDTO.class);
}
@Override
public List<RentTenantDataResultDTO> getRentResiUserInfoByIdCard(String idCard) {
Map<String, Object> params = new HashMap<>(8);
params.put("idCard", idCard);
List<IcResiUserEntity> entityList = baseDao.selectList(getWrapper(params));
return ConvertUtils.sourceToTarget(entityList, RentTenantDataResultDTO.class);
}
@Override
@Transactional(rollbackFor = Exception.class)
public String updateImage(RentTenantFormDTO formDTO) {
String resiUserId = "";
IcResiUserDTO userDTO = baseDao.getResiUserByIdCard(formDTO.getIdCard(), formDTO.getCustomerId());
if (null != userDTO) {
resiUserId = userDTO.getId();
// 插入附件头像(只有一张)
List<IcResiUserAttachmentDTO> images = formDTO.getImages();
images.forEach(item -> item.setUserId(userDTO.getId()));
images.forEach(item-> icResiUserAttachmentService.save(item));
} else if (NumConstant.ONE_STR.equals(formDTO.getType())) {
// 如果是新增的租客,需要新增一条信息,不存在的房东就不管了
IcResiUserEntity entity = ConvertUtils.sourceToTarget(formDTO.getUser(), IcResiUserEntity.class);
insert(entity);
resiUserId = entity.getId();
// 新增用户后保存头像信息
List<IcResiUserAttachmentDTO> images = formDTO.getImages();
images.forEach(item -> item.setUserId(entity.getId()));
images.forEach(item -> icResiUserAttachmentService.save(item));
}
return resiUserId;
}
}

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

@ -17,6 +17,7 @@
package com.epmet.service.impl;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.epmet.commons.mybatis.service.impl.BaseServiceImpl;
@ -29,6 +30,7 @@ import com.epmet.commons.tools.constant.FieldConstant;
import com.epmet.commons.tools.utils.Result;
import com.epmet.dao.OperUserDao;
import com.epmet.dto.OperUserDTO;
import com.epmet.dto.PasswordDTO;
import com.epmet.entity.OperUserEntity;
import com.epmet.entity.UserEntity;
import com.epmet.feign.OperRoleUserFeignClient;
@ -40,6 +42,7 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import java.util.Map;
@ -142,4 +145,15 @@ public class OperUserServiceImpl extends BaseServiceImpl<OperUserDao, OperUserEn
return operUserDao.selectOperUserInfoById(id);
}
@Override
public void updatePwd(String userId, PasswordDTO dto) {
OperUserEntity param = new OperUserEntity();
param.setPassword(PasswordUtils.encode(dto.getNewPassword()));
param.setUpdatedTime(new Date());
param.setUpdatedBy(userId);
LambdaQueryWrapper<OperUserEntity> lambdaQueryWrapper = new LambdaQueryWrapper<>();
lambdaQueryWrapper.eq(OperUserEntity::getUserId,userId);
baseDao.update(param, lambdaQueryWrapper);
}
}

Loading…
Cancel
Save