From b69d2017fecdad6a1c9a09c0006e70ecea9efed0 Mon Sep 17 00:00:00 2001
From: fengjin <1435304038@qq.com>
Date: 星期一, 17 十月 2022 18:39:41 +0800
Subject: [PATCH] Merge branch 'zigonggao_dev' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 134 +++++++++++++++++++++++++-------------------
1 files changed, 77 insertions(+), 57 deletions(-)
diff --git a/flower_city/src/main/java/com/dg/core/controller/UserController.java b/flower_city/src/main/java/com/dg/core/controller/UserController.java
index e000a15..ce61849 100644
--- a/flower_city/src/main/java/com/dg/core/controller/UserController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/UserController.java
@@ -26,7 +26,7 @@
@Api(tags = {"用户接口"})
@RestController
@RequestMapping("/user")
-public class UserController extends BaseController{
+public class UserController extends BaseController {
@Autowired
com.dg.core.service.ISysUserService IUserService;
@@ -50,11 +50,63 @@
SysUser user=null;
//管理员登录
-// if(StringUtils.equals("zigonggaoadmin",account) || StringUtils.equals("yangxiao",account) )
-// {
- user= IUserService.getUserByAccount(account);
+ user= IUserService.getUserByAccount(account);
- if(user==null || !password.equals(user.getPassword()))
+ if(user==null)
+ {
+ HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
+ if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
+ }
+
+ //本地表查询用户
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
+ if (user == null) {
+ //本地没有此用户 新用户
+ SysUser newSysUser=new SysUser();
+ //默认 1系统后台用户
+ newSysUser.setUserType("3");
+ newSysUser.setPhonenumber(huaChengSysUser.getPhone());
+ newSysUser.setUserId(huaChengSysUser.getUserId());
+ newSysUser.setUserName(huaChengSysUser.getNickName());
+ newSysUser.setSex(huaChengSysUser.getSex());
+ newSysUser.setAvatar(huaChengSysUser.getImageUrl());
+ newSysUser.setCreateTime(LocalDateTime.now());
+ newSysUser.setUpdateTime(LocalDateTime.now());
+ newSysUser.setOpenid(huaChengSysUser.getOpenid());
+ IUserService.insertConfig(newSysUser);
+ }
+
+ user = IUserService.selectData(huaChengSysUser.getUserId()+"",null);
+
+ if (user == null) {
+ return ResultData.error("用户不存在！请联系管理员");
+ }
+
+ String token = tokenManager.getTokenByUserId(user.getUserId());
+ System.out.println("token "+token);
+ if (token == null) {
+ //生成一个token，保存用户登录状态
+ token = tokenManager.createToken(user.getUserId(), user.getUserId());
+ }
+
+ user.setLoginDate(LocalDateTime.now());
+ //更新登录时间
+ IUserService.updateConfig(user);
+
+ Map<String, Object> map = new HashMap<>();
+ map.put("token", token);
+ map.put("userId", user.getUserId());
+ map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
+
+ return ResultData.success(map);
+ }
+ else
+ {
+ if(!password.equals(user.getPassword()))
{
//提示用户名或密码错误
return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
@@ -74,58 +126,13 @@
map.put("token", token);
map.put("userId", user.getUserId());
map.put("userName", user.getUserName());
+ map.put("permission", user.getPermission());
return ResultData.success(map);
-// }
+ }
-// HuaChengSysUser huaChengSysUser=iHuaChengSysUserService.selectData("",account,"");
-// if(huaChengSysUser==null || !password.equals(huaChengSysUser.getPassword()))
-// {
-// //提示用户名或密码错误
-// return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
-// }
-//
-// //本地表查询用户
-// user = IUserService.selectData(huaChengSysUser.getUserId()+"");
-// if (user == null) {
-// //本地没有此用户 新用户
-// SysUser newSysUser=new SysUser();
-// //默认 1系统后台用户
-// newSysUser.setUserType("1");
-// newSysUser.setPhonenumber(huaChengSysUser.getPhone());
-// newSysUser.setUserId(huaChengSysUser.getUserId());
-// newSysUser.setUserName(huaChengSysUser.getNickName());
-// newSysUser.setSex(huaChengSysUser.getSex());
-// newSysUser.setAvatar(huaChengSysUser.getImageUrl());
-// newSysUser.setCreateTime(LocalDateTime.now());
-// newSysUser.setUpdateTime(LocalDateTime.now());
-// IUserService.insertConfig(newSysUser);
-// }
-//
-// user = IUserService.selectData(huaChengSysUser.getUserId()+"");
-//
-// if (user == null) {
-// return ResultData.error("用户不存在！请联系管理员");
-// }
-//
-// String token = tokenManager.getTokenByUserId(user.getUserId());
-// System.out.println("token "+token);
-// if (token == null) {
-// //生成一个token，保存用户登录状态
-// token = tokenManager.createToken(user.getUserId(), user.getUserId());
-// }
-//
-// user.setLoginDate(LocalDateTime.now());
-// //更新登录时间
-// IUserService.updateConfig(user);
-//
-// Map<String, Object> map = new HashMap<>();
-// map.put("token", token);
-// map.put("userId", user.getUserId());
-// map.put("userName", user.getUserName());
-//
-// return ResultData.success(map);
}
+
@ApiOperation("发送登录短信验证码")
@PostMapping(value = "/sendSms", consumes = "application/json")
@@ -133,10 +140,23 @@
return IUserService.smsSend(user);
}
+
@ApiOperation("账号密码验证登录")
@GetMapping(value = "/loginByAccount")
public ResultData loginByAccount(@RequestParam String phonenumber,@RequestParam String code) {
return IUserService.loginByAccount(phonenumber,code);
+ }
+
+
+ @ApiOperation("通过手机号获取用户信息 登录")
+ @PostMapping(value = "/loginPhionne")
+ public ResultData loginPhionne(@RequestParam String phonenumber)
+ {
+ if(StringUtils.isEmpty(phonenumber))
+ {
+ return ResultData.error("请输入手机号");
+ }
+ return IUserService.loginByPhonenumber(phonenumber);
}
/**
@@ -194,7 +214,7 @@
return error("该账户已存在！");
}
- config.setUserType("1");
+ config.setUserType("3");
config.setCreateTime(LocalDateTime.now());
config.setUpdateTime(LocalDateTime.now());
@@ -223,7 +243,7 @@
return error("账户不能为空");
}
- config.setUserType("1");
+ config.setUserType("3");
return toAjax(IUserService.updateConfig(config));
}
@@ -262,7 +282,7 @@
return error("userId不能为空");
}
- SysUser sysUser=IUserService.selectData(userId);
+ SysUser sysUser=IUserService.selectData(userId,null);
//删除标志（0代表存在 2代表删除）
sysUser.setDelFlag("2");
return toAjax(IUserService.updateConfig(sysUser));
@@ -290,7 +310,7 @@
return error("密码不能为空");
}
- SysUser sysUser=IUserService.selectData(config.getUserId()+"");
+ SysUser sysUser=IUserService.selectData(config.getUserId()+"",null);
if(sysUser==null)
{
return error("用户不存在");
--
Gitblit v1.7.1