From 929caaf23432cede84abc19008d337f08f682a0f Mon Sep 17 00:00:00 2001 From: yh <1844516659@qq.com> Date: Sun, 17 Jul 2022 15:17:28 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A3=9E=E6=BB=B4=E5=87=BA=E8=A1=8C=E7=BD=91?= =?UTF-8?q?=E7=BA=A6=E8=BD=A62022-=E4=B9=98=E5=AE=A2=E6=9C=8D=E5=8A=A1?= =?UTF-8?q?=E8=B0=83=E7=94=A8=E4=B9=98=E5=AE=A2=E7=94=A8=E6=88=B7=E6=9C=8D?= =?UTF-8?q?=E5=8A=A1=E8=8E=B7=E5=8F=96=E5=AF=B9=E5=BA=94=E6=89=8B=E6=9C=BA?= =?UTF-8?q?=E5=8F=B7=E7=9A=84=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF=EF=BC=8C?= =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E8=A1=A5=E5=85=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/UserController.java | 27 ++++++++++++++ .../apipassenger/service/UserService.java | 35 ++++++++++++++++++ .../constant/CommonStatusEnum.java | 4 ++ .../internalcommon/dto/PassengerUser.java | 23 ++++++++++++ .../controller/UserController.java | 13 ++++--- .../dto/PassengerUser.java | 23 ------------ .../mapper/PassengerUserMapper.java | 3 +- .../service/UserService.java | 37 ++++++++++++++----- 8 files changed, 126 insertions(+), 39 deletions(-) create mode 100644 api-passenger/src/main/java/com/mashibing/apipassenger/controller/UserController.java create mode 100644 api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java create mode 100644 internal-common/src/main/java/com/mashibing/internalcommon/dto/PassengerUser.java delete mode 100644 service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/dto/PassengerUser.java diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/controller/UserController.java b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/UserController.java new file mode 100644 index 0000000..24881ed --- /dev/null +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/controller/UserController.java @@ -0,0 +1,27 @@ +package com.mashibing.apipassenger.controller; + +import com.mashibing.apipassenger.service.UserService; +import com.mashibing.internalcommon.dto.ResponseResult; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.RestController; + +import javax.servlet.http.HttpServletRequest; + +@RestController +public class UserController { + + @Autowired + private UserService userService; + + @GetMapping("/users") + public ResponseResult getUsers(HttpServletRequest request){ + + // 从http请求中获取 accessToken + String accessToken = request.getHeader("Authorization"); + + return userService.getUserByAccessToken(accessToken); + } + + +} diff --git a/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java b/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java new file mode 100644 index 0000000..384ce52 --- /dev/null +++ b/api-passenger/src/main/java/com/mashibing/apipassenger/service/UserService.java @@ -0,0 +1,35 @@ +package com.mashibing.apipassenger.service; + +import com.mashibing.internalcommon.constant.CommonStatusEnum; +import com.mashibing.internalcommon.dto.PassengerUser; +import com.mashibing.internalcommon.dto.ResponseResult; +import com.mashibing.internalcommon.dto.TokenResult; +import com.mashibing.internalcommon.util.JwtUtils; +import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Service; + +@Service +@Slf4j +public class UserService { + + public ResponseResult getUserByAccessToken(String accessToken){ + + log.info("accessToken = "+accessToken); + // 根据传入 accessToken 解析出用户手机号 + TokenResult tokenResult = JwtUtils.checkToken(accessToken); + if(tokenResult == null){ + return ResponseResult.fail(CommonStatusEnum.FAIL.getCode(),CommonStatusEnum.FAIL.getValue()); + } + String phone = tokenResult.getPhone(); + + // 根据手机号 查询用户信息 + + PassengerUser passengerUser = new PassengerUser(); + + + return ResponseResult.success(passengerUser); + } + + + +} diff --git a/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java b/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java index 9c12680..e04c754 100644 --- a/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java +++ b/internal-common/src/main/java/com/mashibing/internalcommon/constant/CommonStatusEnum.java @@ -21,6 +21,10 @@ public enum CommonStatusEnum { */ ,TOKEN_ERROR(1199,"token错误") + /** + *用户提示：1200-1299 + */ + ,USER_NOT_EXISTS(1200,"当前用户不存在") ; diff --git a/internal-common/src/main/java/com/mashibing/internalcommon/dto/PassengerUser.java b/internal-common/src/main/java/com/mashibing/internalcommon/dto/PassengerUser.java new file mode 100644 index 0000000..c233ffb --- /dev/null +++ b/internal-common/src/main/java/com/mashibing/internalcommon/dto/PassengerUser.java @@ -0,0 +1,23 @@ +package com.mashibing.internalcommon.dto; + +import lombok.Data; + +import java.time.LocalDateTime; + +@Data +public class PassengerUser { + + + private Long id; + private String passengerName; + private String passengerPhone; + // 0:女 1:男 + private Byte passengerGender; + // 0:有效，1:失效 + private Byte state; + private LocalDateTime gmtCreate; + private LocalDateTime gmtModified; + + private String profilePhoto; + +} diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java index 6a6690a..edfa4af 100644 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/controller/UserController.java @@ -1,9 +1,11 @@ package com.mashibing.servicepassengeruser.controller; +import com.mashibing.internalcommon.dto.PassengerUser; import com.mashibing.internalcommon.dto.ResponseResult; import com.mashibing.internalcommon.request.VerificationCodeDTO; import com.mashibing.servicepassengeruser.service.UserService; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RestController; @@ -16,14 +18,15 @@ public class UserController { @PostMapping("/user") public ResponseResult loginOrReg(@RequestBody VerificationCodeDTO verificationCodeDTO){ - String passengerPhone = verificationCodeDTO.getPassengerPhone(); - System.out.println("手机号："+passengerPhone); + return service.loginOrRegister(passengerPhone); + } - // 调用接口实现 - service.loginOrRegister(passengerPhone); - return ResponseResult.success(""); + @GetMapping("/user") + public ResponseResult getUser(@RequestBody VerificationCodeDTO verificationCodeDTO) { + String passengerPhone = verificationCodeDTO.getPassengerPhone(); + return service.getUsers(passengerPhone); } } diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/dto/PassengerUser.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/dto/PassengerUser.java deleted file mode 100644 index 8a165b7..0000000 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/dto/PassengerUser.java +++ /dev/null @@ -1,23 +0,0 @@ -package com.mashibing.servicepassengeruser.dto; - -import lombok.Data; -import org.springframework.stereotype.Component; - -import java.time.LocalDateTime; - -@Data -@Component -public class PassengerUser { - - - private Long id; - private String passenger_name; - private String passenger_phone; - // 0:女 1:男 - private Byte passenger_gender; - // 0:有效，1:失效 - private Byte state; - private LocalDateTime gmt_create; - private LocalDateTime gmt_modified; - -} diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/mapper/PassengerUserMapper.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/mapper/PassengerUserMapper.java index ec46d8e..959355d 100644 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/mapper/PassengerUserMapper.java +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/mapper/PassengerUserMapper.java @@ -1,9 +1,8 @@ package com.mashibing.servicepassengeruser.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; -import com.mashibing.servicepassengeruser.dto.PassengerUser; +import com.mashibing.internalcommon.dto.PassengerUser; import org.springframework.stereotype.Repository; -import org.springframework.stereotype.Service; @Repository public interface PassengerUserMapper extends BaseMapper { diff --git a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java index f2590b4..4a119dd 100644 --- a/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java +++ b/service-passenger-user/src/main/java/com/mashibing/servicepassengeruser/service/UserService.java @@ -1,7 +1,8 @@ package com.mashibing.servicepassengeruser.service; +import com.mashibing.internalcommon.constant.CommonStatusEnum; import com.mashibing.internalcommon.dto.ResponseResult; -import com.mashibing.servicepassengeruser.dto.PassengerUser; +import com.mashibing.internalcommon.dto.PassengerUser; import com.mashibing.servicepassengeruser.mapper.PassengerUserMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -19,27 +20,45 @@ public class UserService { public ResponseResult loginOrRegister(String passengerPhone){ - System.out.println("user service 被调用，手机号码为："+passengerPhone); - //根据手机号 校验 用户信息 是否存在 Map map =new HashMap<>(); map.put("passenger_phone",passengerPhone); List passengerUserList = mapper.selectByMap(map); -// System.out.println(passengerUserList); //如果不存在，插入用户信息 if(passengerUserList.size() == 0){ PassengerUser passengerUser = new PassengerUser(); - passengerUser.setPassenger_name("张三"); - passengerUser.setPassenger_phone(passengerPhone); - passengerUser.setPassenger_gender((byte)0); + passengerUser.setPassengerName("张三"); + passengerUser.setPassengerPhone(passengerPhone); + passengerUser.setPassengerGender((byte)0); passengerUser.setState((byte)0); - passengerUser.setGmt_create(LocalDateTime.now()); - passengerUser.setGmt_modified(LocalDateTime.now()); + passengerUser.setGmtCreate(LocalDateTime.now()); + passengerUser.setGmtModified(LocalDateTime.now()); int insertStatus = mapper.insert(passengerUser); } return ResponseResult.success(); } + + + public ResponseResult getUsers(String passengerPhone) { + + PassengerUser user = new PassengerUser(); + + //根据手机号 校验 用户信息 是否存在 + Map map =new HashMap<>(); + map.put("passenger_phone",passengerPhone); + List passengerUserList = mapper.selectByMap(map); + + //如果不存在，插入用户信息 + if(passengerUserList.size() == 0){ + ResponseResult.fail(CommonStatusEnum.USER_NOT_EXISTS.getCode(),CommonStatusEnum.USER_NOT_EXISTS.getValue()); + }else{ + user = passengerUserList.get(0); + } + + return ResponseResult.success(user); + } + }