attiya/ebike-plus
SHA256
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

登录优化

Browse Source
This commit is contained in:
PC 2026-01-27 16:35:16 +08:00
parent 8c829a76ec
commit d01b043e25
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ebike-operations/src/main/java/com/cdzy/operations/model/dto/EbikeScanOrderDto.java
View File

@ -32,7 +32,7 @@ public class EbikeScanOrderDto implements Serializable {
/** /**
* 工单类型 * 工单类型
*/ */
private Long orderType; private Integer orderType;
/** /**
* 工单类型 * 工单类型

3
ebike-operations/src/main/java/com/cdzy/operations/service/impl/EbikeBikeInfoServiceImpl.java
View File

@ -587,7 +587,8 @@ public class EbikeBikeInfoServiceImpl extends ServiceImpl<EbikeBikeInfoMapper, E
EBIKE_BIKE_ORDER.ORDER_TYPE, EBIKE_BIKE_ORDER.ORDER_TYPE,
EBIKE_BIKE_ORDER.RECEIVER_ID, EBIKE_BIKE_ORDER.RECEIVER_ID,
EBIKE_BIKE_ORDER.BIKE_CODE, EBIKE_BIKE_ORDER.BIKE_CODE,
EBIKE_BIKE_ORDER.ORDER_CODE EBIKE_BIKE_ORDER.ORDER_CODE,
EBIKE_BIKE_ORDER.CREATED_AT
) )
.where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode)) .where(EBIKE_BIKE_ORDER.BIKE_CODE.eq(bikeCode))
.where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED))); .where(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.UNPROCESSED).or(EBIKE_BIKE_ORDER.HANDLE_STATE.eq(OrderHandleState.ACCEPTED)));

10
ebike-staff/src/main/java/com/cdzy/staff/service/impl/EbikeOperatorStaffServiceImpl.java
View File

@ -68,7 +68,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
throw new EbikeException("密码错误"); throw new EbikeException("密码错误");
} else { } else {
StpUtil.login(ebikeOperatorStaff.getStaffId()); StpUtil.login(ebikeOperatorStaff.getStaffId());
StaffInfo staffInfo = getStaffInfo(); StaffInfo staffInfo = getStaffInfoById(ebikeOperatorStaff.getStaffId());
ObjectMapper objectMapper = new ObjectMapper() ObjectMapper objectMapper = new ObjectMapper()
.registerModule(new JavaTimeModule()) .registerModule(new JavaTimeModule())
.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS) .disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS)
@ -88,7 +88,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID, EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID,
EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME, EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME,
EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME, EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME,
EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS,EBIKE_OPERATOR_STAFF.CONTACT_PHONE EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS, EBIKE_OPERATOR_STAFF.CONTACT_PHONE
) )
.where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(loginId)); .where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(loginId));
StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class); StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class);
@ -129,7 +129,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
.contactPhone(staffVo.getContactPhone()) .contactPhone(staffVo.getContactPhone())
.build(); .build();
staffMapper.insert(staff); staffMapper.insert(staff);
if (staffVo.getRoleIds() != null && !staffVo.getRoleIds().isEmpty()){ if (staffVo.getRoleIds() != null && !staffVo.getRoleIds().isEmpty()) {
List<EbikeStaffRole> list = staffVo.getRoleIds().stream().map(roleId -> EbikeStaffRole.builder() List<EbikeStaffRole> list = staffVo.getRoleIds().stream().map(roleId -> EbikeStaffRole.builder()
.roleId(roleId) .roleId(roleId)
.staffId(staff.getStaffId()) .staffId(staff.getStaffId())
@ -159,7 +159,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
ebikeOperatorStaff.setUpdateBy(StpUtil.getLoginIdAsLong()); ebikeOperatorStaff.setUpdateBy(StpUtil.getLoginIdAsLong());
ebikeOperatorStaff.setContactPhone(staffVo.getContactPhone()); ebikeOperatorStaff.setContactPhone(staffVo.getContactPhone());
//禁用后踢下线 //禁用后踢下线
if (staffVo.getStatus() == StaffStatus.DISABLE){ if (staffVo.getStatus() == StaffStatus.DISABLE) {
StpUtil.logout(staffVo.getStaffId()); StpUtil.logout(staffVo.getStaffId());
} }
staffMapper.update(ebikeOperatorStaff); staffMapper.update(ebikeOperatorStaff);
@ -197,7 +197,7 @@ public class EbikeOperatorStaffServiceImpl extends ServiceImpl<EbikeOperatorStaf
EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID, EBIKE_OPERATOR_STAFF.STAFF_ID, EBIKE_OPERATOR_STAFF.OPERATOR_ID,
EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME, EBIKE_OPERATOR_STAFF.USERNAME, EBIKE_OPERATOR_STAFF.CREATE_BY, EBIKE_OPERATOR_STAFF.CREATE_TIME,
EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME, EBIKE_OPERATOR_STAFF.UPDATE_BY, EBIKE_OPERATOR_STAFF.UPDATE_TIME,
EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS,EBIKE_OPERATOR_STAFF.CONTACT_PHONE EBIKE_OPERATOR_STAFF.LAST_LOGIN, EBIKE_OPERATOR_STAFF.STATUS, EBIKE_OPERATOR_STAFF.CONTACT_PHONE
) )
.where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(staffId)); .where(EBIKE_OPERATOR_STAFF.STAFF_ID.eq(staffId));
StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class); StaffInfo info = staffMapper.selectOneByQueryAs(queryWrapper, StaffInfo.class);