From 5f3cf501f9f6c216df17ee8af6618b55b537d21a Mon Sep 17 00:00:00 2001 From: yanghui <2536613402@qq.com> Date: 星期五, 21 十月 2022 16:57:54 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into local_20221014 --- flower_city/src/main/java/com/dg/core/service/ISysUserService.java | 49 +++++++++++++++++++++++++++++++++++++++++++------ 1 files changed, 43 insertions(+), 6 deletions(-) diff --git a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java index 610a239..218bf8f 100644 --- a/flower_city/src/main/java/com/dg/core/service/ISysUserService.java +++ b/flower_city/src/main/java/com/dg/core/service/ISysUserService.java @@ -1,21 +1,23 @@ package com.dg.core.service; import com.baomidou.mybatisplus.core.metadata.IPage; +import com.dg.core.ResultData; import com.dg.core.db.gen.entity.SysUser; -import org.springframework.data.repository.query.Param; import java.util.List; -public interface ISysUserService { - SysUser getUserById(Long id); +public interface ISysUserService +{ SysUser getUserByAccount(String account); /** * 查询聊天列表 * * @return 参数配置信息 */ - public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType); + public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName); + + SysUser selectData(String userId,String phonenumber,String loginName); /** * 新增聊天记录 @@ -41,13 +43,48 @@ */ public int deleteConfigById(String id); - /** * 获取数据库总条数(批量) * * @return 结果 */ - public int selectNum(String userType); + public int selectNum(String userType,String userName); + + /** + * 发送验证码(如果没有该用户则新建用户) + * + * @return 结果 + */ + ResultData smsSend(SysUser user); + + /** + * 验证码登录 + * + * @return 结果 + */ + ResultData loginByAccount(String phonenumber, String code); + + /** + * 根据部门id及分类id获取导办用户 + * + * @return 结果 + */ + List<SysUser> selectListByDepartmentId(String departmentId,String classifyId); + + /** + * 通过手机号获取用户信息 + * + * @return 结果 + */ + ResultData loginByPhonenumber(String phonenumber); + + + /** + * 查询用户列表(不分页) + * @param userType 用户类型 + * @return 结果 + */ + List<SysUser> queryList(Integer userType,String keyWor); } -- Gitblit v1.7.1