|
|
|
@@ -1,21 +1,18 @@ |
|
|
|
package com.iformall.controller; |
|
|
|
package com.iformall.controller.sys; |
|
|
|
|
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.annotation.SystemControllerLog; |
|
|
|
import com.iformall.common.ErrorCode; |
|
|
|
import com.iformall.common.Result; |
|
|
|
import com.iformall.common.ResultData; |
|
|
|
import com.iformall.controller.base.BaseController; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.domain.vo.MallUserInfoVo; |
|
|
|
import com.iformall.enums.EnumMallUserStatus; |
|
|
|
import com.iformall.enums.EnumUserAdmin; |
|
|
|
import com.iformall.enums.EnumFlowPermissionType; |
|
|
|
import com.iformall.enums.EnumUserWechat; |
|
|
|
import com.iformall.service.*; |
|
|
|
import com.iformall.shiro.PasswordHelper; |
|
|
|
import com.iformall.shiro.UserSession; |
|
|
|
import com.iformall.utils.Constant; |
|
|
|
import com.sun.tools.internal.jxc.ap.Const; |
|
|
|
import io.swagger.annotations.Api; |
|
|
|
import io.swagger.annotations.ApiImplicitParam; |
|
|
|
import io.swagger.annotations.ApiImplicitParams; |
|
|
|
@@ -23,13 +20,13 @@ import io.swagger.annotations.ApiOperation; |
|
|
|
import org.apache.commons.collections.map.HashedMap; |
|
|
|
import org.apache.commons.lang3.StringUtils; |
|
|
|
import org.apache.shiro.SecurityUtils; |
|
|
|
import org.apache.shiro.authz.annotation.RequiresPermissions; |
|
|
|
import org.slf4j.Logger; |
|
|
|
import org.slf4j.LoggerFactory; |
|
|
|
import org.springframework.beans.factory.annotation.Autowired; |
|
|
|
import org.springframework.util.Assert; |
|
|
|
import org.springframework.web.bind.annotation.*; |
|
|
|
|
|
|
|
import javax.print.DocFlavor; |
|
|
|
import java.util.HashMap; |
|
|
|
import java.util.List; |
|
|
|
import java.util.Map; |
|
|
|
@@ -68,6 +65,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "用户分页接口", response = String.class) |
|
|
|
@GetMapping("lists") |
|
|
|
@RequiresPermissions("sys:user:list") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) |
|
|
|
@@ -100,6 +98,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "用户详情接口", response = String.class) |
|
|
|
@GetMapping("detail") |
|
|
|
@RequiresPermissions("sys:user:info") |
|
|
|
@SystemControllerLog(description = "用户管理-用户详情") |
|
|
|
public ResultData detail(Long id) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::detail"); |
|
|
|
@@ -115,6 +114,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "创建用户接口", response = String.class) |
|
|
|
@PostMapping("add") |
|
|
|
@RequiresPermissions("sys:user:add") |
|
|
|
@SystemControllerLog(description = "用户管理-创建用户") |
|
|
|
public ResultData createUser(@RequestBody MallUserInfo userInfo) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::createUser"); |
|
|
|
@@ -147,6 +147,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "修改用户接口", response = String.class) |
|
|
|
@PostMapping("update") |
|
|
|
@RequiresPermissions("sys:user:update") |
|
|
|
@SystemControllerLog(description = "用户管理-修改用户") |
|
|
|
public ResultData updateUser(@RequestBody MallUserInfo userInfo) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::updateUser"); |
|
|
|
@@ -221,6 +222,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "删除用户接口", response = String.class) |
|
|
|
@PostMapping("/del") |
|
|
|
@RequiresPermissions("sys:user:del") |
|
|
|
@SystemControllerLog(description = "用户管理-删除用户") |
|
|
|
public ResultData deleteUser(@RequestBody MallUserInfo userInfo) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::deleteUser"); |
|
|
|
@@ -236,13 +238,9 @@ public class MallUserInfoController extends BaseController { |
|
|
|
return new ResultData(); |
|
|
|
} |
|
|
|
|
|
|
|
/** |
|
|
|
* 启用,停用用户 |
|
|
|
* |
|
|
|
* @return |
|
|
|
*/ |
|
|
|
@ApiOperation(value = "起停用户接口") |
|
|
|
@PostMapping("updateStatus") |
|
|
|
@RequiresPermissions("sys:user:update") |
|
|
|
@SystemControllerLog(description = "用户管理-起停用户") |
|
|
|
public ResultData modifyStatus(@RequestBody MallUserInfo userInfo) { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::modifyStatus"); |
|
|
|
@@ -273,6 +271,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@ApiOperation(value = "用户权限检查") |
|
|
|
@GetMapping("hasButtonPermission") |
|
|
|
@SystemControllerLog(description = "用户管理-用户权限检查") |
|
|
|
public ResultData hasButtonPermission(String permissions) { |
|
|
|
@@ -285,17 +284,12 @@ public class MallUserInfoController extends BaseController { |
|
|
|
boolean has = userInfoService.hasButtonPermission(userId, name); |
|
|
|
map.put(name, has); |
|
|
|
} |
|
|
|
// StringBuffer buffer = new StringBuffer(); |
|
|
|
// for(Entry<String, Boolean> entrySet :map.entrySet()){ |
|
|
|
// buffer.append("var "+entrySet.getKey()); |
|
|
|
// buffer.append("="+entrySet.getValue()); |
|
|
|
// buffer.append(";"); |
|
|
|
// } |
|
|
|
//return new ResultData(buffer.toString()); |
|
|
|
return new ResultData(map); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "用户权限检查") |
|
|
|
@GetMapping("getUser") |
|
|
|
@RequiresPermissions("sys:user:info") |
|
|
|
@SystemControllerLog(description = "用户管理-用户信息") |
|
|
|
public ResultData getUserInfo() { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::getUserInfo"); |
|
|
|
@@ -345,6 +339,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
return new ResultData(info); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "用户密码发送验证码") |
|
|
|
@GetMapping("sendvalidationcode") |
|
|
|
@ApiImplicitParams({ |
|
|
|
@ApiImplicitParam(name = "userName", value = "手机号", dataType = "String", paramType = "query", required = true), |
|
|
|
@@ -419,6 +414,7 @@ public class MallUserInfoController extends BaseController { |
|
|
|
|
|
|
|
@ApiOperation(value = "审批权限用户列表", response = String.class) |
|
|
|
@GetMapping("getFlowPermissionList") |
|
|
|
@RequiresPermissions("sys:user:flowlist") |
|
|
|
@SystemControllerLog(description = "用户管理-审批权限用户列表") |
|
|
|
public ResultData getFlowPermissionList() { |
|
|
|
logger.debug("[" + getIpAddr() + "] MallUserInfoController::getFlowPermissionList"); |