Commit f69c8700 authored by liqin's avatar liqin 💬

bug fixed

parent 44413526
...@@ -40,7 +40,6 @@ public interface UsersMapper extends BaseMapper<User> { ...@@ -40,7 +40,6 @@ public interface UsersMapper extends BaseMapper<User> {
*/ */
int delById(@Param("id") Integer id); int delById(@Param("id") Integer id);
List<User> getList(Map<String, Object> map); List<User> getList(Map<String, Object> map);
List<User> findAll(); List<User> findAll();
...@@ -51,6 +50,12 @@ public interface UsersMapper extends BaseMapper<User> { ...@@ -51,6 +50,12 @@ public interface UsersMapper extends BaseMapper<User> {
void save(User user); void save(User user);
/**
* 获取用户信息
* @return 用户信息
*/
User getUserById(@Param("id") Long id);
/** /**
* 获取用户信息 * 获取用户信息
* *
......
...@@ -109,6 +109,16 @@ ...@@ -109,6 +109,16 @@
order by create_time desc order by create_time desc
</select> </select>
<select id="getUserById" resultType="cn.wisenergy.model.app.User" parameterType="java.lang.Long">
select
<include refid="cols_all"/>
from
<include refid="table"/>
<where>
id=#{id}
</where>
</select>
<select id="getByUserId" resultType="cn.wisenergy.model.app.User" parameterType="string"> <select id="getByUserId" resultType="cn.wisenergy.model.app.User" parameterType="string">
select select
<include refid="cols_all"/> <include refid="cols_all"/>
......
...@@ -7,17 +7,18 @@ import cn.wisenergy.model.vo.AerialDeliveryVo; ...@@ -7,17 +7,18 @@ import cn.wisenergy.model.vo.AerialDeliveryVo;
import java.util.Map; import java.util.Map;
/** /**
* @author 86187
* @author 86187 * @author 86187
* @ Description: 用户接口 * @ Description: 用户接口
* @ Author : 86187 * @ Author : 86187
* @ Date : 2021/1/6 16:08 * @ Date : 2021/1/6 16:08
* @author 86187
*/ */
public interface UserService { public interface UserService {
/** /**
* 获取用户信息 * 获取用户信息
*
* @param userId 用户id * @param userId 用户id
* @return 用户信息 * @return 用户信息
*/ */
...@@ -25,8 +26,11 @@ public interface UserService { ...@@ -25,8 +26,11 @@ public interface UserService {
R<Integer> getById1(String userId); R<Integer> getById1(String userId);
User getUserById(Long id);
/** /**
* 获取用户信息 * 获取用户信息
*
* @param userId 用户id * @param userId 用户id
* @return 用户信息 * @return 用户信息
*/ */
...@@ -59,6 +63,7 @@ public interface UserService { ...@@ -59,6 +63,7 @@ public interface UserService {
/** /**
* 设置用户头像 * 设置用户头像
*
* @param userId 用户id * @param userId 用户id
* @param headImage 头像图片地址 * @param headImage 头像图片地址
* @return true or false * @return true or false
...@@ -67,6 +72,7 @@ public interface UserService { ...@@ -67,6 +72,7 @@ public interface UserService {
/** /**
* 设置页面 -邀请码填写 * 设置页面 -邀请码填写
*
* @param userId 用户id * @param userId 用户id
* @param inviteCode 邀请人邀请码 * @param inviteCode 邀请人邀请码
* @return true or false * @return true or false
......
package cn.wisenergy.service.app.impl; package cn.wisenergy.service.app.impl;
import cn.wisenergy.common.utils.R; import cn.wisenergy.common.utils.R;
import cn.wisenergy.common.utils.RedisUtils;
import cn.wisenergy.common.utils.ResultUtils;
import cn.wisenergy.common.utils.ShareCodeUtil; import cn.wisenergy.common.utils.ShareCodeUtil;
import cn.wisenergy.mapper.RecommendUserMapper; import cn.wisenergy.mapper.RecommendUserMapper;
import cn.wisenergy.mapper.TeamUserInfoMapper; import cn.wisenergy.mapper.TeamUserInfoMapper;
...@@ -20,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -20,7 +18,6 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import org.springframework.util.CollectionUtils; import org.springframework.util.CollectionUtils;
import java.util.*; import java.util.*;
/** /**
...@@ -53,6 +50,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U ...@@ -53,6 +50,11 @@ public class UserServiceImpl extends ServiceImpl<UsersMapper, User> implements U
return R.ok(usersMapper.ByUserId(userId)); return R.ok(usersMapper.ByUserId(userId));
} }
@Override
public User getUserById(Long id) {
return this.usersMapper.getUserById(id);
}
@Override @Override
public User getByUserId(String userId) { public User getByUserId(String userId) {
return usersMapper.getByUserId(userId); return usersMapper.getByUserId(userId);
......
...@@ -19,7 +19,7 @@ import org.springframework.http.HttpHeaders; ...@@ -19,7 +19,7 @@ import org.springframework.http.HttpHeaders;
import org.springframework.http.HttpStatus; import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType; import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity; import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam; import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController; import org.springframework.web.bind.annotation.RestController;
...@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; ...@@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest;
import java.awt.image.BufferedImage; import java.awt.image.BufferedImage;
import java.io.IOException; import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.nio.charset.Charset;
import java.nio.charset.StandardCharsets; import java.nio.charset.StandardCharsets;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
...@@ -130,16 +129,16 @@ public class LoginController { ...@@ -130,16 +129,16 @@ public class LoginController {
return (Map) ResultUtils.returnDataSuccess(userDtoJson); return (Map) ResultUtils.returnDataSuccess(userDtoJson);
} }
@ApiOperation(value = "二维码邀请注册", notes = "二维码邀请注册", httpMethod = "POST") @ApiOperation(value = "二维码邀请注册", notes = "二维码邀请注册", httpMethod = "GET")
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "userId", value = "用户手机号", required = true, dataType = "String") @ApiImplicitParam(name = "userId", value = "用户手机号", required = true, dataType = "String")
}) })
@PostMapping(value = "/registerByQrCode") @GetMapping(value = "/registerByQrCode")
public ResponseEntity<byte[]> registerByQrCode(@RequestParam("userId") String userId, HttpServletRequest request) throws IOException { public ResponseEntity<byte[]> registerByQrCode(@RequestParam("user_id") Long userId, HttpServletRequest request) throws IOException {
User user = this.usersService.getByUserId(userId); User user = this.usersService.getUserById(userId);
if (user != null) { if (user != null) {
String regFullUrl = request.getScheme() + "://" + request.getServerName() + ":"+request.getServerPort() String regFullUrl = request.getScheme() + "://" + request.getServerName() + ":"+request.getServerPort()
+ "/regist?beInvitedCode=" + user.getInviteCode(); + "/front/register?beInvitedCode=" + user.getInviteCode();
final InputStream is = new ClassPathResource("templates/background.jpg").getInputStream(); final InputStream is = new ClassPathResource("templates/background.jpg").getInputStream();
BufferedImage srcImage = ImageIO.read(is); BufferedImage srcImage = ImageIO.read(is);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment