修改bug以及综治后台网格员工作汇总导出接口

huanghongfa

2021-07-27 973caebefdd691d45108d56fc96b9aa2e5fc6fe8

 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;
    }