From 8bdf0b4a882f4d039b031baf54475a767da528be Mon Sep 17 00:00:00 2001 From: kevin jiang Date: Wed, 29 Apr 2020 15:16:25 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BE=AE=E4=BF=A1=E6=8E=88=E6=9D=83=E7=99=BB?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=88=A4=E7=A9=BA=E5=A4=84=E7=90=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ic/login/controller/LoginController.java | 3 +- .../com/kiisoo/ic/utils/PasswordEncry.java | 5 +++ .../controller/WebAppMyController.java | 31 +++++++++++++++++++ .../kiisoo/ic/webappmy/vo/StafferInfoVO.java | 5 +++ 4 files changed, 43 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/kiisoo/ic/login/controller/LoginController.java b/src/main/java/com/kiisoo/ic/login/controller/LoginController.java index a96b164..fbb6f45 100644 --- a/src/main/java/com/kiisoo/ic/login/controller/LoginController.java +++ b/src/main/java/com/kiisoo/ic/login/controller/LoginController.java @@ -107,7 +107,8 @@ public class LoginController extends BaseController { resultMap.put("results", loginBean); resultMap.put("success", Boolean.TRUE); }else{ - resultMap.put("code", "0001"); + // 手机号码解析失败，请重新授权 + resultMap.put("code", "0010"); resultMap.put("success", Boolean.FALSE); } diff --git a/src/main/java/com/kiisoo/ic/utils/PasswordEncry.java b/src/main/java/com/kiisoo/ic/utils/PasswordEncry.java index 38dc341..e71a170 100644 --- a/src/main/java/com/kiisoo/ic/utils/PasswordEncry.java +++ b/src/main/java/com/kiisoo/ic/utils/PasswordEncry.java @@ -3,6 +3,7 @@ package com.kiisoo.ic.utils; import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSONObject; import com.kiisoo.ic.system.entity.PrivilageAccountDO; +import org.apache.commons.lang3.StringUtils; import org.apache.shiro.codec.Base64; import org.apache.shiro.crypto.RandomNumberGenerator; import org.apache.shiro.crypto.SecureRandomNumberGenerator; @@ -56,7 +57,11 @@ public class PasswordEncry { e.printStackTrace(); } + if(StringUtils.isBlank(str)){ + return ""; + } JSONObject json = JSON.parseObject(str); + System.out.println(str); String phone = json.getString("purePhoneNumber"); return phone; } diff --git a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java index 6c3e52e..ec353af 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java +++ b/src/main/java/com/kiisoo/ic/webappmy/controller/WebAppMyController.java @@ -4,12 +4,17 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.kiisoo.ic.common.BaseController; import com.kiisoo.ic.employee.entity.PrivilageCpUserDO; import com.kiisoo.ic.employee.mapper.PrivilageCpUserDOMapper; +import com.kiisoo.ic.login.bean.LoginBean; import com.kiisoo.ic.store.constant.Constants; import com.kiisoo.ic.store.entity.PoiStoreStaff; import com.kiisoo.ic.store.entity.StoreUserDTO; import com.kiisoo.ic.store.mapper.PoiStoreStaffDOMapper; import com.kiisoo.ic.store.mapper.PrivilageCpUserStoreDOMapper; import com.kiisoo.ic.store.service.StoreEmployeeService; +import com.kiisoo.ic.system.entity.PrivilageRoleDO; +import com.kiisoo.ic.system.entity.PrivilageUserDO; +import com.kiisoo.ic.system.mapper.PrivilageRoleDOMapper; +import com.kiisoo.ic.system.mapper.PrivilageUserDOMapper; import com.kiisoo.ic.webappmy.service.WebAppService; import com.kiisoo.ic.webappmy.vo.StafferInfoVO; import com.kiisoo.ic.webappmy.vo.UserParam; @@ -22,6 +27,7 @@ import org.springframework.stereotype.Controller; import org.springframework.web.bind.annotation.*; import java.util.ArrayList; +import java.util.HashMap; import java.util.List; import java.util.Map; @@ -51,6 +57,19 @@ public class WebAppMyController extends BaseController { @Autowired private WebAppService webAppService; + + /** + * 用户 mapper + */ + @Autowired + private PrivilageUserDOMapper privilageUserDOMapper; + + /** + * 角色 mapper + */ + @Autowired + private PrivilageRoleDOMapper privilageRoleDOMapper; + /** * 获取用户信息 */ @@ -59,6 +78,18 @@ public class WebAppMyController extends BaseController { try { List info = poiStoreStaffDOMapper.selectInfoById(userId); if(info.size() > 0){ + PrivilageUserDO privilageUserDO = privilageUserDOMapper.selectById(userId); + + // 用户不存在 + if(null == privilageUserDO){ + return fail(com.kiisoo.ic.constants.Constants.ERROR_USER_NO_PERMISSION); + } + + PrivilageRoleDO roleDO = privilageRoleDOMapper.selectRoleName(userId); + Long storeId = privilageUserDOMapper.selectStoreIdByUserId(userId); + info.get(0).setRoleCode(roleDO.getCode()); + info.get(0).setStoreId(storeId); + info.get(0).setUserId(userId); return data(info.get(0)); }else { // 用户不存在 diff --git a/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java b/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java index 806e9a8..f370e6f 100644 --- a/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java +++ b/src/main/java/com/kiisoo/ic/webappmy/vo/StafferInfoVO.java @@ -32,4 +32,9 @@ public class StafferInfoVO { * 店铺id */ private Long storeId; + + private String roleCode; + + private Long userId; + }