From edd51e72fb0d3d9ac3e604f164618dde92a0c29a Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期二, 11 十月 2022 18:07:23 +0800
Subject: [PATCH] 新增首页工单 办事指南饼状图数据 修改小程序登录用户状态问题
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 122 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 52 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 8e80ef0..fa3d6ca 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,62 @@
SysUser user=null;
//管理员登录
- if(StringUtils.equals("zigonggaoadmin",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()+"");
+ 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()+"");
+
+ 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);
+ }
+ else
+ {
+ if(!password.equals(user.getPassword()))
{
//提示用户名或密码错误
return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
@@ -78,54 +129,8 @@
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,12 +138,25 @@
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);
+ }
+
/**
* 查询列表
*
--
Gitblit v1.7.1