From 2edf8f5847bcc121a35c9aaee5531585e6b923f5 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期三, 23 十一月 2022 13:55:35 +0800
Subject: [PATCH] 1.更改系统设置更改问题 2.新增导半人员设置创建人 3.搜索sql优化
---
flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java | 134 ++++++++++++++++++++++++++++++++++++++------
1 files changed, 116 insertions(+), 18 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
index 4cb204d..f3ec58d 100644
--- a/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
+++ b/flower_city/src/main/java/com/dg/core/service/impl/SysUserServiceImpl.java
@@ -49,18 +49,14 @@
@Override
public SysUser getUserByAccount(String account) {
- HashMap<String, Object> map = new HashMap();
- map.put("login_name", account);
- List<SysUser> sysUsers = baseMapper.selectByMap(map);
- if (sysUsers.size() > 0) {
- return sysUsers.get(0);
- }
- return null;
+ SysUser sysUsers = baseMapper.getUserByAccount(account);
+ return sysUsers;
}
@Override
public ResultData smsSend(SysUser user){
- return smsUtil.sendSms(user.getPhonenumber());
+ return smsUtil.sendSmsNew(user.getPhonenumber());
+
}
@Override
@@ -70,11 +66,18 @@
SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
if (sysUser==null){
//查询花城e+是否存在此用户
- HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("","",phonenumber);
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if( list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
if(huaChengSysUser==null)
{
SysUser newUser = new SysUser();
- newUser.setUserId(Snowflake.getId());
+ newUser.setUserId(Snowflake.getId()+"");
newUser.setLoginName(phonenumber);
newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
newUser.setUserType("3");
@@ -87,7 +90,7 @@
else
{
SysUser newUser = new SysUser();
- newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setUserId(huaChengSysUser.getUserId()+"");
newUser.setLoginName(huaChengSysUser.getPhone());
newUser.setUserName(huaChengSysUser.getNickName());
newUser.setUserType("3");
@@ -96,6 +99,7 @@
newUser.setAvatar(huaChengSysUser.getImageUrl());
newUser.setCreateTime(LocalDateTime.now());
newUser.setUpdateTime(LocalDateTime.now());
+ newUser.setOpenid(huaChengSysUser.getOpenid());
baseMapper.insertConfig(newUser);
}
}
@@ -146,7 +150,96 @@
departmentIds=this.getDepartmentIds(organizationChartEntitiesUser,departmentIds);
}
}
- return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ if (classifyId==null)
+ return baseMapper.selectListByDepartmentId(departmentIds,null,null);
+ else
+ return baseMapper.selectListByDepartmentId(departmentIds,","+classifyId,classifyId+",");
+ }
+
+ @Override
+ public ResultData loginByPhonenumber(String phonenumber)
+ {
+ SysUser sysUser = baseMapper.selectOne(new QueryWrapper<SysUser>().lambda().eq(SysUser::getPhonenumber, phonenumber));
+ if (sysUser==null){
+ //查询花城e+是否存在此用户
+ List<HuaChengSysUser> list=iHuaChengSysUserService.selectData("","",phonenumber);
+ HuaChengSysUser huaChengSysUser=null;
+
+ if(list!=null || list.size()>0 )
+ {
+ huaChengSysUser=list.get(0);
+ }
+
+ SysUser newUser = new SysUser();
+ if(huaChengSysUser==null)
+ {
+ newUser.setUserId(Snowflake.getId()+"");
+ newUser.setLoginName(phonenumber);
+ newUser.setUserName(phonenumber.substring(0,3)+"xxxx"+phonenumber.substring(7,11)+"用户");
+ newUser.setUserType("3");
+ newUser.setPhonenumber(phonenumber);
+ newUser.setSex("1");
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ baseMapper.insertConfig(newUser);
+ }
+ else
+ {
+ newUser.setUserId(huaChengSysUser.getUserId());
+ newUser.setLoginName(huaChengSysUser.getPhone());
+ newUser.setUserName(huaChengSysUser.getNickName());
+ newUser.setUserType("3");
+ newUser.setPhonenumber(huaChengSysUser.getPhone());
+ newUser.setSex(huaChengSysUser.getSex());
+ newUser.setAvatar(huaChengSysUser.getImageUrl());
+ newUser.setCreateTime(LocalDateTime.now());
+ newUser.setUpdateTime(LocalDateTime.now());
+ newUser.setOpenid(huaChengSysUser.getOpenid());
+ baseMapper.insertConfig(newUser);
+ }
+
+ String token = tokenManager.getTokenByUserId(newUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token " + token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(newUser.getUserId(), newUser.getUserId());
+ }
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", newUser.getUserId());
+ map.put("userName", newUser.getUserName());
+
+ return ResultData.success(map);
+
+ }
+ else
+ {
+ String token = tokenManager.getTokenByUserId(sysUser.getUserId());
+// String token = tokenManager.createToken(user.getUserId(), user.getRoleId());
+ System.out.println("token " + token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(sysUser.getUserId(), sysUser.getUserId());
+ }
+
+ sysUser.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ this.updateConfig(sysUser);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", sysUser.getUserId());
+ map.put("userName", sysUser.getUserName());
+
+ return ResultData.success(map);
+ }
+ }
+
+ @Override
+ public List<SysUser> queryList(Integer userType,String keyWord) {
+ return baseMapper.queryList(userType,keyWord);
}
public List<String> getDepartmentIds( List<OrganizationChartEntity> organizationChartEntities,List<String> departmentIds){
@@ -162,13 +255,13 @@
}
@Override
- public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType) {
- return baseMapper.selectConfigList(page, state,userType);
+ public List<SysUser> selectConfigList(IPage<SysUser> page, Integer state,String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectConfigList(page, state,userType,userName,ids,isDivisionHead);
}
@Override
- public SysUser selectData(String userId) {
- return baseMapper.selectData(userId);
+ public SysUser selectData(String userId,String phonenumber,String loginName) {
+ return baseMapper.selectData(userId,phonenumber,loginName);
}
@@ -206,10 +299,15 @@
}
@Override
- public int selectNum(String userType) {
- return baseMapper.selectNum(userType);
+ public int selectNum(String userType,String userName,List<String> ids,String isDivisionHead) {
+ return baseMapper.selectNum(userType,userName,ids,isDivisionHead);
}
+
+
+
+
+
}
--
Gitblit v1.7.1