From 1ac9d6d25f32148354e46d11b814c306f475ee0d Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期六, 08 十月 2022 17:07:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 88 ++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 84 insertions(+), 4 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 0b73956..ecb58f8 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
@@ -4,8 +4,11 @@
import com.dg.core.HttpStatus;
import com.dg.core.ResultData;
import com.dg.core.annotation.Authorization;
+import com.dg.core.db.gen.entity.HuaChengSysUser;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
+import com.dg.core.service.IHuaChengSysUserService;
+import com.dg.core.util.SmsUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -27,9 +30,17 @@
@Autowired
com.dg.core.service.ISysUserService IUserService;
+ @Autowired
+ SmsUtil smsUtil;
@Autowired
TokenManager tokenManager;
+
+ /**
+ * 花城e+用户接口
+ */
+ @Autowired
+ IHuaChengSysUserService iHuaChengSysUserService;
@ApiOperation("登录接口")
@PostMapping(path = "/login")
@@ -37,10 +48,64 @@
Assert.notNull(account, "username can not be empty");
Assert.notNull(password, "password can not be empty");
- SysUser user = IUserService.getUserByAccount(account);
- if (user == null || !password.equals(user.getPassword())) {
+ SysUser user=null;
+ //管理员登录
+ if(StringUtils.equals("zigonggaoadmin",account))
+ {
+ user= IUserService.getUserByAccount(account);
+
+ if(user==null || !password.equals(user.getPassword()))
+ {
+ //提示用户名或密码错误
+ return ResultData.fail(HttpStatus.UNAUTHORIZED, "用户名或密码错误");
+ }
+ 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);
+ }
+
+ 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());
@@ -63,6 +128,18 @@
return ResultData.success(map);
}
+ @ApiOperation("发送登录短信验证码")
+ @PostMapping(value = "/sendSms", consumes = "application/json")
+ public ResultData smsSend(@RequestBody SysUser user) {
+ return IUserService.smsSend(user);
+ }
+
+ @ApiOperation("账号密码验证登录")
+ @GetMapping(value = "/loginByAccount")
+ public ResultData loginByAccount(@RequestParam String phonenumber,@RequestParam String code) {
+ return IUserService.loginByAccount(phonenumber,code);
+ }
+
/**
* 查询列表
*
@@ -70,6 +147,7 @@
*/
@ApiOperation("用户列表接口")
@GetMapping("/getlist")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize)
{
@@ -185,7 +263,7 @@
return error("userId不能为空");
}
- SysUser sysUser=IUserService.getUserById(Long.valueOf(userId));
+ SysUser sysUser=IUserService.selectData(userId);
//删除标志（0代表存在 2代表删除）
sysUser.setDelFlag("2");
return toAjax(IUserService.updateConfig(sysUser));
@@ -213,7 +291,7 @@
return error("密码不能为空");
}
- SysUser sysUser=IUserService.getUserById(config.getUserId());
+ SysUser sysUser=IUserService.selectData(config.getUserId()+"");
if(sysUser==null)
{
return error("用户不存在");
@@ -229,4 +307,6 @@
+
+
}
--
Gitblit v1.7.1