From d09828cdec78a160f4530a8ab245216ed8671c27 Mon Sep 17 00:00:00 2001
From: liujie <liujie>
Date: 星期三, 20 九月 2023 18:43:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java | 114 ++++++++++++++++++++++++++++++++++++++++++++++----------
1 files changed, 93 insertions(+), 21 deletions(-)
diff --git a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
index 9ab2b8a..78b9786 100644
--- a/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
+++ b/cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java
@@ -1,12 +1,14 @@
package com.dsh.account.controller;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.dsh.account.dto.SelectDto;
import com.dsh.account.entity.TAppUser;
-import com.dsh.account.model.AddAppUserVo;
-import com.dsh.account.model.JoinPlayPaiVo;
-import com.dsh.account.model.LoginSMSCodeVo;
-import com.dsh.account.model.LoginWeChatVo;
+import com.dsh.account.entity.TCourseInfoRecord;
+import com.dsh.account.model.*;
import com.dsh.account.service.IVipPaymentService;
import com.dsh.account.service.TAppUserService;
+import com.dsh.account.service.TCourseInfoRecordService;
import com.dsh.account.util.PayMoneyUtil;
import com.dsh.account.util.ResultUtil;
import com.dsh.account.util.TokenUtil;
@@ -20,6 +22,9 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import java.io.PrintWriter;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.List;
import java.util.Map;
/**
@@ -42,6 +47,9 @@
@Autowired
private TokenUtil tokenUtil;
+ @Autowired
+ private TCourseInfoRecordService courseInfoRecordService;
+
@@ -52,7 +60,7 @@
@ApiImplicitParam(value = "类型（1：登录，2：注册，3：修改密码，4：忘记密码）", name = "type", dataType = "int", required = true),
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true)
})
- public ResultUtil getSMSCode(@RequestBody Integer type, @RequestBody String phone){
+ public ResultUtil getSMSCode(Integer type, String phone){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -74,7 +82,7 @@
@ApiOperation(value = "注册用户", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil addAppUser(@RequestBody AddAppUserVo addAppUserVo){
+ public ResultUtil addAppUser(AddAppUserVo addAppUserVo){
try {
return appUserService.addAppUser(addAppUserVo);
}catch (Exception e){
@@ -91,7 +99,7 @@
@ApiImplicitParam(value = "电话号码", name = "phone", dataType = "string", required = true),
@ApiImplicitParam(value = "登录密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil<String> loginPassword(@RequestBody String phone, @RequestBody String password){
+ public ResultUtil<String> loginPassword(String phone, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -113,7 +121,7 @@
@ApiOperation(value = "短信验证码登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginSMSCode(@RequestBody LoginSMSCodeVo loginSMSCodeVo){
+ public ResultUtil<String> loginSMSCode(LoginSMSCodeVo loginSMSCodeVo){
try {
return appUserService.loginSMSCode(loginSMSCodeVo);
}catch (Exception e){
@@ -128,7 +136,7 @@
@ApiOperation(value = "微信登录", tags = {"APP-登录注册"})
@ApiImplicitParams({
})
- public ResultUtil<String> loginWeChat(@RequestBody LoginWeChatVo loginWeChatVo){
+ public ResultUtil<String> loginWeChat(LoginWeChatVo loginWeChatVo){
try {
return appUserService.loginWechat(loginWeChatVo);
}catch (Exception e){
@@ -136,6 +144,8 @@
return ResultUtil.runErr();
}
}
+
+
@@ -147,7 +157,7 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil updatePassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){
+ public ResultUtil updatePassword(String phone, String code, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -174,7 +184,7 @@
@ApiImplicitParam(value = "短信验证码", name = "code", dataType = "string", required = true),
@ApiImplicitParam(value = "新密码", name = "password", dataType = "string", required = true)
})
- public ResultUtil forgetPassword(@RequestBody String phone, @RequestBody String code, @RequestBody String password){
+ public ResultUtil forgetPassword(String phone, String code, String password){
if(ToolUtil.isEmpty(phone)){
return ResultUtil.paranErr("phone");
}
@@ -198,17 +208,11 @@
@PostMapping("/api/appUser/queryJoinPlayPai")
@ApiOperation(value = "获取加入玩湃首页数据", tags = {"APP-加入玩湃"})
@ApiImplicitParams({
- @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = true),
- @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = true),
+ @ApiImplicitParam(value = "经度", name = "lon", dataType = "string", required = false),
+ @ApiImplicitParam(value = "纬度", name = "lat", dataType = "string", required = false),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(@RequestBody String lon, @RequestBody String lat){
- if(ToolUtil.isEmpty(lon)){
- return ResultUtil.paranErr("lon");
- }
- if(ToolUtil.isEmpty(lat)){
- return ResultUtil.paranErr("lat");
- }
+ public ResultUtil<JoinPlayPaiVo> queryJoinPlayPai(String lon, String lat){
try {
Integer uid = tokenUtil.getUserIdFormRedis();
if(null == uid){
@@ -233,7 +237,7 @@
@ApiImplicitParam(value = "支付方式（1=微信，2=支付宝）", name = "payType", dataType = "int", required = true),
@ApiImplicitParam(name = "Authorization", value = "用户token（Bearer +token）", required = true, dataType = "String", paramType = "header", defaultValue = "Bearer eyJhbGciOiJIUzUxMiJ9.....")
})
- public ResultUtil addVipPayment(@RequestBody Integer payType){
+ public ResultUtil addVipPayment(Integer payType){
if(ToolUtil.isEmpty(payType)){
return ResultUtil.paranErr("payType");
}
@@ -340,4 +344,72 @@
e.printStackTrace();
}
}
+
+
+ @PostMapping("/base/appUser/getAllUser")
+ @ResponseBody
+ public List<TAppUser> getAllUser(){
+ try {
+ return appUserService.list();
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+
+ @PostMapping("/base/appUser/queryByNamePhone")
+ public List<TAppUser> queryByNamePhone(@RequestBody QueryByNamePhone queryByNamePhone){
+ try {
+ LambdaQueryWrapper<TAppUser> tAppUserLambdaQueryWrapper = new LambdaQueryWrapper<>();
+ if(ToolUtil.isNotEmpty(queryByNamePhone.getName())){
+ tAppUserLambdaQueryWrapper.like(TAppUser::getName,queryByNamePhone.getName());
+ }
+ if(ToolUtil.isNotEmpty(queryByNamePhone.getPhone())){
+ tAppUserLambdaQueryWrapper.like(TAppUser::getPhone,queryByNamePhone.getPhone());
+ }
+ List<TAppUser> list = appUserService.list(tAppUserLambdaQueryWrapper);
+ return list;
+ }catch (Exception e){
+ e.printStackTrace();
+ return new ArrayList<>();
+ }
+ }
+
+ @PostMapping("/base/appUser/queryById")
+ public TAppUser queryById(@RequestBody Integer appUserId){
+ try {
+ return appUserService.getById(appUserId);
+ }catch (Exception e){
+ e.printStackTrace();
+ return new TAppUser();
+ }
+ }
+
+
+ /**
+ * 根据名称模糊搜索用户
+ * @param name
+ * @return
+ */
+ @ResponseBody
+ @PostMapping("/appUser/queryAppUserListByName")
+ public List<TAppUser> queryAppUserListByName(@RequestBody String name){
+ return appUserService.list(new QueryWrapper<TAppUser>().eq("state", 1).like("name", name));
+ }
+
+
+
+ @PostMapping("/appUser/addCourseInfoRecord")
+ public Boolean addCourseInfoRecord(@RequestBody TCourseInfoRecord tCourseInfoRecord){
+ boolean save = courseInfoRecordService.save(tCourseInfoRecord);
+ return save;
+ }
+
+ @PostMapping("/appUser/getSelects")
+ public List<SelectDto> getSelects(@RequestBody List<Integer> studentIds){
+ List<SelectDto> selectDtos = appUserService.getSelects(studentIds);
+ System.out.println("=======selectDtos======>"+selectDtos);
+ return selectDtos;
+ }
}
--
Gitblit v1.7.1