diff --git a/Dockerfile b/Dockerfile index e524a4a4aa..75a8b9cf20 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,11 +4,11 @@ ARG IMAGE_TAG RUN mkdir -p /opt/apps /opt/dataease/data/feature/full /opt/dataease/drivers /opt/dataease/plugins/default -ADD core/mapFiles/* /opt/dataease/data/feature/full/ +ADD core/mapFiles/full/ /opt/dataease/data/feature/full/ ADD core/drivers/* /opt/dataease/drivers/ -ADD plugins/default/* /opt/dataease/plugins/default/ +ADD plugins/default/ /opt/dataease/plugins/default/ ADD core/backend/target/backend-$IMAGE_TAG.jar /opt/apps diff --git a/README.md b/README.md index fd9336bc85..0af2e887db 100644 --- a/README.md +++ b/README.md @@ -53,16 +53,12 @@ DataEase 是开源的数据可视化分析工具，帮助用户快速分析数 Kylin

-> 更多数据源支持持续增加中... - ## DataEase 模板市场 - [模板市场](https://dataease.io/templates/) ![模板市场](https://dataease.io/images/templates/templates.gif) -> 更多优质模板持续增加中... - ## 快速开始 **在线体验** @@ -97,7 +93,7 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash - 图库：[Apache ECharts](https://github.com/apache/echarts)、[AntV](https://antv.vision/zh) - 后端：[Spring Boot](https://spring.io/projects/spring-boot) - 中间件：[MySQL](https://www.mysql.com/) -- 数据处理：[Kettle](https://github.com/pentaho/pentaho-kettle)、[Apache Doris](https://github.com/apache/incubator-doris/) +- 数据处理：[Kettle](https://github.com/pentaho/pentaho-kettle)、[Apache Doris](https://github.com/apache/doris/) - 基础设施：[Docker](https://www.docker.com/) ## Star History @@ -108,7 +104,6 @@ curl -sSL https://dataease.oss-cn-hangzhou.aliyuncs.com/quick_start.sh | bash [![FOSSA Status](https://app.fossa.com/api/projects/git%2Bgithub.com%2Fdataease%2Fdataease.svg?type=large)](https://app.fossa.com/projects/git%2Bgithub.com%2Fdataease%2Fdataease?ref=badge_large) - ## License Copyright (c) 2014-2023 [FIT2CLOUD 飞致云](https://fit2cloud.com/), All rights reserved. diff --git a/core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java b/core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java index a7737c4c3b..b675890c66 100644 --- a/core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java +++ b/core/backend/src/main/java/io/dataease/auth/aop/SqlInjectAop.java @@ -3,7 +3,7 @@ package io.dataease.auth.aop; import cn.hutool.core.util.ArrayUtil; import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.exception.DEException; -import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.plugins.common.request.KeywordRequest; import org.apache.commons.collections4.CollectionUtils; import org.apache.commons.lang3.StringUtils; import org.aspectj.lang.ProceedingJoinPoint; @@ -35,10 +35,10 @@ public class SqlInjectAop { if (args == null || args.length == 0) { return point.proceed(); } - BaseGridRequest request = null; + KeywordRequest request = null; for (int i = 0; i < args.length; i++) { - if (args[i] instanceof BaseGridRequest) { - request = (BaseGridRequest) args[i]; + if (args[i] instanceof KeywordRequest) { + request = (KeywordRequest) args[i]; break; } } diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java index a4a36265ee..3799547ebf 100644 --- a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java +++ b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskController.java @@ -8,8 +8,8 @@ import io.dataease.commons.constants.DePermissionType; import io.dataease.commons.constants.ResourceAuthLevel; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; +import io.dataease.controller.dataset.request.DatasetTaskGridRequest; import io.dataease.controller.request.dataset.DataSetTaskRequest; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.plugins.common.base.domain.DatasetTableTask; import io.dataease.service.dataset.DataSetTableTaskLogService; @@ -77,7 +77,7 @@ public class DataSetTableTaskController { @ApiOperation("分页查询") @PostMapping("/pageList/{goPage}/{pageSize}") - public Pager> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) { + public Pager> taskList(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody DatasetTaskGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); Pager> listPager = PageUtils.setPageInfo(page, dataSetTableTaskService.taskList4User(request)); diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java index 33608e5123..62e2cabc8e 100644 --- a/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java +++ b/core/backend/src/main/java/io/dataease/controller/dataset/DataSetTableTaskLogController.java @@ -4,16 +4,15 @@ import com.github.pagehelper.Page; import com.github.pagehelper.PageHelper; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.annotation.DePermission; -import io.dataease.plugins.common.base.domain.DatasetTableTaskLog; import io.dataease.commons.constants.DePermissionType; import io.dataease.commons.constants.ResourceAuthLevel; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; -import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.controller.dataset.request.DataSetTaskInstanceGridRequest; import io.dataease.dto.dataset.DataSetTaskLogDTO; +import io.dataease.plugins.common.base.domain.DatasetTableTaskLog; import io.dataease.service.dataset.DataSetTableTaskLogService; import io.swagger.annotations.Api; -import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.*; @@ -41,14 +40,14 @@ public class DataSetTableTaskLogController { @ApiOperation("分页查询") @PostMapping("list/{type}/{goPage}/{pageSize}") - public Pager> list(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { + public Pager> list(@RequestBody DataSetTaskInstanceGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type)); } @ApiOperation("分页查询") @PostMapping("listForDataset/{type}/{goPage}/{pageSize}") - public Pager> listForDataset(@RequestBody BaseGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { + public Pager> listForDataset(@RequestBody DataSetTaskInstanceGridRequest request, @PathVariable String type, @PathVariable int goPage, @PathVariable int pageSize) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, dataSetTableTaskLogService.listTaskLog(request, type)); } @@ -56,7 +55,7 @@ public class DataSetTableTaskLogController { @ApiOperation("导出同步日志") @PostMapping("export") - public void export(@RequestBody BaseGridRequest request) throws Exception{ + public void export(@RequestBody DataSetTaskInstanceGridRequest request) throws Exception { dataSetTableTaskLogService.exportExcel(request); } diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/request/DataSetTaskInstanceGridRequest.java b/core/backend/src/main/java/io/dataease/controller/dataset/request/DataSetTaskInstanceGridRequest.java new file mode 100644 index 0000000000..61891f093e --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/dataset/request/DataSetTaskInstanceGridRequest.java @@ -0,0 +1,20 @@ +package io.dataease.controller.dataset.request; + +import io.dataease.plugins.common.request.KeywordRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class DataSetTaskInstanceGridRequest extends KeywordRequest { + + private String id; + + private List lastExecStatus; + + private Long[] lastExecTime; + + private List tableId; + + private List excludedIdList; +} diff --git a/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java b/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java new file mode 100644 index 0000000000..c3e5654e33 --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/dataset/request/DatasetTaskGridRequest.java @@ -0,0 +1,24 @@ +package io.dataease.controller.dataset.request; + +import io.dataease.plugins.common.request.KeywordRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class DatasetTaskGridRequest extends KeywordRequest { + + private List rate; + + private List status; + + private List lastExecStatus; + + private List tableId; + + private Long[] lastExecTime; + + private String id; + + private Long userId; +} diff --git a/core/backend/src/main/java/io/dataease/controller/panel/AppLogController.java b/core/backend/src/main/java/io/dataease/controller/panel/AppLogController.java index 207cbbb05e..2cf2ca6ea4 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/AppLogController.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/AppLogController.java @@ -7,7 +7,7 @@ import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.handler.annotation.I18n; -import io.dataease.controller.sys.request.KeyGridRequest; +import io.dataease.controller.request.panel.AppLogGridRequest; import io.dataease.dto.appTemplateMarket.AppLogGridDTO; import io.dataease.service.panel.applog.AppLogService; import io.swagger.annotations.Api; @@ -38,7 +38,7 @@ public class AppLogController { }) @SqlInjectValidator(value = {"apply_time"}) public Pager> logGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody KeyGridRequest request) { + @RequestBody AppLogGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, appLogService.query(request)); } diff --git a/core/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java b/core/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java index 95af14d0ae..0d2177e13d 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/api/ShareApi.java @@ -2,16 +2,14 @@ package io.dataease.controller.panel.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.annotation.DePermission; -import io.dataease.auth.annotation.SqlInjectValidator; -import io.dataease.plugins.common.base.domain.PanelShare; import io.dataease.commons.constants.DePermissionType; import io.dataease.controller.request.panel.PanelShareFineDto; import io.dataease.controller.request.panel.PanelShareRemoveRequest; import io.dataease.controller.request.panel.PanelShareSearchRequest; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelShareDto; import io.dataease.dto.panel.PanelShareOutDTO; import io.dataease.dto.panel.PanelSharePo; +import io.dataease.plugins.common.base.domain.PanelShare; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiOperation; @@ -31,8 +29,7 @@ public interface ShareApi { @ApiOperation("查询分享给我") @PostMapping("/treeList") - @SqlInjectValidator(value = {"s.create_time"}) - List treeList(BaseGridRequest request); + List treeList(); @ApiOperation("查询我分享的") @PostMapping("/shareOut") diff --git a/core/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java b/core/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java index 5d63d3b88c..71e0930c36 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/api/StoreApi.java @@ -2,15 +2,12 @@ package io.dataease.controller.panel.api; import com.github.xiaoymin.knife4j.annotations.ApiSupport; import io.dataease.auth.annotation.DePermission; -import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.constants.DePermissionType; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelStoreDto; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; -import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; import java.util.List; @@ -32,8 +29,7 @@ public interface StoreApi { @ApiOperation("查询收藏") @PostMapping("/list") - @SqlInjectValidator(value = {"s.create_time"}) - List list(@RequestBody BaseGridRequest request); + List list(); @ApiOperation("移除收藏") diff --git a/core/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java b/core/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java index b4016c7cd4..40694d736c 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/server/ShareServer.java @@ -1,14 +1,13 @@ package io.dataease.controller.panel.server; -import io.dataease.plugins.common.base.domain.PanelShare; import io.dataease.controller.panel.api.ShareApi; import io.dataease.controller.request.panel.PanelShareFineDto; import io.dataease.controller.request.panel.PanelShareRemoveRequest; import io.dataease.controller.request.panel.PanelShareSearchRequest; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelShareDto; import io.dataease.dto.panel.PanelShareOutDTO; import io.dataease.dto.panel.PanelSharePo; +import io.dataease.plugins.common.base.domain.PanelShare; import io.dataease.service.panel.ShareService; import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RequestBody; @@ -24,8 +23,8 @@ public class ShareServer implements ShareApi { private ShareService shareService; @Override - public List treeList(@RequestBody BaseGridRequest request) { - return shareService.queryTree(request); + public List treeList() { + return shareService.queryTree(); } @Override diff --git a/core/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java b/core/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java index 4ca86f0113..d42217d2d2 100644 --- a/core/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java +++ b/core/backend/src/main/java/io/dataease/controller/panel/server/StoreServer.java @@ -1,7 +1,6 @@ package io.dataease.controller.panel.server; import io.dataease.controller.panel.api.StoreApi; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.dto.panel.PanelStoreDto; import io.dataease.service.panel.StoreService; import org.springframework.beans.factory.annotation.Autowired; @@ -21,8 +20,8 @@ public class StoreServer implements StoreApi { } @Override - public List list(BaseGridRequest request) { - return storeService.query(request); + public List list() { + return storeService.query(); } @Override diff --git a/core/backend/src/main/java/io/dataease/controller/request/panel/AppLogGridRequest.java b/core/backend/src/main/java/io/dataease/controller/request/panel/AppLogGridRequest.java new file mode 100644 index 0000000000..5196fdc14d --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/request/panel/AppLogGridRequest.java @@ -0,0 +1,11 @@ +package io.dataease.controller.request.panel; + +import io.dataease.plugins.common.request.KeywordRequest; +import lombok.Data; + +@Data +public class AppLogGridRequest extends KeywordRequest { + private Long[] applyTime; + + private Long userId; +} diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java index ff73c6d280..3e7755db05 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysDeptController.java @@ -3,10 +3,10 @@ package io.dataease.controller.sys; import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.utils.BeanUtils; import io.dataease.controller.ResultHolder; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.response.DeptNodeResponse; import io.dataease.controller.sys.response.DeptTreeNode; import io.dataease.plugins.common.base.domain.SysDept; +import io.dataease.plugins.xpack.dept.dto.request.XpackDeptGridRequest; import io.dataease.service.sys.DeptService; import io.swagger.annotations.Api; import lombok.RequiredArgsConstructor; @@ -42,7 +42,7 @@ public class SysDeptController extends ResultHolder { @PostMapping("/search") @SqlInjectValidator({"name"}) - public List search(@RequestBody BaseGridRequest request){ + public List search(@RequestBody XpackDeptGridRequest request){ List nodes = deptService.nodesTreeByCondition(request); List nodeResponses = nodes.stream().map(node -> { DeptNodeResponse deptNodeResponse = BeanUtils.copyBean(new DeptNodeResponse(), node); diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysLogController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysLogController.java index 5c58bcb57c..69498b8505 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysLogController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysLogController.java @@ -7,7 +7,7 @@ import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.handler.annotation.I18n; -import io.dataease.controller.sys.request.KeyGridRequest; +import io.dataease.controller.sys.request.LogGridRequest; import io.dataease.dto.SysLogGridDTO; import io.dataease.dto.log.FolderItem; import io.dataease.service.sys.log.LogService; @@ -39,8 +39,7 @@ public class SysLogController { }) @SqlInjectValidator(value = {"time"}) public Pager> logGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody KeyGridRequest request) { - request = logService.logRetentionProxy(request); + @RequestBody LogGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, logService.query(request)); } @@ -54,7 +53,7 @@ public class SysLogController { @ApiOperation("导出操作日志") @PostMapping("/export") @ApiImplicitParam(name = "request", value = "查询条件", required = true) - public void export(@RequestBody KeyGridRequest request) throws Exception { + public void export(@RequestBody LogGridRequest request) throws Exception { logService.exportExcel(request); } } diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java index 3b57b3f283..f36d52a077 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysMenuController.java @@ -1,15 +1,12 @@ package io.dataease.controller.sys; -import io.dataease.plugins.common.base.domain.SysMenu; -import io.dataease.commons.utils.BeanUtils; - import io.dataease.controller.handler.annotation.I18n; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.controller.sys.request.MenuCreateRequest; import io.dataease.controller.sys.request.MenuDeleteRequest; import io.dataease.controller.sys.response.MenuNodeResponse; import io.dataease.controller.sys.response.MenuTreeNode; +import io.dataease.plugins.common.base.domain.SysMenu; import io.dataease.service.sys.MenuService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -21,6 +18,7 @@ import javax.annotation.Resource; import java.util.List; import java.util.Set; import java.util.stream.Collectors; + @ApiIgnore @RestController @RequiredArgsConstructor @@ -34,61 +32,44 @@ public class SysMenuController { @ApiOperation("查询跟节点菜单") @I18n @PostMapping("/childNodes/{pid}") - public List childNodes(@PathVariable("pid") Long pid){ + public List childNodes(@PathVariable("pid") Long pid) { List nodes = menuService.nodesByPid(pid); nodes = nodes.stream().filter(node -> !node.getHidden()).collect(Collectors.toList()); return menuService.convert(nodes); } - @ApiOperation("搜索菜单树") - @I18n - @PostMapping("/search") - public List search(@RequestBody BaseGridRequest request) { - List nodes = menuService.nodesTreeByCondition(request); - List nodeResponses = nodes.stream().map(node -> { - MenuNodeResponse menuNodeResponse = BeanUtils.copyBean(new MenuNodeResponse(), node); - menuNodeResponse.setHasChildren(node.getSubCount() > 0); - menuNodeResponse.setTop(node.getPid() == menuService.MENU_ROOT_PID); - return menuNodeResponse; - }).collect(Collectors.toList()); - return nodeResponses; - } - - @ApiOperation("新增菜单") @PostMapping("/create") - public void create(@RequestBody MenuCreateRequest request){ + public void create(@RequestBody MenuCreateRequest request) { menuService.add(request); } @ApiOperation("删除菜单") @PostMapping("/delete") - public void delete(@RequestBody MenuDeleteRequest request){ + public void delete(@RequestBody MenuDeleteRequest request) { menuService.delete(request); } @ApiOperation("更新菜单") @PostMapping("/update") - public void update(@RequestBody MenuCreateRequest menu){ + public void update(@RequestBody MenuCreateRequest menu) { menuService.update(menu); } - @PostMapping("/childMenus/{pid}") - public Set childMenus(@PathVariable Long pid){ + public Set childMenus(@PathVariable Long pid) { List children = menuService.children(pid); Set sets = children.stream().map(MenuNodeResponse::getMenuId).collect(Collectors.toSet()); sets.add(pid); return sets; } + @PostMapping("/nodesByMenuId/{menuId}") public List nodesByMenuId(@PathVariable("menuId") Long menuId) { - return menuService.searchTree(menuId); + return menuService.searchTree(menuId); } - - } diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java index d8e32122c4..782953a328 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysPluginController.java @@ -6,8 +6,8 @@ import io.dataease.auth.annotation.SqlInjectValidator; import io.dataease.commons.utils.DeFileUtils; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; -import io.dataease.controller.sys.base.BaseGridRequest; import io.dataease.plugins.common.base.domain.MyPlugin; +import io.dataease.plugins.common.request.KeywordRequest; import io.dataease.service.sys.PluginService; import io.swagger.annotations.Api; import io.swagger.annotations.ApiOperation; @@ -33,7 +33,7 @@ public class SysPluginController { @PostMapping("/pluginGrid/{goPage}/{pageSize}") @RequiresPermissions("plugin:read") @SqlInjectValidator(value = {"install_time"}) - public Pager> pluginGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody BaseGridRequest request) { + public Pager> pluginGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody KeywordRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); return PageUtils.setPageInfo(page, pluginService.query(request)); } diff --git a/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java b/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java index 5f46a52c0d..c78623cece 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/SysUserController.java @@ -14,15 +14,13 @@ import io.dataease.commons.constants.ResourceAuthLevel; import io.dataease.commons.constants.SysLogConstants; import io.dataease.commons.exception.DEException; import io.dataease.commons.utils.AuthUtils; -import io.dataease.commons.utils.BeanUtils; import io.dataease.commons.utils.PageUtils; import io.dataease.commons.utils.Pager; import io.dataease.controller.response.ExistLdapUser; -import io.dataease.controller.sys.base.BaseGridRequest; -import io.dataease.controller.sys.request.KeyGridRequest; import io.dataease.controller.sys.request.SysUserCreateRequest; import io.dataease.controller.sys.request.SysUserPwdRequest; import io.dataease.controller.sys.request.SysUserStateRequest; +import io.dataease.controller.sys.request.UserGridRequest; import io.dataease.controller.sys.response.AuthBindDTO; import io.dataease.controller.sys.response.RoleUserItem; import io.dataease.controller.sys.response.SysUserGridResponse; @@ -31,6 +29,7 @@ import io.dataease.i18n.Translator; import io.dataease.plugins.common.base.domain.SysRole; import io.dataease.plugins.common.base.domain.SysUser; import io.dataease.plugins.common.base.domain.SysUserAssist; +import io.dataease.plugins.common.request.KeywordRequest; import io.dataease.service.sys.SysRoleService; import io.dataease.service.sys.SysUserService; import io.swagger.annotations.Api; @@ -81,7 +80,7 @@ public class SysUserController { }) @SqlInjectValidator(value = {"create_time", "u.enabled", "nick_name", "u.dept_id"}) public Pager> userGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody KeyGridRequest request) { + @RequestBody UserGridRequest request) { Page page = PageHelper.startPage(goPage, pageSize, true); List users = sysUserService.query(request); users.forEach(user -> { @@ -95,9 +94,8 @@ public class SysUserController { @ApiIgnore @PostMapping("/userLists") @SqlInjectValidator({"nick_name", "create_time"}) - public List userLists(@RequestBody BaseGridRequest request) { - KeyGridRequest keyGridRequest = BeanUtils.copyBean(new KeyGridRequest(), request); - List users = sysUserService.query(keyGridRequest); + public List userLists(@RequestBody UserGridRequest request) { + List users = sysUserService.query(request); if (CollectionUtils.isEmpty(users)) return users; users.forEach(user -> { user.setPassword(null); @@ -113,7 +111,7 @@ public class SysUserController { @ApiImplicitParam(name = "request", value = "查询条件", required = true) }) @SqlInjectValidator(value = {"create_time", "u.enabled", "nick_name", "u.dept_id"}) - public Pager> userGrids(@PathVariable String datasetId, @RequestBody KeyGridRequest request) { + public Pager> userGrids(@PathVariable String datasetId, @RequestBody UserGridRequest request) { return userGrid(0, 0, request); } @@ -234,12 +232,11 @@ public class SysUserController { @ApiImplicitParam(paramType = "path", name = "pageSize", value = "页容量", required = true, dataType = "Integer"), @ApiImplicitParam(name = "request", value = "查询条件", required = true) }) - @SqlInjectValidator({"create_time", "update_time"}) - public Pager> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, - @RequestBody BaseGridRequest request) { + @SqlInjectValidator({"create_time"}) + public Pager> roleGrid(@PathVariable int goPage, @PathVariable int pageSize, @RequestBody KeywordRequest request) { + Page page = PageHelper.startPage(goPage, pageSize, true); - Pager> listPager = PageUtils.setPageInfo(page, sysRoleService.query(request)); - return listPager; + return PageUtils.setPageInfo(page, sysRoleService.query(request)); } @ApiOperation("已同步用户") diff --git a/core/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java deleted file mode 100644 index 003ac6dca7..0000000000 --- a/core/backend/src/main/java/io/dataease/controller/sys/base/BaseGridRequest.java +++ /dev/null @@ -1,52 +0,0 @@ -package io.dataease.controller.sys.base; - -import io.dataease.ext.query.GridExample; -import io.swagger.annotations.ApiModel; -import io.swagger.annotations.ApiModelProperty; -import org.apache.commons.collections.CollectionUtils; - -import java.io.Serializable; -import java.util.List; - - - -@ApiModel("查询条件") -public class BaseGridRequest implements Serializable { - - @ApiModelProperty("条件集合") - private List conditions; - - public List getConditions() { - return conditions; - } - - public void setConditions(List conditions) { - this.conditions = conditions; - } - - public List getOrders() { - return orders; - } - - public void setOrders(List orders) { - this.orders = orders; - } - - @ApiModelProperty("排序描述") - private List orders; - - public GridExample convertExample(){ - GridExample gridExample = new GridExample(); - if (CollectionUtils.isNotEmpty(conditions)) { - GridExample.Criteria criteria = gridExample.createCriteria(); - conditions.forEach(criteria::addCondition); - } - - if (CollectionUtils.isNotEmpty(orders)){ - String orderByClause = String.join(", ", orders); - gridExample.setOrderByClause(orderByClause); - } - - return gridExample; - } -} diff --git a/core/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java b/core/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java deleted file mode 100644 index 304cfcf588..0000000000 --- a/core/backend/src/main/java/io/dataease/controller/sys/base/ConditionEntity.java +++ /dev/null @@ -1,20 +0,0 @@ -package io.dataease.controller.sys.base; - -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class ConditionEntity implements Serializable { - - @ApiModelProperty(value = "字段") - private String field; - - @ApiModelProperty(value = "操作符") - private String operator; - - @ApiModelProperty(value = "字段值") - private Object value; - -} diff --git a/core/backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java deleted file mode 100644 index 42af480232..0000000000 --- a/core/backend/src/main/java/io/dataease/controller/sys/request/KeyGridRequest.java +++ /dev/null @@ -1,13 +0,0 @@ -package io.dataease.controller.sys.request; - -import io.dataease.controller.sys.base.BaseGridRequest; -import io.swagger.annotations.ApiModelProperty; -import lombok.Data; - -import java.io.Serializable; - -@Data -public class KeyGridRequest extends BaseGridRequest implements Serializable { - @ApiModelProperty("关键字") - private String keyWord; -} diff --git a/core/backend/src/main/java/io/dataease/controller/sys/request/LogGridRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/request/LogGridRequest.java new file mode 100644 index 0000000000..f8ff7f532d --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/sys/request/LogGridRequest.java @@ -0,0 +1,16 @@ +package io.dataease.controller.sys.request; + +import io.dataease.plugins.common.request.KeywordRequest; +import lombok.Data; + +import java.util.List; + +@Data +public class LogGridRequest extends KeywordRequest { + + private List optypeList; + + private List userIdList; + + private Long[] timeList; +} diff --git a/core/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java index a06787bd9e..1f15722cfd 100644 --- a/core/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java +++ b/core/backend/src/main/java/io/dataease/controller/sys/request/MsgRequest.java @@ -1,6 +1,6 @@ package io.dataease.controller.sys.request; -import io.dataease.controller.sys.base.BaseGridRequest; +import io.dataease.plugins.common.request.KeywordRequest; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; @@ -9,7 +9,7 @@ import java.io.Serializable; @Data @ApiModel("消息条件") -public class MsgRequest extends BaseGridRequest implements Serializable { +public class MsgRequest extends KeywordRequest implements Serializable { private static final long serialVersionUID = 1920091635946508658L; diff --git a/core/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java b/core/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java new file mode 100644 index 0000000000..9677ce7098 --- /dev/null +++ b/core/backend/src/main/java/io/dataease/controller/sys/request/UserGridRequest.java @@ -0,0 +1,19 @@ +package io.dataease.controller.sys.request; + +import io.dataease.plugins.common.request.KeywordRequest; +import io.swagger.annotations.ApiModelProperty; +import lombok.Data; + +import java.util.List; + +@Data +public class UserGridRequest extends KeywordRequest { + + @ApiModelProperty("角色ID列表") + private List roleIdList; + @ApiModelProperty("组织ID列表") + private List deptIdList; + @ApiModelProperty("状态") + private List enabledList; + +} diff --git a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.java index d27653a424..5b3dac97d3 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.java @@ -1,9 +1,10 @@ package io.dataease.ext; +import io.dataease.controller.request.panel.AppLogGridRequest; import io.dataease.dto.appTemplateMarket.AppLogGridDTO; -import io.dataease.service.panel.applog.AppLogQueryParam; + import java.util.List; public interface ExtAppLogMapper { - List query(AppLogQueryParam example); + List query(AppLogGridRequest request); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml index 1360162dbb..d4a9b4c16b 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtAppLogMapper.xml @@ -14,7 +14,7 @@ - select logInfo.*, get_auths(logInfo.dataset_group_id,'dataset',#{userId}) as `dataset_privileges`, @@ -53,27 +53,34 @@ left join panel_app_template on panel_app_template_log.app_template_id = panel_app_template.id ) t where 1=1 - + and ( - t.app_name like concat('%', #{extendCondition} , '%') + t.app_name like concat('%', #{keyword} , '%') or - t.panel_name like concat('%', #{extendCondition} , '%') + t.panel_name like concat('%', #{keyword} , '%') or - t.dataset_group_name like concat('%', #{extendCondition} , '%') + t.dataset_group_name like concat('%', #{keyword} , '%') or - t.datasource_name like concat('%', #{extendCondition} , '%') + t.datasource_name like concat('%', #{keyword} , '%') ) ) logInfo - - - - - order by ${orderByClause} - - - order by apply_time desc + + and (apply_time between #{applyTime.[0]} and #{applyTime.[1]} + + + + order by + + ${item} + + + + order by apply_time desc + + + diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java index 91ff96757e..64e1b4170f 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.java @@ -1,8 +1,9 @@ package io.dataease.ext; +import io.dataease.controller.dataset.request.DataSetTaskInstanceGridRequest; +import io.dataease.controller.dataset.request.DatasetTaskGridRequest; import io.dataease.dto.dataset.DataSetTaskDTO; import io.dataease.dto.dataset.DataSetTaskLogDTO; -import io.dataease.ext.query.GridExample; import org.apache.ibatis.annotations.Mapper; import org.apache.ibatis.annotations.Param; @@ -14,15 +15,15 @@ import java.util.List; */ @Mapper public interface ExtDataSetTaskMapper { - List listTaskLog(GridExample example); + List listTaskLog(DataSetTaskInstanceGridRequest request); - List listUserTaskLog(GridExample example); + List listUserTaskLog(DataSetTaskInstanceGridRequest request); - List taskList(GridExample example); + List taskList(DatasetTaskGridRequest request); - List userTaskList(GridExample example); + List userTaskList(DatasetTaskGridRequest request); - List taskWithTriggers(GridExample example); + List taskWithTriggers(DatasetTaskGridRequest request); List findByPanelId(@Param("panelId") String panelId); diff --git a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml index 8f95bdb498..3accb94e70 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtDataSetTaskMapper.xml @@ -21,15 +21,32 @@ FROM dataset_table_task_log LEFT JOIN dataset_table_task ON dataset_table_task_log.task_id = dataset_table_task.id LEFT JOIN dataset_table ON dataset_table_task_log.table_id = dataset_table.id - - + + where 1=1 + + and dataset_table_task.id = #{id} - - order by ${orderByClause} + + and dataset_table_task_log.status in + + #{status} + - - ORDER BY dataset_table_task_log.create_time desc + + and dataset_table.id in + + #{tid} + + + and (dataset_table_task.last_exec_time between #{lastExecTime.[0]} and #{lastExecTime.[1]}) + + + + and dataset_table_task.name like concat('%', #{keyword}, '%') + + + ORDER BY dataset_table_task_log.create_time desc - SELECT dataset_table.name as table_name, 'grant,manage,use' as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME FROM dataset_table_task left join dataset_table on dataset_table.id=dataset_table_task.table_id left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME - - + where 1=1 + + and dataset_table_task.rate in + + #{rateItem} + - - order by ${orderByClause} + + and dataset_table_task.status in + + #{statusItem} + - - order by dataset_table_task.create_time desc + + and dataset_table_task.last_exec_status in + + #{lastExecStatusItem} + + + and dataset_table.id in + + #{tid} + + + + and dataset_table_task.id = #{id} + + + and (dataset_table_task.last_exec_time between #{lastExecTime.[0]} and #{lastExecTime.[1]}) + + + and dataset_table_task.name like concat('%', #{keyword}, '%') + + order by dataset_table_task.create_time desc - + SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{userId}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME FROM dataset_table_task left join dataset_table on dataset_table.id=dataset_table_task.table_id left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME - - + + where 1=1 + + and dataset_table_task.rate in + + #{rateItem} + - - order by ${orderByClause} + + and dataset_table_task.status in + + #{statusItem} + - - order by dataset_table_task.create_time desc + + and dataset_table_task.last_exec_status in + + #{lastExecStatusItem} + + + and dataset_table_task.id = #{id} + + + and dataset_table.id in + + #{tid} + + + + and (dataset_table_task.last_exec_time between #{lastExecTime.[0]} and #{lastExecTime.[1]}) + + + and dataset_table_task.name like concat('%', #{keyword}, '%') + + order by dataset_table_task.create_time desc - - + SELECT dataset_table.name as table_name, get_auths(dataset_table_task.table_id,'dataset', #{userId}) as `privileges`,dataset_table_task.* , qrtz_triggers.NEXT_FIRE_TIME FROM dataset_table_task left join dataset_table on dataset_table.id=dataset_table_task.table_id left join qrtz_triggers on dataset_table_task.id=qrtz_triggers.TRIGGER_NAME - - - - - order by ${orderByClause} - - - order by dataset_table_task.create_time desc + + and dataset_table_task.id = #{id} + order by dataset_table_task.create_time desc - select datasource.*, - authInfo.privileges as `privileges` - from (select GET_V_AUTH_MODEL_ID_P_USE (#{extendCondition}, 'link') cids) t,datasource - left join ( - SELECT - auth_source, - group_concat( DISTINCT sys_auth_detail.privilege_extend ) as `privileges` - FROM - ( - `sys_auth` - LEFT JOIN `sys_auth_detail` ON (( - `sys_auth`.`id` = `sys_auth_detail`.`auth_id` - ))) - WHERE - sys_auth_detail.privilege_value = 1 - AND sys_auth.auth_source_type = 'link' - AND ( - ( - sys_auth.auth_target_type = 'dept' - AND sys_auth.auth_target IN ( SELECT dept_id FROM sys_user WHERE user_id = #{extendCondition} ) - ) - OR ( - sys_auth.auth_target_type = 'user' - AND sys_auth.auth_target = #{extendCondition} - ) - OR ( - sys_auth.auth_target_type = 'role' - AND sys_auth.auth_target IN ( SELECT role_id FROM sys_users_roles WHERE user_id = #{extendCondition} ) - ) - ) - GROUP BY - `sys_auth`.`auth_source` - ) authInfo - on datasource.id = authInfo.auth_source - - - - and FIND_IN_SET(datasource.id,cids) - - order by ${orderByClause} - - - order by update_time desc - - + - + select dept_id as id, pid from sys_dept where 1=1 + + and pid = #{pid} + + + and name like concat('%', #{keyword}, '%') + diff --git a/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.java index 5022c822da..bc5d5c0926 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.java @@ -1,11 +1,11 @@ package io.dataease.ext; -import io.dataease.ext.query.GridExample; import io.dataease.dto.panel.PanelStoreDto; +import org.apache.ibatis.annotations.Param; import java.util.List; public interface ExtPanelStoreMapper { - List query(GridExample example); + List query(@Param("uid") Long uid); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.xml index 8e132af262..c3071241e9 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtPanelStoreMapper.xml @@ -2,7 +2,7 @@ - + @@ -10,26 +10,14 @@ - - - + select s.store_id, s.panel_group_id, g.name, g.status + from panel_store s + inner join panel_group g on g.id = s.panel_group_id + where s.user_id = #{uid} + order by s.create_time desc - - - diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.java index e8cccd646c..56a44c1788 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.java @@ -1,16 +1,15 @@ package io.dataease.ext; +import io.dataease.controller.sys.request.LogGridRequest; import io.dataease.dto.log.FolderItem; -import io.dataease.ext.query.GridExample; import io.dataease.plugins.common.base.domain.SysLogWithBLOBs; -import io.dataease.service.sys.log.LogQueryParam; import org.apache.ibatis.annotations.Param; import java.util.List; public interface ExtSysLogMapper { - List query(LogQueryParam example); + List query(LogGridRequest request); List idAndName(@Param("ids") List ids, @Param("type") Integer type); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml index edc5b01233..f3c7d7e02d 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysLogMapper.xml @@ -3,51 +3,59 @@ - - - - - select * from - (select * from sys_log where 1 = 1 - - and - ( - nick_name like concat('%', #{extendCondition} , '%') - or - source_name like concat('%', #{extendCondition} , '%') - or - position like concat('%', #{extendCondition} , '%') - - or - concat(operate_type, '-', source_type) in - - #{id} - - - ) - - ) t + (select * from sys_log where 1 = 1 + + and + ( + nick_name like concat('%', #{keyword} , '%') + or + source_name like concat('%', #{keyword} , '%') + or + position like concat('%', #{keyword} , '%') + ) + + ) t + where 1 = 1 + + and concat(operate_type, '-', source_type) in + + #{operate} + + + + and user_id in + + #{userId} + + + + and (time between #{timeList.[0]} and #{timeList.[1]}) + - - - - - order by ${orderByClause} - - - order by time desc - + + + order by + + ${item} + + + + order by time desc + + - select id, name from datasource - id in + id in #{id} @@ -57,23 +65,23 @@ id, name from ( - select id, name from dataset_group - - id in - - #{id} - - + select id, name from dataset_group + + id in + + #{id} + + - union all + union all - select id, name from dataset_table - - id in - - #{id} - - + select id, name from dataset_table + + id in + + #{id} + + ) dataset @@ -175,9 +183,9 @@ menu_id as id ,title as name from ( - select menu_id, title from sys_menu - union all - select menu_id, title from plugin_sys_menu + select menu_id, title from sys_menu + union all + select menu_id, title from plugin_sys_menu ) plugin_union menu_id in diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.java index ce7c6b1a6a..62985c14cf 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.java @@ -1,8 +1,7 @@ package io.dataease.ext; -import io.dataease.plugins.common.base.domain.SysMenu; -import io.dataease.ext.query.GridExample; import io.dataease.controller.sys.request.SimpleTreeNode; +import io.dataease.plugins.common.base.domain.SysMenu; import java.util.List; @@ -10,7 +9,6 @@ public interface ExtSysMenuMapper { List allNodes(); - List nodesByExample(GridExample example); List querySysMenu(); } diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml index 1e82ad6b8c..327df54984 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysMenuMapper.xml @@ -14,11 +14,7 @@ - + + - + + update my_plugin set version = #{version} where store = 'default' + diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.java index d5c88606e1..13d0af5798 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.java @@ -1,8 +1,8 @@ package io.dataease.ext; -import io.dataease.ext.query.GridExample; import io.dataease.controller.sys.response.RoleUserItem; import io.dataease.plugins.common.base.domain.SysRole; +import io.dataease.plugins.common.request.KeywordRequest; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -12,7 +12,7 @@ import java.util.Map; public interface ExtSysRoleMapper { - List query(GridExample example); + List query(KeywordRequest request); int deleteRoleMenu(@Param("roleId") Long roleId); diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.xml index 2cf7a2040f..e46d2d57b5 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysRoleMapper.xml @@ -9,18 +9,22 @@ - + select r.* from sys_role r + + where name like concat('%', #{keyword} , '%') + + + order by + + ${item} + + + + order by create_time desc + + diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java index 37996adfe1..2aca5a89cf 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.java @@ -1,12 +1,12 @@ package io.dataease.ext; -import io.dataease.ext.query.GridExample; +import io.dataease.controller.sys.request.UserGridRequest; import io.dataease.controller.sys.response.SysUserGridResponse; import java.util.List; public interface ExtSysUserMapper { - List query(GridExample example); + List query(UserGridRequest request); List ldapUserNames(Integer from); diff --git a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml index c4921381fa..85318db4f7 100644 --- a/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml +++ b/core/backend/src/main/java/io/dataease/ext/ExtSysUserMapper.xml @@ -33,7 +33,7 @@ - SELECT DISTINCT u.*, u.user_id AS id, @@ -42,26 +42,50 @@ FROM ( select * from sys_user - + where - nick_name like concat('%', #{extendCondition} , '%') + nick_name like concat('%', #{keyword} , '%') or - email like concat('%', #{extendCondition} , '%') + email like concat('%', #{keyword} , '%') ) u LEFT JOIN sys_dept d ON d.dept_id = u.dept_id LEFT JOIN sys_users_roles sur ON sur.user_id = u.user_id LEFT JOIN sys_role r ON r.role_id = sur.role_id + where 1 = 1 - - + + and r.role_id in + + #{roleId} + - - order by ${orderByClause} + + and d.dept_id in + + #{deptId} + - - order by u.update_time desc + + and u.enabled in + + #{en} + + + + + order by + + ${item} + + + + order by u.update_time desc + + + +