BJ_FS / urbanops

Commit 9cbc34dbb4816eafac4e9303cecd1b741b739a99

Authored by 戈灵虎
1 parent 470f3589

fix(auth): 修复用户登录和数据查询功能 

- 移除账号格式正则限制，支持更广泛的用户名输入
- 修改用户查询逻辑，支持用户名或手机号登录
- 更新事件信息查询条件，使用模糊匹配替代精确匹配
- 调整道路树木查询接口参数结构
Inline Side-by-side
Showing 4 changed files with 8 additions and 8 deletions
urbanops-module-garden/src/main/java/com/zteits/urbanops/module/garden/controller/app/tree/AppTreeController.java
  View file @9cbc34d
... ... @@ -85,9 +85,7 @@ public class AppTreeController {
85 85 }
86 86  
87 87 @GetMapping("/road/list")
88   - public CommonResult<PageResult<RoadTreeVO>> listTreesByRoad(@RequestParam(required = false) Long road) {
89   - TreePageReqVO pageReqVO = new TreePageReqVO();
90   - pageReqVO.setRoad(road);
  88 + public CommonResult<PageResult<RoadTreeVO>> listTreesByRoad(TreePageReqVO pageReqVO) {
91 89 PageResult<RoadTreeVO> pageResult = treeService.getTreesByRoadId(pageReqVO);
92 90 return success(pageResult);
93 91 }
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/controller/admin/auth/vo/AuthLoginReqVO.java
  View file @9cbc34d
... ... @@ -24,7 +24,7 @@ public class AuthLoginReqVO extends CaptchaVerificationReqVO {
24 24 @Schema(description = "账号", requiredMode = Schema.RequiredMode.REQUIRED, example = "urbanopsyuanma")
25 25 @NotEmpty(message = "登录账号不能为空")
26 26 @Length(min = 4, max = 16, message = "账号长度为 4-16 位")
27   - @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
  27 +// @Pattern(regexp = "^[A-Za-z0-9]+$", message = "账号格式为数字以及字母")
28 28 private String username;
29 29  
30 30 @Schema(description = "密码", requiredMode = Schema.RequiredMode.REQUIRED, example = "buzhidao")
... ...
urbanops-module-system/src/main/java/com/zteits/urbanops/module/system/dal/mysql/user/AdminUserMapper.java
  View file @9cbc34d
1 1 package com.zteits.urbanops.module.system.dal.mysql.user;
2 2  
  3 +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
3 4 import com.zteits.urbanops.framework.common.pojo.PageResult;
4 5 import com.zteits.urbanops.framework.mybatis.core.mapper.BaseMapperX;
5 6 import com.zteits.urbanops.framework.mybatis.core.query.LambdaQueryWrapperX;
  7 +import com.zteits.urbanops.framework.mybatis.core.query.QueryWrapperX;
6 8 import com.zteits.urbanops.module.system.controller.admin.user.vo.user.UserPageReqVO;
7 9 import com.zteits.urbanops.module.system.dal.dataobject.user.AdminUserDO;
8 10 import org.apache.ibatis.annotations.Mapper;
... ... @@ -14,7 +16,7 @@ import java.util.List;
14 16 public interface AdminUserMapper extends BaseMapperX<AdminUserDO> {
15 17  
16 18 default AdminUserDO selectByUsername(String username) {
17   - return selectOne(AdminUserDO::getUsername, username);
  19 + return selectOne(new LambdaQueryWrapperX<AdminUserDO>().eq(AdminUserDO::getUsername, username).or().eq(AdminUserDO::getMobile, username));
18 20 }
19 21  
20 22 default AdminUserDO selectByEmail(String email) {
... ...
urbanops-module-workorder/src/main/java/com/zteits/urbanops/module/workorder/dal/mysql/eventinfo/EventInfoMapper.java
  View file @9cbc34d
... ... @@ -22,7 +22,7 @@ public interface EventInfoMapper extends BaseMapperX&lt;EventInfoDO&gt; {
22 22 default PageResult<EventInfoDO> selectPage(EventInfoPageReqVO reqVO) {
23 23 return selectPage(reqVO, new LambdaQueryWrapperX<EventInfoDO>()
24 24 .eqIfPresent(EventInfoDO::getBusiLine, reqVO.getBusiLine())
25   - .eqIfPresent(EventInfoDO::getEventNo, reqVO.getEventNo())
  25 + .likeIfPresent(EventInfoDO::getEventNo, reqVO.getEventNo())
26 26 .likeIfPresent(EventInfoDO::getEvetName, reqVO.getEvetName())
27 27 .eqIfPresent(EventInfoDO::getEventDevice, reqVO.getEventDevice())
28 28 .eqIfPresent(EventInfoDO::getEventDeviceCode, reqVO.getEventDeviceCode())
... ... @@ -31,10 +31,10 @@ public interface EventInfoMapper extends BaseMapperX&lt;EventInfoDO&gt; {
31 31 .eqIfPresent(EventInfoDO::getLatLonType, reqVO.getLatLonType())
32 32 .eqIfPresent(EventInfoDO::getLat, reqVO.getLat())
33 33 .eqIfPresent(EventInfoDO::getLon, reqVO.getLon())
34   - .eqIfPresent(EventInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
  34 + .likeIfPresent(EventInfoDO::getLonLatAddress, reqVO.getLonLatAddress())
35 35 .eqIfPresent(EventInfoDO::getConfrimImgs, reqVO.getConfrimImgs())
36 36 .eqIfPresent(EventInfoDO::getEventStatus, reqVO.getEventStatus())
37   - .eqIfPresent(EventInfoDO::getRemark, reqVO.getRemark())
  37 + .likeIfPresent(EventInfoDO::getRemark, reqVO.getRemark())
38 38 .betweenIfPresent(EventInfoDO::getCreateTime, reqVO.getCreateTime())
39 39 .orderByDesc(EventInfoDO::getId));
40 40 }
... ...