diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java index ee3664e..188d8f8 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/controller/MeetingReservationController.java @@ -19,6 +19,7 @@ import com.ics.common.core.controller.BaseController; import com.ics.common.core.domain.IcsCustomerStaff; import com.ics.common.core.domain.R; import com.ics.common.utils.DateUtils; +import com.ics.common.utils.StringUtils; import com.ics.common.utils.bean.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.PostMapping; @@ -424,4 +425,25 @@ public class MeetingReservationController extends BaseController { meetingRecordVo.setUserId(userId); return result(meetingReservationService.selectMeetingReservationList(meetingRecordVo)); } + + /** + * 修改单位用户密码 + * 参数: + * loginName 登录名 + * password 原密码 + * newPassword 新密码 + * rePassword 确认密码 + * 返回 + * code 为0 成功,为500 失败 + */ + @RequiresPermissions(value = {"mr:manage:operator", "member:center:view"}, logical = Logical.OR) + @PostMapping("changePswd") + public R changePswd(@RequestBody MeetingUto meetingUto) { + if (StringUtils.isNotBlank(meetingUto.getLoginName()) && StringUtils.isNotBlank(meetingUto.getPassword()) && StringUtils.isNotBlank(meetingUto.getNewPassword())) { + if (meetingUto.getNewPassword().equals(meetingUto.getRePassword())) { + return toAjax(meetingUtoService.changePassword(meetingUto)); + } + } + return R.error("修改密码失败"); + } } diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingUto.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingUto.java index 4d33d95..a9533ca 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingUto.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/domain/MeetingUto.java @@ -1,6 +1,8 @@ package com.ics.admin.domain; +import com.baomidou.mybatisplus.annotation.TableField; import com.baomidou.mybatisplus.annotation.TableName; +import com.fasterxml.jackson.annotation.JsonProperty; import com.ics.common.core.domain.BaseEntity; import lombok.Data; @@ -30,6 +32,16 @@ public class MeetingUto extends BaseEntity { /** 密码 */ private String password; + /** 新密码 */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private String newPassword; + + /** 确认密码 */ + @JsonProperty(access = JsonProperty.Access.WRITE_ONLY) + @TableField(exist = false) + private String rePassword; + /** 备注 */ private String remark; diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingUtoMapper.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingUtoMapper.java index 3037de0..3d9cb54 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingUtoMapper.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/mapper/MeetingUtoMapper.java @@ -52,6 +52,13 @@ public interface MeetingUtoMapper { */ int updateMeetingUto(MeetingUto meetingUto); + /** + * 修改密码 + * @param meetingUto + * @return + */ + int changePassword(MeetingUto meetingUto); + /** * 删除用户与机构关联 * diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingUtoService.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingUtoService.java index 9ccf50e..b6c50ea 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingUtoService.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/IMeetingUtoService.java @@ -56,6 +56,13 @@ public interface IMeetingUtoService { */ String updateMeetingUto(MeetingUto meetingUto); + /** + * 修改密码 + * @param meetingUto + * @return + */ + int changePassword(MeetingUto meetingUto); + /** * 批量删除用户与机构关联 * diff --git a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingUtoServiceImpl.java b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingUtoServiceImpl.java index 9efe540..ec2f7dc 100644 --- a/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingUtoServiceImpl.java +++ b/shoot-hand/ics-admin/src/main/java/com/ics/admin/service/impl/MeetingUtoServiceImpl.java @@ -96,6 +96,11 @@ public class MeetingUtoServiceImpl implements IMeetingUtoService { return IMeetingUtoService.OK; } + @Override + public int changePassword(MeetingUto meetingUto){ + return meetingUtoMapper.changePassword(meetingUto); + } + /** * 删除用户与机构关联对象 * diff --git a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingUtoMapper.xml b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingUtoMapper.xml index 993eb32..19937ab 100644 --- a/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingUtoMapper.xml +++ b/shoot-hand/ics-admin/src/main/resources/mapper/admin/MeetingUtoMapper.xml @@ -117,6 +117,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" WHERE id = #{id} + + update ics_meeting_uto set password = #{newPassword} where login_name = #{loginName} and password = #{password} and delete_flag=0 + DELETE FROM ics_meeting_uto WHERE id = #{id}