From 284a4b9bda8f7c09f550c15e71ced282e5531a08 Mon Sep 17 00:00:00 2001
From: lidongdong <1459917685@qq.com>
Date: 星期四, 08 十二月 2022 13:33:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java | 57 +++++++++++++++++++++++++++++++++++++++------------------
1 files changed, 39 insertions(+), 18 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
index 04b743b..7488b98 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java
@@ -1,17 +1,23 @@
package com.panzhihua.grid_app.api;
-import com.panzhihua.common.controller.BaseController;
-import com.panzhihua.common.model.vos.LoginReturnVO;
-import com.panzhihua.common.model.vos.R;
-import com.panzhihua.common.service.auth.TokenService;
-import com.panzhihua.grid_app.model.vos.LoginBody;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiOperation;
+import javax.annotation.Resource;
+
+import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
-import javax.annotation.Resource;
+import com.alibaba.fastjson.JSONObject;
+import com.panzhihua.common.controller.BaseController;
+import com.panzhihua.common.model.vos.LoginReturnVO;
+import com.panzhihua.common.model.vos.LoginReturnsVO;
+import com.panzhihua.common.model.vos.R;
+import com.panzhihua.common.service.auth.TokenService;
+import com.panzhihua.common.service.user.UserService;
+import com.panzhihua.grid_app.model.vos.LoginBody;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiOperation;
/**
* @author cedoo
@@ -22,31 +28,47 @@
public class LoginApi extends BaseController {
@Resource
private TokenService tokenService;
+ @Resource
+ private UserService userService;
- @ApiOperation(value = "网格综治APP登录",response = LoginReturnVO.class)
+ @ApiOperation(value = "网格综治APP登录", response = LoginReturnVO.class)
@PostMapping("login")
- public R login(@RequestBody LoginBody loginBody){
+ public R login(@RequestBody LoginBody loginBody) {
String account = loginBody.getAccount();
String password = loginBody.getPassword();
boolean empty = ObjectUtils.isEmpty(account);
boolean empty1 = ObjectUtils.isEmpty(password);
- if (empty||empty1) {
+ if (empty || empty1) {
return R.fail("账户密码不能为空");
}
- R r = tokenService.loginGridApp(account, password);
+ R r = tokenService.loginGridApp(account, password,this.getAppId());
+ if (R.isOk(r)) {
+ LoginReturnsVO returnsVO =
+ JSONObject.parseObject(JSONObject.toJSONString(r.getData()), LoginReturnsVO.class);
+ // 查询用户是否绑定网格，如果未绑定则提示用户
+ R r1 = userService.getGridIsOk(returnsVO.getUserId());
+ if (R.isOk(r1)) {
+ LoginReturnVO returnVO = new LoginReturnVO();
+ BeanUtils.copyProperties(returnsVO, returnVO);
+ r.setData(returnVO);
+ return r;
+ } else {
+ return R.fail("请联系管理员创建网格管理权限");
+ }
+ }
return r;
}
- @ApiOperation(value = "刷新token",response =LoginReturnVO.class)
+ @ApiOperation(value = "刷新token", response = LoginReturnVO.class)
@GetMapping("refreshToken")
- @ApiImplicitParam(name ="refreshToken",value = "登录返回的刷新token")
- public R refreshToken(@RequestParam("refreshToken")String refreshToken){
+ @ApiImplicitParam(name = "refreshToken", value = "登录返回的刷新token")
+ public R refreshToken(@RequestParam("refreshToken") String refreshToken) {
return tokenService.refreshToken(refreshToken);
}
@ApiOperation(value = "用户登出")
@PostMapping("logout")
- public R logout(){
+ public R logout() {
String token = this.getToken();
boolean empty2 = ObjectUtils.isEmpty(token);
if (empty2) {
@@ -54,6 +76,5 @@
}
return tokenService.logout(token);
}
-
}
--
Gitblit v1.7.1