blame | history | patch | commit | commitdiff | ignore whitespace
Helius
2021-06-23 4536a68f86f50e09032066e00e9e3cacf366cbd4 
 zq-erp/src/main/java/com/matrix/system/app/action/ApiUsersAction.java


@@ -13,6 +13,7 @@


import com.matrix.system.app.vo.UserAchieveVo;


import com.matrix.system.app.vo.UserInfoDetailVo;


import com.matrix.system.common.bean.SysUsers;


import com.matrix.system.common.interceptor.ApiUserLoginInterceptor;


import com.matrix.system.common.service.SysUsersService;


import com.matrix.system.common.tools.DataAuthUtil;


import com.matrix.system.common.tools.PasswordUtil;


@@ -27,10 +28,12 @@


import io.swagger.annotations.ApiResponse;


import io.swagger.annotations.ApiResponses;


import org.springframework.beans.factory.annotation.Autowired;


import org.springframework.beans.factory.annotation.Value;


import org.springframework.validation.annotation.Validated;


import org.springframework.web.bind.annotation.*;




import javax.annotation.Resource;


import javax.servlet.http.HttpServletRequest;


import java.io.UnsupportedEncodingException;


import java.security.NoSuchAlgorithmException;


import java.util.ArrayList;


@@ -59,7 +62,8 @@




    @Autowired


    private RedisClient redisClient;




    @Value("${login_private_key}")


    private  String privateKey;




    @ApiOperation(value = "个人中心--获取用户业绩接口 type 1-今日 2-昨天 3-本月 4-上月")


    @ApiResponses({


@@ -101,12 +105,9 @@




    @ApiOperation(value = "退出登陆", notes = "退出登陆")


    @GetMapping(value = "/loginOut")


    public AjaxResult loginOut() {


        SysUsers sysUsers = WebUtil.getSessionAttribute(MatrixConstance.LOGIN_KEY);


        String token = redisClient.getCachedValue(sysUsers.getSuId().toString());




    public AjaxResult loginOut(HttpServletRequest request) {


        String token=ApiUserLoginInterceptor.resolveToken(request,privateKey);


        redisClient.removeObject(token);


        redisClient.removeObject(sysUsers.getSuId().toString());


        return AjaxResult.buildSuccessInstance("退出成功");


    }




@@ -125,6 +126,7 @@


            query.setCompanyId(sysUsers.getCompanyId());


            query.setShopId(sysUsers.getShopId());


        }


        query.setSuUserType("employee");


        query.setSuName(usersQueryDto.getQueryKey());


        List<SysUsers> list = sysUsersService.findByModel(query);


        List<BeauticianVo> dataList = SysUsersMapper.INSTANCE.usersListToBeautyList(list);


@@ -159,7 +161,8 @@


    })


    @GetMapping(value = "/findUserInfo")


    public AjaxResult findUserInfo() {


        SysUsers user = getMe();


        SysUsers user = sysUsersService.findById(getMe().getSuId());




        UserInfoDetailVo userInfoDetailVo = SysUsersMapper.INSTANCE.usersToDetailInfoVo(user);


        AjaxResult ajaxResult = AjaxResult.buildSuccessInstance("获取成功");


        ajaxResult.putInMap("detail", userInfoDetailVo);