From ee9389f45ad0c5bb72b5fb878dda1ecf2135154e Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期四, 29 九月 2022 10:52:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
flower_city/src/main/java/com/dg/core/controller/UserController.java | 32 ++++++++++++++++++++++++++++++++
1 files changed, 32 insertions(+), 0 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..7c7ee15 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
@@ -6,14 +6,18 @@
import com.dg.core.annotation.Authorization;
import com.dg.core.db.gen.entity.SysUser;
import com.dg.core.manager.TokenManager;
+import com.dg.core.util.SmsUtil;
import com.dg.core.util.TableDataInfo;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.repository.query.Param;
import org.springframework.util.Assert;
import org.springframework.web.bind.annotation.*;
+import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.time.LocalDateTime;
import java.util.HashMap;
@@ -26,6 +30,10 @@
public class UserController extends BaseController{
@Autowired
com.dg.core.service.ISysUserService IUserService;
+
+ @Autowired
+ SmsUtil smsUtil;
+
@Autowired
@@ -63,6 +71,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 +90,7 @@
*/
@ApiOperation("用户列表接口")
@GetMapping("/getlist")
+ @Authorization
public TableDataInfo selectConfigList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
@RequestParam(value = "pageSize",required = false) Integer pageSize)
{
@@ -227,6 +248,17 @@
return toAjax(IUserService.updateConfig(config));
}
+ /**
+ * 根据部门id及分类id获取导办用户
+ *
+ * @return 结果
+ */
+ @ApiOperation("根据部门id及分类id获取导办用户")
+ @GetMapping("/selectListByDepartmentId")
+ public ResultData selectListByDepartmentId(@RequestParam("departmentId") String departmentId, @RequestParam("classifyId") String classifyId){
+ return ResultData.success(IUserService.selectListByDepartmentId(departmentId,classifyId));
+ }
+
}
--
Gitblit v1.7.1