From 3cb6ee6e1e4ea8b7cc65033f9420b3ae0029b63c Mon Sep 17 00:00:00 2001
From: tangxiaobao <303826152@qq.com>
Date: 星期三, 18 八月 2021 18:53:24 +0800
Subject: [PATCH] Merge branch 'txb'
---
springcloud_k8s_panzhihuazhihuishequ/grid_app/src/main/java/com/panzhihua/grid_app/api/LoginApi.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 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 b9e9f84..3bb77e0 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,13 +1,19 @@
package com.panzhihua.grid_app.api;
+import com.alibaba.fastjson.JSON;
+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.model.vos.community.ComMngStructAreaVO;
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;
+import org.springframework.beans.BeanUtils;
import org.springframework.util.ObjectUtils;
import org.springframework.web.bind.annotation.*;
@@ -18,10 +24,12 @@
*/
@RestController
@RequestMapping("/")
-@Api(tags = {"网格综治APP登录模块"})
+@Api(tags = {"登录 @chendong"})
public class LoginApi extends BaseController {
@Resource
private TokenService tokenService;
+ @Resource
+ private UserService userService;
@ApiOperation(value = "网格综治APP登录",response = LoginReturnVO.class)
@PostMapping("login")
@@ -34,6 +42,19 @@
return R.fail("账户密码不能为空");
}
R r = tokenService.loginGridApp(account, password);
+ 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;
}
--
Gitblit v1.7.1