From 950beeb5e253bbc89cba74b1f396797cec8c831d Mon Sep 17 00:00:00 2001 From: gxwebsoft Date: Thu, 2 Nov 2023 11:41:18 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=8B=E9=9A=86=E7=A7=9F=E6=88=B7=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0=E9=BB=98=E8=AE=A4=E5=80=BC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../system/controller/AppController.java | 139 ++++++++++++ .../system/controller/AppUrlController.java | 134 +++++++++++ .../system/controller/AppUserController.java | 139 ++++++++++++ .../system/controller/CompanyController.java | 1 + .../system/controller/MainController.java | 2 + .../system/controller/UserController.java | 6 +- .../controller/UserGroupController.java | 133 +++++++++++ .../gxwebsoft/common/system/entity/App.java | 212 +++++++++++++++++ .../common/system/entity/AppUrl.java | 53 +++++ .../common/system/entity/AppUser.java | 50 ++++ .../common/system/entity/Company.java | 15 +- .../gxwebsoft/common/system/entity/User.java | 7 + .../common/system/entity/UserGroup.java | 58 +++++ .../common/system/mapper/AppMapper.java | 37 +++ .../common/system/mapper/AppUrlMapper.java | 37 +++ .../common/system/mapper/AppUserMapper.java | 37 +++ .../common/system/mapper/UserGroupMapper.java | 37 +++ .../common/system/mapper/xml/AppMapper.xml | 203 +++++++++++++++++ .../common/system/mapper/xml/AppUrlMapper.xml | 47 ++++ .../system/mapper/xml/AppUserMapper.xml | 44 ++++ .../system/mapper/xml/UserGroupMapper.xml | 50 ++++ .../common/system/mapper/xml/UserMapper.xml | 6 + .../common/system/param/AppParam.java | 214 ++++++++++++++++++ .../common/system/param/AppUrlParam.java | 46 ++++ .../common/system/param/AppUserParam.java | 45 ++++ .../common/system/param/UserGroupParam.java | 47 ++++ .../common/system/param/UserParam.java | 8 + .../common/system/service/AppService.java | 42 ++++ .../common/system/service/AppUrlService.java | 42 ++++ .../common/system/service/AppUserService.java | 42 ++++ .../system/service/UserGroupService.java | 42 ++++ .../system/service/impl/AppServiceImpl.java | 47 ++++ .../service/impl/AppUrlServiceImpl.java | 47 ++++ .../service/impl/AppUserServiceImpl.java | 47 ++++ .../service/impl/DictDataServiceImpl.java | 4 +- .../system/service/impl/MenuServiceImpl.java | 12 +- .../service/impl/UserGroupServiceImpl.java | 47 ++++ src/main/resources/application.yml | 4 +- .../com/gxwebsoft/generator/SysGenerator.java | 8 +- 39 files changed, 2170 insertions(+), 21 deletions(-) create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AppController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/controller/UserGroupController.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/App.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/AppUrl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/AppUser.java create mode 100644 src/main/java/com/gxwebsoft/common/system/entity/UserGroup.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/AppMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/AppUrlMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/AppUserMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/UserGroupMapper.java create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/AppMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUrlMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUserMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/mapper/xml/UserGroupMapper.xml create mode 100644 src/main/java/com/gxwebsoft/common/system/param/AppParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/AppUrlParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/AppUserParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/param/UserGroupParam.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AppService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AppUrlService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/AppUserService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/UserGroupService.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/AppServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/AppUrlServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/AppUserServiceImpl.java create mode 100644 src/main/java/com/gxwebsoft/common/system/service/impl/UserGroupServiceImpl.java diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AppController.java b/src/main/java/com/gxwebsoft/common/system/controller/AppController.java new file mode 100644 index 0000000..526c7a4 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/AppController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.common.system.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.AppService; +import com.gxwebsoft.common.system.entity.App; +import com.gxwebsoft.common.system.param.AppParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 应用管理记录表控制器 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Api(tags = "应用管理记录表管理") +@RestController +@RequestMapping("/api/system/app") +public class AppController extends BaseController { + @Resource + private AppService appService; + + @PreAuthorize("hasAuthority('sys:app:list')") + @OperationLog + @ApiOperation("分页查询应用管理记录表") + @GetMapping("/page") + public ApiResult> page(AppParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(appService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:app:list')") + @OperationLog + @ApiOperation("查询全部应用管理记录表") + @GetMapping() + public ApiResult> list(AppParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(appService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:app:list')") + @OperationLog + @ApiOperation("根据id查询应用管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(appService.getById(id)); + // 使用关联查询 + //return success(appService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:app:save')") + @OperationLog + @ApiOperation("添加应用管理记录表") + @PostMapping() + public ApiResult save(@RequestBody App app) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + app.setUserId(loginUser.getUserId()); + } + if (appService.save(app)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:app:update')") + @OperationLog + @ApiOperation("修改应用管理记录表") + @PutMapping() + public ApiResult update(@RequestBody App app) { + if (appService.updateById(app)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:app:remove')") + @OperationLog + @ApiOperation("删除应用管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (appService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:app:save')") + @OperationLog + @ApiOperation("批量添加应用管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (appService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:app:update')") + @OperationLog + @ApiOperation("批量修改应用管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(appService, "app_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:app:remove')") + @OperationLog + @ApiOperation("批量删除应用管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (appService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java b/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java new file mode 100644 index 0000000..e7be7af --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/AppUrlController.java @@ -0,0 +1,134 @@ +package com.gxwebsoft.common.system.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.AppUrlService; +import com.gxwebsoft.common.system.entity.AppUrl; +import com.gxwebsoft.common.system.param.AppUrlParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 域名管理记录表控制器 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Api(tags = "域名管理记录表管理") +@RestController +@RequestMapping("/api/system/app-url") +public class AppUrlController extends BaseController { + @Resource + private AppUrlService appUrlService; + + @PreAuthorize("hasAuthority('sys:appUrl:list')") + @OperationLog + @ApiOperation("分页查询域名管理记录表") + @GetMapping("/page") + public ApiResult> page(AppUrlParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUrlService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(appUrlService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:appUrl:list')") + @OperationLog + @ApiOperation("查询全部域名管理记录表") + @GetMapping() + public ApiResult> list(AppUrlParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUrlService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(appUrlService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:appUrl:list')") + @OperationLog + @ApiOperation("根据id查询域名管理记录表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(appUrlService.getById(id)); + // 使用关联查询 + //return success(appUrlService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:appUrl:save')") + @OperationLog + @ApiOperation("添加域名管理记录表") + @PostMapping() + public ApiResult save(@RequestBody AppUrl appUrl) { + if (appUrlService.save(appUrl)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:appUrl:update')") + @OperationLog + @ApiOperation("修改域名管理记录表") + @PutMapping() + public ApiResult update(@RequestBody AppUrl appUrl) { + if (appUrlService.updateById(appUrl)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:appUrl:remove')") + @OperationLog + @ApiOperation("删除域名管理记录表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (appUrlService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:appUrl:save')") + @OperationLog + @ApiOperation("批量添加域名管理记录表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (appUrlService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:appUrl:update')") + @OperationLog + @ApiOperation("批量修改域名管理记录表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(appUrlService, "app_url_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:appUrl:remove')") + @OperationLog + @ApiOperation("批量删除域名管理记录表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (appUrlService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java b/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java new file mode 100644 index 0000000..ae625c1 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/AppUserController.java @@ -0,0 +1,139 @@ +package com.gxwebsoft.common.system.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.entity.User; +import com.gxwebsoft.common.system.service.AppUserService; +import com.gxwebsoft.common.system.entity.AppUser; +import com.gxwebsoft.common.system.param.AppUserParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 应用成员控制器 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Api(tags = "应用成员管理") +@RestController +@RequestMapping("/api/system/app-user") +public class AppUserController extends BaseController { + @Resource + private AppUserService appUserService; + + @PreAuthorize("hasAuthority('sys:appUser:list')") + @OperationLog + @ApiOperation("分页查询应用成员") + @GetMapping("/page") + public ApiResult> page(AppUserParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUserService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(appUserService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:appUser:list')") + @OperationLog + @ApiOperation("查询全部应用成员") + @GetMapping() + public ApiResult> list(AppUserParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(appUserService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(appUserService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:appUser:list')") + @OperationLog + @ApiOperation("根据id查询应用成员") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(appUserService.getById(id)); + // 使用关联查询 + //return success(appUserService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:appUser:save')") + @OperationLog + @ApiOperation("添加应用成员") + @PostMapping() + public ApiResult save(@RequestBody AppUser appUser) { + // 记录当前登录用户id + User loginUser = getLoginUser(); + if (loginUser != null) { + appUser.setUserId(loginUser.getUserId()); + } + if (appUserService.save(appUser)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:appUser:update')") + @OperationLog + @ApiOperation("修改应用成员") + @PutMapping() + public ApiResult update(@RequestBody AppUser appUser) { + if (appUserService.updateById(appUser)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:appUser:remove')") + @OperationLog + @ApiOperation("删除应用成员") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (appUserService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:appUser:save')") + @OperationLog + @ApiOperation("批量添加应用成员") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (appUserService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:appUser:update')") + @OperationLog + @ApiOperation("批量修改应用成员") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(appUserService, "app_user_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:appUser:remove')") + @OperationLog + @ApiOperation("批量删除应用成员") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (appUserService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java index 573453e..dc335f8 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/CompanyController.java @@ -1,5 +1,6 @@ package com.gxwebsoft.common.system.controller; +import cn.hutool.core.lang.Validator; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.gxwebsoft.common.core.annotation.OperationLog; import com.gxwebsoft.common.core.exception.BusinessException; diff --git a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java index b7913f1..8cd946a 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/MainController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/MainController.java @@ -510,6 +510,8 @@ public class MainController extends BaseController { company.setCompanyLogo("/logo.svg"); company.setPhone(phone); company.setMembers(20); + company.setServerUrl("https://server.gxwebosoft.com"); + company.setModulesUrl("https://modules.gxwebosoft.com"); company.setVersion(10); company.setIndustryParent(""); company.setIndustryChild(""); diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java index 1ea0962..5120d2e 100644 --- a/src/main/java/com/gxwebsoft/common/system/controller/UserController.java +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserController.java @@ -55,7 +55,7 @@ public class UserController extends BaseController { @Resource private DictionaryDataService dictionaryDataService; - @PreAuthorize("hasAuthority('sys:user:list')") + @PreAuthorize("hasAuthority('sys:auth:user')") @OperationLog @ApiOperation("分页查询用户") @GetMapping("/page") @@ -63,7 +63,7 @@ public class UserController extends BaseController { return success(userService.pageRel(param)); } - @PreAuthorize("hasAuthority('sys:user:list')") + @PreAuthorize("hasAuthority('sys:auth:user')") @OperationLog @ApiOperation("查询全部用户") @GetMapping() @@ -71,7 +71,7 @@ public class UserController extends BaseController { return success(userService.listRel(param)); } - @PreAuthorize("hasAuthority('sys:user:list')") + @PreAuthorize("hasAuthority('sys:auth:user')") @OperationLog @ApiOperation("根据id查询用户") @GetMapping("/{id}") diff --git a/src/main/java/com/gxwebsoft/common/system/controller/UserGroupController.java b/src/main/java/com/gxwebsoft/common/system/controller/UserGroupController.java new file mode 100644 index 0000000..b851e61 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/controller/UserGroupController.java @@ -0,0 +1,133 @@ +package com.gxwebsoft.common.system.controller; + +import com.gxwebsoft.common.core.web.BaseController; +import com.gxwebsoft.common.system.service.UserGroupService; +import com.gxwebsoft.common.system.entity.UserGroup; +import com.gxwebsoft.common.system.param.UserGroupParam; +import com.gxwebsoft.common.core.web.ApiResult; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.BatchParam; +import com.gxwebsoft.common.core.annotation.OperationLog; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import org.springframework.security.access.prepost.PreAuthorize; +import org.springframework.web.bind.annotation.*; + +import javax.annotation.Resource; +import java.util.List; + +/** + * 用户分组管理表控制器 + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +@Api(tags = "用户分组管理表管理") +@RestController +@RequestMapping("/api/system/user-group") +public class UserGroupController extends BaseController { + @Resource + private UserGroupService userGroupService; + + @PreAuthorize("hasAuthority('sys:userGroup:list')") + @OperationLog + @ApiOperation("分页查询用户分组管理表") + @GetMapping("/page") + public ApiResult> page(UserGroupParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userGroupService.page(page, page.getWrapper())); + // 使用关联查询 + //return success(userGroupService.pageRel(param)); + } + + @PreAuthorize("hasAuthority('sys:userGroup:list')") + @OperationLog + @ApiOperation("查询全部用户分组管理表") + @GetMapping() + public ApiResult> list(UserGroupParam param) { + PageParam page = new PageParam<>(param); + page.setDefaultOrder("create_time desc"); + return success(userGroupService.list(page.getOrderWrapper())); + // 使用关联查询 + //return success(userGroupService.listRel(param)); + } + + @PreAuthorize("hasAuthority('sys:userGroup:list')") + @OperationLog + @ApiOperation("根据id查询用户分组管理表") + @GetMapping("/{id}") + public ApiResult get(@PathVariable("id") Integer id) { + return success(userGroupService.getById(id)); + // 使用关联查询 + //return success(userGroupService.getByIdRel(id)); + } + + @PreAuthorize("hasAuthority('sys:userGroup:save')") + @OperationLog + @ApiOperation("添加用户分组管理表") + @PostMapping() + public ApiResult save(@RequestBody UserGroup userGroup) { + if (userGroupService.save(userGroup)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:userGroup:update')") + @OperationLog + @ApiOperation("修改用户分组管理表") + @PutMapping() + public ApiResult update(@RequestBody UserGroup userGroup) { + if (userGroupService.updateById(userGroup)) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:userGroup:remove')") + @OperationLog + @ApiOperation("删除用户分组管理表") + @DeleteMapping("/{id}") + public ApiResult remove(@PathVariable("id") Integer id) { + if (userGroupService.removeById(id)) { + return success("删除成功"); + } + return fail("删除失败"); + } + + @PreAuthorize("hasAuthority('sys:userGroup:save')") + @OperationLog + @ApiOperation("批量添加用户分组管理表") + @PostMapping("/batch") + public ApiResult saveBatch(@RequestBody List list) { + if (userGroupService.saveBatch(list)) { + return success("添加成功"); + } + return fail("添加失败"); + } + + @PreAuthorize("hasAuthority('sys:userGroup:update')") + @OperationLog + @ApiOperation("批量修改用户分组管理表") + @PutMapping("/batch") + public ApiResult removeBatch(@RequestBody BatchParam batchParam) { + if (batchParam.update(userGroupService, "group_id")) { + return success("修改成功"); + } + return fail("修改失败"); + } + + @PreAuthorize("hasAuthority('sys:userGroup:remove')") + @OperationLog + @ApiOperation("批量删除用户分组管理表") + @DeleteMapping("/batch") + public ApiResult removeBatch(@RequestBody List ids) { + if (userGroupService.removeByIds(ids)) { + return success("删除成功"); + } + return fail("删除失败"); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/App.java b/src/main/java/com/gxwebsoft/common/system/entity/App.java new file mode 100644 index 0000000..0cb5377 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/App.java @@ -0,0 +1,212 @@ +package com.gxwebsoft.common.system.entity; + +import java.math.BigDecimal; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 应用管理记录表 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "App对象", description = "应用管理记录表") +@TableName("sys_app") +public class App implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "应用ID") + @TableId(value = "app_id", type = IdType.AUTO) + private Integer appId; + + @ApiModelProperty(value = "应用名称") + private String appName; + + @ApiModelProperty(value = "应用标识") + private String appCode; + + @ApiModelProperty(value = "上级id, 0是顶级") + private Integer parentId; + + @ApiModelProperty(value = "应用类型") + private String appType; + + @ApiModelProperty(value = "应用类型") + private String appTypeMultiple; + + @ApiModelProperty(value = "类型, 0菜单, 1按钮") + private Integer menuType; + + @ApiModelProperty(value = "企业ID") + private Integer companyId; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "应用图标") + private String appIcon; + + @ApiModelProperty(value = "二维码") + private String appQrcode; + + @ApiModelProperty(value = "链接地址") + private String appUrl; + + @ApiModelProperty(value = "后台管理地址") + private String adminUrl; + + @ApiModelProperty(value = "下载地址") + private String downUrl; + + @ApiModelProperty(value = "链接地址") + private String serverUrl; + + @ApiModelProperty(value = "文件服务器") + private String fileUrl; + + @ApiModelProperty(value = "回调地址") + private String callbackUrl; + + @ApiModelProperty(value = "腾讯文档地址") + private String docsUrl; + + @ApiModelProperty(value = "代码仓库地址") + private String gitUrl; + + @ApiModelProperty(value = "原型图地址") + private String prototypeUrl; + + @ApiModelProperty(value = "IP白名单") + private String ipAddress; + + @ApiModelProperty(value = "应用截图") + private String images; + + @ApiModelProperty(value = "应用包名") + private String packageName; + + @ApiModelProperty(value = "下载次数") + private Integer clicks; + + @ApiModelProperty(value = "安装次数") + private Integer installs; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "应用介绍") + private String content; + + @ApiModelProperty(value = "项目需求") + private String requirement; + + @ApiModelProperty(value = "开发者(个人或公司)") + private String developer; + + @ApiModelProperty(value = "项目负责人") + private String director; + + @ApiModelProperty(value = "项目经理") + private String projectDirector; + + @ApiModelProperty(value = "业务员") + private String salesman; + + @ApiModelProperty(value = "软件定价") + private BigDecimal price; + + @ApiModelProperty(value = "划线价格") + private BigDecimal linePrice; + + @ApiModelProperty(value = "评分") + private String score; + + @ApiModelProperty(value = "星级") + private String star; + + @ApiModelProperty(value = "菜单路由地址") + private String path; + + @ApiModelProperty(value = "菜单组件地址, 目录可为空") + private String component; + + @ApiModelProperty(value = "权限标识") + private String authority; + + @ApiModelProperty(value = "打开位置") + private String target; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + private Integer hide; + + @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") + private Integer search; + + @ApiModelProperty(value = "菜单侧栏选中的path") + private String active; + + @ApiModelProperty(value = "其它路由元信息") + private String meta; + + @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") + private String edition; + + @ApiModelProperty(value = "版本号") + private String version; + + @ApiModelProperty(value = "是否已安装") + private Integer isUse; + + @ApiModelProperty(value = "附近1") + private String file1; + + @ApiModelProperty(value = "附件2") + private String file2; + + @ApiModelProperty(value = "附件3") + private String file3; + + @ApiModelProperty(value = "应用状态") + private String appStatus; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "机构id") + private Integer organizationId; + + @ApiModelProperty(value = "租户编号") + private String tenantCode; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/AppUrl.java b/src/main/java/com/gxwebsoft/common/system/entity/AppUrl.java new file mode 100644 index 0000000..38bdae7 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/AppUrl.java @@ -0,0 +1,53 @@ +package com.gxwebsoft.common.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 域名管理记录表 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "AppUrl对象", description = "域名管理记录表") +@TableName("sys_app_url") +public class AppUrl implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "app_url_id", type = IdType.AUTO) + private Integer appUrlId; + + @ApiModelProperty(value = "应用ID") + private Integer appId; + + @ApiModelProperty(value = "域名类型") + private String type; + + @ApiModelProperty(value = "域名") + private String domain; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1待确认") + private Integer status; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/AppUser.java b/src/main/java/com/gxwebsoft/common/system/entity/AppUser.java new file mode 100644 index 0000000..1d8c757 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/AppUser.java @@ -0,0 +1,50 @@ +package com.gxwebsoft.common.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 应用成员 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "AppUser对象", description = "应用成员") +@TableName("sys_app_user") +public class AppUser implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @TableId(value = "app_user_id", type = IdType.AUTO) + private Integer appUserId; + + @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") + private Integer role; + + @ApiModelProperty(value = "用户ID") + private Integer userId; + + @ApiModelProperty(value = "应用ID") + private Integer appId; + + @ApiModelProperty(value = "状态, 0正常, 1待确认") + private Integer status; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/entity/Company.java b/src/main/java/com/gxwebsoft/common/system/entity/Company.java index ac10c78..3a4fb25 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/Company.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/Company.java @@ -127,18 +127,21 @@ public class Company implements Serializable { @ApiModelProperty(value = "是否实名认证") private Integer authentication; + @ApiModelProperty(value = "主控端节点") + private String serverUrl; + + @ApiModelProperty(value = "模块服务器节点") + private String modulesUrl; + + @ApiModelProperty(value = "重定向节点") + private String redirectUrl; + @ApiModelProperty(value = "request合法域名") private String requestUrl; @ApiModelProperty(value = "socket合法域名") private String socketUrl; - @ApiModelProperty(value = "主控端域名") - private String serverUrl; - - @ApiModelProperty(value = "业务域名") - private String modulesUrl; - @ApiModelProperty(value = "应用类型") private String appType; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/User.java b/src/main/java/com/gxwebsoft/common/system/entity/User.java index 45d4325..34f7219 100644 --- a/src/main/java/com/gxwebsoft/common/system/entity/User.java +++ b/src/main/java/com/gxwebsoft/common/system/entity/User.java @@ -122,6 +122,13 @@ public class User implements UserDetails { @ApiModelProperty("机构ID") private Integer organizationId; + @ApiModelProperty("会员分组ID") + private Integer groupId; + + @ApiModelProperty("会员分组") + @TableField(exist = false) + private String groupName; + @ApiModelProperty("客户ID") @TableField(exist = false) private Integer customerId; diff --git a/src/main/java/com/gxwebsoft/common/system/entity/UserGroup.java b/src/main/java/com/gxwebsoft/common/system/entity/UserGroup.java new file mode 100644 index 0000000..eef6c1b --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/entity/UserGroup.java @@ -0,0 +1,58 @@ +package com.gxwebsoft.common.system.entity; + +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import java.time.LocalDateTime; +import com.baomidou.mybatisplus.annotation.TableLogic; +import java.io.Serializable; +import java.util.Date; + +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户分组管理表 + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@ApiModel(value = "UserGroup对象", description = "用户分组管理表") +@TableName("sys_user_group") +public class UserGroup implements Serializable { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分组ID") + @TableId(value = "group_id", type = IdType.AUTO) + private Integer groupId; + + @ApiModelProperty(value = "分组名称") + private String name; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @TableLogic + private Integer deleted; + + @ApiModelProperty(value = "租户id") + private Integer tenantId; + + @ApiModelProperty(value = "注册时间") + private Date createTime; + + @ApiModelProperty(value = "修改时间") + private Date updateTime; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/AppMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/AppMapper.java new file mode 100644 index 0000000..8c01c25 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/AppMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.common.system.entity.App; +import com.gxwebsoft.common.system.param.AppParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 应用管理记录表Mapper + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") AppParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") AppParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/AppUrlMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/AppUrlMapper.java new file mode 100644 index 0000000..af3fedb --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/AppUrlMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.common.system.entity.AppUrl; +import com.gxwebsoft.common.system.param.AppUrlParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 域名管理记录表Mapper + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppUrlMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") AppUrlParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") AppUrlParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/AppUserMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/AppUserMapper.java new file mode 100644 index 0000000..e0b1967 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/AppUserMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.common.system.entity.AppUser; +import com.gxwebsoft.common.system.param.AppUserParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 应用成员Mapper + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppUserMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") AppUserParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") AppUserParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/UserGroupMapper.java b/src/main/java/com/gxwebsoft/common/system/mapper/UserGroupMapper.java new file mode 100644 index 0000000..8e38749 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/UserGroupMapper.java @@ -0,0 +1,37 @@ +package com.gxwebsoft.common.system.mapper; + +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.gxwebsoft.common.system.entity.UserGroup; +import com.gxwebsoft.common.system.param.UserGroupParam; +import org.apache.ibatis.annotations.Param; + +import java.util.List; + +/** + * 用户分组管理表Mapper + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +public interface UserGroupMapper extends BaseMapper { + + /** + * 分页查询 + * + * @param page 分页对象 + * @param param 查询参数 + * @return List + */ + List selectPageRel(@Param("page") IPage page, + @Param("param") UserGroupParam param); + + /** + * 查询全部 + * + * @param param 查询参数 + * @return List + */ + List selectListRel(@Param("param") UserGroupParam param); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppMapper.xml new file mode 100644 index 0000000..2156a9d --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppMapper.xml @@ -0,0 +1,203 @@ + + + + + + + SELECT a.* + FROM sys_app a + + + AND a.app_id = #{param.appId} + + + AND a.app_name LIKE CONCAT('%', #{param.appName}, '%') + + + AND a.app_code LIKE CONCAT('%', #{param.appCode}, '%') + + + AND a.parent_id = #{param.parentId} + + + AND a.app_type LIKE CONCAT('%', #{param.appType}, '%') + + + AND a.app_type_multiple LIKE CONCAT('%', #{param.appTypeMultiple}, '%') + + + AND a.menu_type = #{param.menuType} + + + AND a.company_id = #{param.companyId} + + + AND a.company_name LIKE CONCAT('%', #{param.companyName}, '%') + + + AND a.app_icon LIKE CONCAT('%', #{param.appIcon}, '%') + + + AND a.app_qrcode LIKE CONCAT('%', #{param.appQrcode}, '%') + + + AND a.app_url LIKE CONCAT('%', #{param.appUrl}, '%') + + + AND a.admin_url LIKE CONCAT('%', #{param.adminUrl}, '%') + + + AND a.down_url LIKE CONCAT('%', #{param.downUrl}, '%') + + + AND a.server_url LIKE CONCAT('%', #{param.serverUrl}, '%') + + + AND a.file_url LIKE CONCAT('%', #{param.fileUrl}, '%') + + + AND a.callback_url LIKE CONCAT('%', #{param.callbackUrl}, '%') + + + AND a.docs_url LIKE CONCAT('%', #{param.docsUrl}, '%') + + + AND a.git_url LIKE CONCAT('%', #{param.gitUrl}, '%') + + + AND a.prototype_url LIKE CONCAT('%', #{param.prototypeUrl}, '%') + + + AND a.ip_address LIKE CONCAT('%', #{param.ipAddress}, '%') + + + AND a.images LIKE CONCAT('%', #{param.images}, '%') + + + AND a.package_name LIKE CONCAT('%', #{param.packageName}, '%') + + + AND a.clicks = #{param.clicks} + + + AND a.installs = #{param.installs} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.content LIKE CONCAT('%', #{param.content}, '%') + + + AND a.requirement LIKE CONCAT('%', #{param.requirement}, '%') + + + AND a.developer LIKE CONCAT('%', #{param.developer}, '%') + + + AND a.director LIKE CONCAT('%', #{param.director}, '%') + + + AND a.project_director LIKE CONCAT('%', #{param.projectDirector}, '%') + + + AND a.salesman LIKE CONCAT('%', #{param.salesman}, '%') + + + AND a.price = #{param.price} + + + AND a.line_price = #{param.linePrice} + + + AND a.score LIKE CONCAT('%', #{param.score}, '%') + + + AND a.star LIKE CONCAT('%', #{param.star}, '%') + + + AND a.path LIKE CONCAT('%', #{param.path}, '%') + + + AND a.component LIKE CONCAT('%', #{param.component}, '%') + + + AND a.authority LIKE CONCAT('%', #{param.authority}, '%') + + + AND a.target LIKE CONCAT('%', #{param.target}, '%') + + + AND a.hide = #{param.hide} + + + AND a.search = #{param.search} + + + AND a.active LIKE CONCAT('%', #{param.active}, '%') + + + AND a.meta LIKE CONCAT('%', #{param.meta}, '%') + + + AND a.edition LIKE CONCAT('%', #{param.edition}, '%') + + + AND a.version LIKE CONCAT('%', #{param.version}, '%') + + + AND a.is_use = #{param.isUse} + + + AND a.file1 LIKE CONCAT('%', #{param.file1}, '%') + + + AND a.file2 LIKE CONCAT('%', #{param.file2}, '%') + + + AND a.file3 LIKE CONCAT('%', #{param.file3}, '%') + + + AND a.app_status LIKE CONCAT('%', #{param.appStatus}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.status = #{param.status} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.user_id = #{param.userId} + + + AND a.organization_id = #{param.organizationId} + + + AND a.tenant_code LIKE CONCAT('%', #{param.tenantCode}, '%') + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUrlMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUrlMapper.xml new file mode 100644 index 0000000..77d51fe --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUrlMapper.xml @@ -0,0 +1,47 @@ + + + + + + + SELECT a.* + FROM sys_app_url a + + + AND a.app_url_id = #{param.appUrlId} + + + AND a.app_id = #{param.appId} + + + AND a.type LIKE CONCAT('%', #{param.type}, '%') + + + AND a.domain LIKE CONCAT('%', #{param.domain}, '%') + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.status = #{param.status} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUserMapper.xml new file mode 100644 index 0000000..225d7d9 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/AppUserMapper.xml @@ -0,0 +1,44 @@ + + + + + + + SELECT a.* + FROM sys_app_user a + + + AND a.app_user_id = #{param.appUserId} + + + AND a.role = #{param.role} + + + AND a.user_id = #{param.userId} + + + AND a.app_id = #{param.appId} + + + AND a.status = #{param.status} + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserGroupMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserGroupMapper.xml new file mode 100644 index 0000000..8a59e29 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserGroupMapper.xml @@ -0,0 +1,50 @@ + + + + + + + SELECT a.* + FROM sys_user_group a + + + AND a.group_id = #{param.groupId} + + + AND a.name LIKE CONCAT('%', #{param.name}, '%') + + + AND a.sort_number = #{param.sortNumber} + + + AND a.comments LIKE CONCAT('%', #{param.comments}, '%') + + + AND a.status = #{param.status} + + + AND a.deleted = #{param.deleted} + + + AND a.deleted = 0 + + + AND a.create_time >= #{param.createTimeStart} + + + AND a.create_time <= #{param.createTimeEnd} + + + + + + + + + + + diff --git a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml index 13b9a9a..3da9850 100644 --- a/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml +++ b/src/main/java/com/gxwebsoft/common/system/mapper/xml/UserMapper.xml @@ -81,6 +81,9 @@ AND a.organization_id = #{param.organizationId} + + AND a.group_id = #{param.groupId} + AND a.organization_id > 0 @@ -108,6 +111,9 @@ AND a.user_id IN (SELECT user_id FROM sys_user_role WHERE role_id=#{param.roleId}) + + AND a.user_id IN (SELECT user_id FROM sys_user_role WHERE role_code=#{param.roleCode}) + AND a.user_id IN diff --git a/src/main/java/com/gxwebsoft/common/system/param/AppParam.java b/src/main/java/com/gxwebsoft/common/system/param/AppParam.java new file mode 100644 index 0000000..3213973 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/AppParam.java @@ -0,0 +1,214 @@ +package com.gxwebsoft.common.system.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +import java.math.BigDecimal; + +/** + * 应用管理记录表查询参数 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "AppParam对象", description = "应用管理记录表查询参数") +public class AppParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "应用ID") + @QueryField(type = QueryType.EQ) + private Integer appId; + + @ApiModelProperty(value = "应用名称") + private String appName; + + @ApiModelProperty(value = "应用标识") + private String appCode; + + @ApiModelProperty(value = "上级id, 0是顶级") + @QueryField(type = QueryType.EQ) + private Integer parentId; + + @ApiModelProperty(value = "应用类型") + private String appType; + + @ApiModelProperty(value = "应用类型") + private String appTypeMultiple; + + @ApiModelProperty(value = "类型, 0菜单, 1按钮") + @QueryField(type = QueryType.EQ) + private Integer menuType; + + @ApiModelProperty(value = "企业ID") + @QueryField(type = QueryType.EQ) + private Integer companyId; + + @ApiModelProperty(value = "企业名称") + private String companyName; + + @ApiModelProperty(value = "应用图标") + private String appIcon; + + @ApiModelProperty(value = "二维码") + private String appQrcode; + + @ApiModelProperty(value = "链接地址") + private String appUrl; + + @ApiModelProperty(value = "后台管理地址") + private String adminUrl; + + @ApiModelProperty(value = "下载地址") + private String downUrl; + + @ApiModelProperty(value = "链接地址") + private String serverUrl; + + @ApiModelProperty(value = "文件服务器") + private String fileUrl; + + @ApiModelProperty(value = "回调地址") + private String callbackUrl; + + @ApiModelProperty(value = "腾讯文档地址") + private String docsUrl; + + @ApiModelProperty(value = "代码仓库地址") + private String gitUrl; + + @ApiModelProperty(value = "原型图地址") + private String prototypeUrl; + + @ApiModelProperty(value = "IP白名单") + private String ipAddress; + + @ApiModelProperty(value = "应用截图") + private String images; + + @ApiModelProperty(value = "应用包名") + private String packageName; + + @ApiModelProperty(value = "下载次数") + @QueryField(type = QueryType.EQ) + private Integer clicks; + + @ApiModelProperty(value = "安装次数") + @QueryField(type = QueryType.EQ) + private Integer installs; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "应用介绍") + private String content; + + @ApiModelProperty(value = "项目需求") + private String requirement; + + @ApiModelProperty(value = "开发者(个人或公司)") + private String developer; + + @ApiModelProperty(value = "项目负责人") + private String director; + + @ApiModelProperty(value = "项目经理") + private String projectDirector; + + @ApiModelProperty(value = "业务员") + private String salesman; + + @ApiModelProperty(value = "软件定价") + @QueryField(type = QueryType.EQ) + private BigDecimal price; + + @ApiModelProperty(value = "划线价格") + @QueryField(type = QueryType.EQ) + private BigDecimal linePrice; + + @ApiModelProperty(value = "评分") + private String score; + + @ApiModelProperty(value = "星级") + private String star; + + @ApiModelProperty(value = "菜单路由地址") + private String path; + + @ApiModelProperty(value = "菜单组件地址, 目录可为空") + private String component; + + @ApiModelProperty(value = "权限标识") + private String authority; + + @ApiModelProperty(value = "打开位置") + private String target; + + @ApiModelProperty(value = "是否隐藏, 0否, 1是(仅注册路由不显示在左侧菜单)") + @QueryField(type = QueryType.EQ) + private Integer hide; + + @ApiModelProperty(value = "禁止搜索，1禁止 0 允许") + @QueryField(type = QueryType.EQ) + private Integer search; + + @ApiModelProperty(value = "菜单侧栏选中的path") + private String active; + + @ApiModelProperty(value = "其它路由元信息") + private String meta; + + @ApiModelProperty(value = "版本，0正式版 1体验版 2开发版") + private String edition; + + @ApiModelProperty(value = "版本号") + private String version; + + @ApiModelProperty(value = "是否已安装") + @QueryField(type = QueryType.EQ) + private Integer isUse; + + @ApiModelProperty(value = "附近1") + private String file1; + + @ApiModelProperty(value = "附件2") + private String file2; + + @ApiModelProperty(value = "附件3") + private String file3; + + @ApiModelProperty(value = "应用状态") + private String appStatus; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "机构id") + @QueryField(type = QueryType.EQ) + private Integer organizationId; + + @ApiModelProperty(value = "租户编号") + private String tenantCode; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/AppUrlParam.java b/src/main/java/com/gxwebsoft/common/system/param/AppUrlParam.java new file mode 100644 index 0000000..dc33a61 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/AppUrlParam.java @@ -0,0 +1,46 @@ +package com.gxwebsoft.common.system.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 域名管理记录表查询参数 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "AppUrlParam对象", description = "域名管理记录表查询参数") +public class AppUrlParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer appUrlId; + + @ApiModelProperty(value = "应用ID") + @QueryField(type = QueryType.EQ) + private Integer appId; + + @ApiModelProperty(value = "域名类型") + private String type; + + @ApiModelProperty(value = "域名") + private String domain; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1待确认") + @QueryField(type = QueryType.EQ) + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/AppUserParam.java b/src/main/java/com/gxwebsoft/common/system/param/AppUserParam.java new file mode 100644 index 0000000..e466c45 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/AppUserParam.java @@ -0,0 +1,45 @@ +package com.gxwebsoft.common.system.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 应用成员查询参数 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "AppUserParam对象", description = "应用成员查询参数") +public class AppUserParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "自增ID") + @QueryField(type = QueryType.EQ) + private Integer appUserId; + + @ApiModelProperty(value = "角色，10体验成员 20开发者成员 30管理员 ") + @QueryField(type = QueryType.EQ) + private Integer role; + + @ApiModelProperty(value = "用户ID") + @QueryField(type = QueryType.EQ) + private Integer userId; + + @ApiModelProperty(value = "应用ID") + @QueryField(type = QueryType.EQ) + private Integer appId; + + @ApiModelProperty(value = "状态, 0正常, 1待确认") + @QueryField(type = QueryType.EQ) + private Integer status; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserGroupParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserGroupParam.java new file mode 100644 index 0000000..3f2bc36 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/param/UserGroupParam.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.param; + +import com.fasterxml.jackson.annotation.JsonInclude; +import com.gxwebsoft.common.core.annotation.QueryField; +import com.gxwebsoft.common.core.annotation.QueryType; +import com.gxwebsoft.common.core.web.BaseParam; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; +import lombok.EqualsAndHashCode; + +/** + * 用户分组管理表查询参数 + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +@Data +@EqualsAndHashCode(callSuper = false) +@JsonInclude(JsonInclude.Include.NON_NULL) +@ApiModel(value = "UserGroupParam对象", description = "用户分组管理表查询参数") +public class UserGroupParam extends BaseParam { + private static final long serialVersionUID = 1L; + + @ApiModelProperty(value = "分组ID") + @QueryField(type = QueryType.EQ) + private Integer groupId; + + @ApiModelProperty(value = "分组名称") + private String name; + + @ApiModelProperty(value = "排序(数字越小越靠前)") + @QueryField(type = QueryType.EQ) + private Integer sortNumber; + + @ApiModelProperty(value = "备注") + private String comments; + + @ApiModelProperty(value = "状态, 0正常, 1冻结") + @QueryField(type = QueryType.EQ) + private Integer status; + + @ApiModelProperty(value = "是否删除, 0否, 1是") + @QueryField(type = QueryType.EQ) + private Integer deleted; + +} diff --git a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java index d4de53b..e03e36d 100644 --- a/src/main/java/com/gxwebsoft/common/system/param/UserParam.java +++ b/src/main/java/com/gxwebsoft/common/system/param/UserParam.java @@ -80,6 +80,10 @@ public class UserParam extends BaseParam { @QueryField(type = QueryType.EQ) private Integer organizationId; + @ApiModelProperty("用户分组ID") + @QueryField(type = QueryType.EQ) + private Integer groupId; + @ApiModelProperty("注册来源客户端") @QueryField(type = QueryType.EQ) private String platform; @@ -103,6 +107,10 @@ public class UserParam extends BaseParam { @TableField(exist = false) private Integer roleId; + @ApiModelProperty("角色标识") + @TableField(exist = false) + private String roleCode; + @ApiModelProperty(value = "所在省份") private String province; diff --git a/src/main/java/com/gxwebsoft/common/system/service/AppService.java b/src/main/java/com/gxwebsoft/common/system/service/AppService.java new file mode 100644 index 0000000..3b5233f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/AppService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.App; +import com.gxwebsoft.common.system.param.AppParam; + +import java.util.List; + +/** + * 应用管理记录表Service + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(AppParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(AppParam param); + + /** + * 根据id查询 + * + * @param appId 应用ID + * @return App + */ + App getByIdRel(Integer appId); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/AppUrlService.java b/src/main/java/com/gxwebsoft/common/system/service/AppUrlService.java new file mode 100644 index 0000000..a535b16 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/AppUrlService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.AppUrl; +import com.gxwebsoft.common.system.param.AppUrlParam; + +import java.util.List; + +/** + * 域名管理记录表Service + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppUrlService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(AppUrlParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(AppUrlParam param); + + /** + * 根据id查询 + * + * @param appUrlId 自增ID + * @return AppUrl + */ + AppUrl getByIdRel(Integer appUrlId); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/AppUserService.java b/src/main/java/com/gxwebsoft/common/system/service/AppUserService.java new file mode 100644 index 0000000..415da6a --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/AppUserService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.AppUser; +import com.gxwebsoft.common.system.param.AppUserParam; + +import java.util.List; + +/** + * 应用成员Service + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +public interface AppUserService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(AppUserParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(AppUserParam param); + + /** + * 根据id查询 + * + * @param appUserId 自增ID + * @return AppUser + */ + AppUser getByIdRel(Integer appUserId); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/UserGroupService.java b/src/main/java/com/gxwebsoft/common/system/service/UserGroupService.java new file mode 100644 index 0000000..d97b0aa --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/UserGroupService.java @@ -0,0 +1,42 @@ +package com.gxwebsoft.common.system.service; + +import com.baomidou.mybatisplus.extension.service.IService; +import com.gxwebsoft.common.core.web.PageResult; +import com.gxwebsoft.common.system.entity.UserGroup; +import com.gxwebsoft.common.system.param.UserGroupParam; + +import java.util.List; + +/** + * 用户分组管理表Service + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +public interface UserGroupService extends IService { + + /** + * 分页关联查询 + * + * @param param 查询参数 + * @return PageResult + */ + PageResult pageRel(UserGroupParam param); + + /** + * 关联查询全部 + * + * @param param 查询参数 + * @return List + */ + List listRel(UserGroupParam param); + + /** + * 根据id查询 + * + * @param groupId 分组ID + * @return UserGroup + */ + UserGroup getByIdRel(Integer groupId); + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/AppServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/AppServiceImpl.java new file mode 100644 index 0000000..7f97cdd --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/AppServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.AppMapper; +import com.gxwebsoft.common.system.service.AppService; +import com.gxwebsoft.common.system.entity.App; +import com.gxwebsoft.common.system.param.AppParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 应用管理记录表Service实现 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Service +public class AppServiceImpl extends ServiceImpl implements AppService { + + @Override + public PageResult pageRel(AppParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(AppParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public App getByIdRel(Integer appId) { + AppParam param = new AppParam(); + param.setAppId(appId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/AppUrlServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/AppUrlServiceImpl.java new file mode 100644 index 0000000..de53143 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/AppUrlServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.AppUrlMapper; +import com.gxwebsoft.common.system.service.AppUrlService; +import com.gxwebsoft.common.system.entity.AppUrl; +import com.gxwebsoft.common.system.param.AppUrlParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 域名管理记录表Service实现 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Service +public class AppUrlServiceImpl extends ServiceImpl implements AppUrlService { + + @Override + public PageResult pageRel(AppUrlParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(AppUrlParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public AppUrl getByIdRel(Integer appUrlId) { + AppUrlParam param = new AppUrlParam(); + param.setAppUrlId(appUrlId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/AppUserServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/AppUserServiceImpl.java new file mode 100644 index 0000000..ab9add5 --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/AppUserServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.AppUserMapper; +import com.gxwebsoft.common.system.service.AppUserService; +import com.gxwebsoft.common.system.entity.AppUser; +import com.gxwebsoft.common.system.param.AppUserParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 应用成员Service实现 + * + * @author 科技小王子 + * @since 2023-10-30 22:20:23 + */ +@Service +public class AppUserServiceImpl extends ServiceImpl implements AppUserService { + + @Override + public PageResult pageRel(AppUserParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(AppUserParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public AppUser getByIdRel(Integer appUserId) { + AppUserParam param = new AppUserParam(); + param.setAppUserId(appUserId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java index e30a0fe..5ed06a5 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/DictDataServiceImpl.java @@ -25,14 +25,14 @@ public class DictDataServiceImpl extends ServiceImpl @Override public PageResult pageRel(DictDataParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); + page.setDefaultOrder("sort_number asc, create_time asc"); return new PageResult<>(baseMapper.selectPageRel(page, param), page.getTotal()); } @Override public List listRel(DictDataParam param) { PageParam page = new PageParam<>(param); - page.setDefaultOrder("sort_number"); + page.setDefaultOrder("sort_number asc, create_time asc"); return page.sortRecords(baseMapper.selectListRel(param)); } diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java index 77acbaf..c45b840 100644 --- a/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/MenuServiceImpl.java @@ -92,14 +92,14 @@ public class MenuServiceImpl extends ServiceImpl implements Me menu.setTitle(d.getTitle()); menu.setPath(d.getPath()); menu.setComponent(d.getComponent()); - menu.setModules(d.getModules()); - menu.setModulesUrl(d.getModulesUrl()); menu.setMenuType(d.getMenuType()); menu.setSortNumber(d.getSortNumber()); menu.setAuthority(d.getAuthority()); menu.setIcon(d.getIcon()); menu.setHide(d.getHide()); menu.setMeta(d.getMeta()); + menu.setModules(d.getModules()); + menu.setModulesUrl(d.getModulesUrl()); save(menu); this.plugMenuId = menu.getMenuId(); // 二级菜单 @@ -117,8 +117,8 @@ public class MenuServiceImpl extends ServiceImpl implements Me menu1.setIcon(d1.getIcon()); menu1.setHide(d1.getHide()); menu1.setMeta(d1.getMeta()); - menu1.setModules(d.getModules()); - menu1.setModulesUrl(d.getModulesUrl()); + menu1.setModules(d1.getModules()); + menu1.setModulesUrl(d1.getModulesUrl()); save(menu1); // 三级菜单 param.setParentId(d1.getMenuId()); @@ -135,8 +135,8 @@ public class MenuServiceImpl extends ServiceImpl implements Me menu2.setIcon(d2.getIcon()); menu2.setHide(d2.getHide()); menu2.setMeta(d2.getMeta()); - menu2.setModules(d.getModules()); - menu2.setModulesUrl(d.getModulesUrl()); + menu2.setModules(d2.getModules()); + menu2.setModulesUrl(d2.getModulesUrl()); save(menu2); }); }); diff --git a/src/main/java/com/gxwebsoft/common/system/service/impl/UserGroupServiceImpl.java b/src/main/java/com/gxwebsoft/common/system/service/impl/UserGroupServiceImpl.java new file mode 100644 index 0000000..dccaf0f --- /dev/null +++ b/src/main/java/com/gxwebsoft/common/system/service/impl/UserGroupServiceImpl.java @@ -0,0 +1,47 @@ +package com.gxwebsoft.common.system.service.impl; + +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.gxwebsoft.common.system.mapper.UserGroupMapper; +import com.gxwebsoft.common.system.service.UserGroupService; +import com.gxwebsoft.common.system.entity.UserGroup; +import com.gxwebsoft.common.system.param.UserGroupParam; +import com.gxwebsoft.common.core.web.PageParam; +import com.gxwebsoft.common.core.web.PageResult; +import org.springframework.stereotype.Service; + +import java.util.List; + +/** + * 用户分组管理表Service实现 + * + * @author 科技小王子 + * @since 2023-10-28 15:16:39 + */ +@Service +public class UserGroupServiceImpl extends ServiceImpl implements UserGroupService { + + @Override + public PageResult pageRel(UserGroupParam param) { + PageParam page = new PageParam<>(param); + //page.setDefaultOrder("create_time desc"); + List list = baseMapper.selectPageRel(page, param); + return new PageResult<>(list, page.getTotal()); + } + + @Override + public List listRel(UserGroupParam param) { + List list = baseMapper.selectListRel(param); + // 排序 + PageParam page = new PageParam<>(); + //page.setDefaultOrder("create_time desc"); + return page.sortRecords(list); + } + + @Override + public UserGroup getByIdRel(Integer groupId) { + UserGroupParam param = new UserGroupParam(); + param.setGroupId(groupId); + return param.getOne(baseMapper.selectListRel(param)); + } + +} diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d584b5b..e09dc16 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -1,9 +1,9 @@ # 端口 server: - port: 9099 + port: 9015 # socketIo socketio: - port: 9199 + port: 9191 # 多环境配置 spring: profiles: diff --git a/src/test/java/com/gxwebsoft/generator/SysGenerator.java b/src/test/java/com/gxwebsoft/generator/SysGenerator.java index b41ff51..3176488 100644 --- a/src/test/java/com/gxwebsoft/generator/SysGenerator.java +++ b/src/test/java/com/gxwebsoft/generator/SysGenerator.java @@ -57,8 +57,12 @@ public class SysGenerator { // "sys_plug" // "sys_plug_record", // "sys_modules" - "sys_chat_message", - "sys_chat_conversation" +// "sys_chat_message", +// "sys_chat_conversation" +// "sys_user_group" + "sys_app", + "sys_app_user", + "sys_app_url" }; // 需要去除的表前缀 private static final String[] TABLE_PREFIX = new String[]{