|
@@ -69,7 +69,6 @@ public class SysTenantController {
|
|
|
* @param req
|
|
* @param req
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- //@RequiresPermissions("system:tenant:list")
|
|
|
|
|
@PermissionData(pageComponent = "system/TenantList")
|
|
@PermissionData(pageComponent = "system/TenantList")
|
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/list", method = RequestMethod.GET)
|
|
|
public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
public Result<IPage<SysTenant>> queryPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
@@ -108,7 +107,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@GetMapping("/recycleBinPageList")
|
|
@GetMapping("/recycleBinPageList")
|
|
|
- //@RequiresPermissions("system:tenant:recycleBinPageList")
|
|
|
|
|
public Result<IPage<SysTenant>> recycleBinPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
public Result<IPage<SysTenant>> recycleBinPageList(SysTenant sysTenant, @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req){
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize, HttpServletRequest req){
|
|
|
Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
|
|
Result<IPage<SysTenant>> result = new Result<IPage<SysTenant>>();
|
|
@@ -124,7 +122,6 @@ public class SysTenantController {
|
|
|
* @param
|
|
* @param
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- //@RequiresPermissions("system:tenant:add")
|
|
|
|
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
|
@RequestMapping(value = "/add", method = RequestMethod.POST)
|
|
|
public Result<SysTenant> add(@RequestBody SysTenant sysTenant) {
|
|
public Result<SysTenant> add(@RequestBody SysTenant sysTenant) {
|
|
|
Result<SysTenant> result = new Result();
|
|
Result<SysTenant> result = new Result();
|
|
@@ -146,7 +143,6 @@ public class SysTenantController {
|
|
|
* @param
|
|
* @param
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- //@RequiresPermissions("system:tenant:edit")
|
|
|
|
|
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
|
@RequestMapping(value = "/edit", method ={RequestMethod.PUT, RequestMethod.POST})
|
|
|
public Result<SysTenant> edit(@RequestBody SysTenant tenant) {
|
|
public Result<SysTenant> edit(@RequestBody SysTenant tenant) {
|
|
|
Result<SysTenant> result = new Result();
|
|
Result<SysTenant> result = new Result();
|
|
@@ -169,7 +165,6 @@ public class SysTenantController {
|
|
|
* @param id
|
|
* @param id
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- //@RequiresPermissions("system:tenant:delete")
|
|
|
|
|
@RequestMapping(value = "/delete", method ={RequestMethod.DELETE, RequestMethod.POST})
|
|
@RequestMapping(value = "/delete", method ={RequestMethod.DELETE, RequestMethod.POST})
|
|
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
|
public Result<?> delete(@RequestParam(name="id",required=true) String id) {
|
|
|
//------------------------------------------------------------------
|
|
//------------------------------------------------------------------
|
|
@@ -197,7 +192,6 @@ public class SysTenantController {
|
|
|
* @param ids
|
|
* @param ids
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- //@RequiresPermissions("system:tenant:deleteBatch")
|
|
|
|
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
|
@RequestMapping(value = "/deleteBatch", method = RequestMethod.DELETE)
|
|
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
|
public Result<?> deleteBatch(@RequestParam(name="ids",required=true) String ids) {
|
|
|
Result<?> result = new Result<>();
|
|
Result<?> result = new Result<>();
|
|
@@ -307,7 +301,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@GetMapping(value = "/packList")
|
|
@GetMapping(value = "/packList")
|
|
|
- //@RequiresPermissions("system:tenant:packList")
|
|
|
|
|
public Result<IPage<SysTenantPack>> queryPackPageList(SysTenantPack sysTenantPack,
|
|
public Result<IPage<SysTenantPack>> queryPackPageList(SysTenantPack sysTenantPack,
|
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
@RequestParam(name = "pageNo", defaultValue = "1") Integer pageNo,
|
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@RequestParam(name = "pageSize", defaultValue = "10") Integer pageSize,
|
|
@@ -329,7 +322,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(value = "/addPackPermission")
|
|
@PostMapping(value = "/addPackPermission")
|
|
|
- //@RequiresPermissions("system:tenant:add:pack")
|
|
|
|
|
public Result<String> addPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
|
public Result<String> addPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
|
|
sysTenantPackService.addPackPermission(sysTenantPack);
|
|
sysTenantPackService.addPackPermission(sysTenantPack);
|
|
|
return Result.ok("创建租户产品包成功");
|
|
return Result.ok("创建租户产品包成功");
|
|
@@ -342,7 +334,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@PutMapping(value = "/editPackPermission")
|
|
@PutMapping(value = "/editPackPermission")
|
|
|
- //@RequiresPermissions("system:tenant:edit:pack")
|
|
|
|
|
public Result<String> editPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
|
public Result<String> editPackPermission(@RequestBody SysTenantPack sysTenantPack) {
|
|
|
sysTenantPackService.editPackPermission(sysTenantPack);
|
|
sysTenantPackService.editPackPermission(sysTenantPack);
|
|
|
return Result.ok("修改租户产品包成功");
|
|
return Result.ok("修改租户产品包成功");
|
|
@@ -355,7 +346,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@DeleteMapping("/deletePackPermissions")
|
|
@DeleteMapping("/deletePackPermissions")
|
|
|
- //@RequiresPermissions("system:tenant:delete:pack")
|
|
|
|
|
public Result<String> deletePackPermissions(@RequestParam(value = "ids") String ids) {
|
|
public Result<String> deletePackPermissions(@RequestParam(value = "ids") String ids) {
|
|
|
sysTenantPackService.deletePackPermissions(ids);
|
|
sysTenantPackService.deletePackPermissions(ids);
|
|
|
return Result.ok("删除租户产品包成功");
|
|
return Result.ok("删除租户产品包成功");
|
|
@@ -398,7 +388,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@PutMapping("/invitationUserJoin")
|
|
@PutMapping("/invitationUserJoin")
|
|
|
- //@RequiresPermissions("system:tenant:invitation:user")
|
|
|
|
|
public Result<String> invitationUserJoin(@RequestParam("ids") String ids, @RequestParam("phone") String phone){
|
|
public Result<String> invitationUserJoin(@RequestParam("ids") String ids, @RequestParam("phone") String phone){
|
|
|
sysTenantService.invitationUserJoin(ids,phone);
|
|
sysTenantService.invitationUserJoin(ids,phone);
|
|
|
return Result.ok("邀请用户成功");
|
|
return Result.ok("邀请用户成功");
|
|
@@ -413,7 +402,6 @@ public class SysTenantController {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
@RequestMapping(value = "/getTenantUserList", method = RequestMethod.GET)
|
|
@RequestMapping(value = "/getTenantUserList", method = RequestMethod.GET)
|
|
|
- //@RequiresPermissions("system:tenant:user:list")
|
|
|
|
|
public Result<IPage<SysUser>> getTenantUserList(SysUser user,
|
|
public Result<IPage<SysUser>> getTenantUserList(SysUser user,
|
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
|
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|
|
@RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
|