From ff47da276745fe3adb6ea9d1a743024b4c1a4dc6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=90=8C=E8=90=8C=E5=93=92SAKURA=E9=85=B1?= Date: Fri, 23 Nov 2018 00:58:35 +0800 Subject: [PATCH] :arrow_up: Upgrading ORM Framework from Mybatis Plus 2.x to Mybatis Plus 3.x --- .../pigx/auth/endpoint/PigxTokenEndpoint.java | 10 +- pigx-common/pigx-common-aspect/pom.xml | 62 ++++++++ .../common/aspect/config/WebMvcConfig.java | 64 +++++++++ .../resolver/PaginationArgumentResolver.java | 80 +++++++++++ .../main/resources/META-INF/spring.factories | 2 + pigx-common/pigx-common-core/pom.xml | 4 +- .../core/constant/PaginationConstant.java | 17 +++ .../core/datascope/DataScopeInterceptor.java | 6 +- .../pigx/common/core/util/Query.java | 53 ------- pigx-common/pom.xml | 3 +- .../main/resources/config/application-dev.yml | 33 +++-- .../resources/config/pigx-upms-biz-dev.yml | 4 + .../pigx/admin/api/entity/SysDept.java | 21 ++- .../admin/api/entity/SysDeptRelation.java | 9 +- .../pigx/admin/api/entity/SysDict.java | 16 +-- .../pigx/admin/api/entity/SysLog.java | 19 +-- .../pigx/admin/api/entity/SysMenu.java | 16 +-- .../api/entity/SysOauthClientDetails.java | 8 +- .../pigx/admin/api/entity/SysRole.java | 10 +- .../pigx/admin/api/entity/SysRoleMenu.java | 15 +- .../pigx/admin/api/entity/SysRouteConf.java | 18 +-- .../admin/api/entity/SysSocialDetails.java | 15 +- .../pigx/admin/api/entity/SysUser.java | 8 +- .../pigx/admin/api/entity/SysUserRole.java | 15 +- .../admin/api/feign/RemoteTokenService.java | 2 +- .../RemoteTokenServiceFallbackImpl.java | 2 +- .../admin/config/MybatisPlusConfigurer.java | 8 +- .../pigx/admin/controller/DeptController.java | 2 +- .../pigx/admin/controller/DictController.java | 21 ++- .../pigx/admin/controller/LogController.java | 22 ++- .../pigx/admin/controller/MenuController.java | 9 +- .../OauthClientDetailsController.java | 22 ++- .../pigx/admin/controller/RoleController.java | 20 +-- .../SysSocialDetailsController.java | 21 ++- .../admin/controller/TokenController.java | 3 +- .../pigx/admin/controller/UserController.java | 22 +-- .../pigx/admin/handler/SmsLoginHandler.java | 4 +- .../admin/handler/WeChatLoginHandler.java | 6 +- .../pigx/admin/mapper/SysDeptMapper.java | 2 +- .../admin/mapper/SysDeptRelationMapper.java | 2 +- .../pigx/admin/mapper/SysDictMapper.java | 12 +- .../pigx/admin/mapper/SysLogMapper.java | 12 +- .../pigx/admin/mapper/SysMenuMapper.java | 2 +- .../mapper/SysOauthClientDetailsMapper.java | 12 +- .../pigx/admin/mapper/SysRoleMapper.java | 2 +- .../pigx/admin/mapper/SysRoleMenuMapper.java | 2 +- .../pigx/admin/mapper/SysRouteConfMapper.java | 2 +- .../admin/mapper/SysSocialDetailsMapper.java | 12 +- .../pigx/admin/mapper/SysUserMapper.java | 12 +- .../pigx/admin/mapper/SysUserRoleMapper.java | 2 +- .../admin/service/SysDeptRelationService.java | 2 +- .../pigx/admin/service/SysDeptService.java | 2 +- .../pigx/admin/service/SysDictService.java | 11 +- .../pigx/admin/service/SysLogService.java | 11 +- .../pigx/admin/service/SysMenuService.java | 2 +- .../service/SysOauthClientDetailsService.java | 11 +- .../admin/service/SysRoleMenuService.java | 2 +- .../pigx/admin/service/SysRoleService.java | 2 +- .../admin/service/SysRouteConfService.java | 2 +- .../service/SysSocialDetailsService.java | 11 +- .../admin/service/SysUserRoleService.java | 2 +- .../pigx/admin/service/SysUserService.java | 12 +- .../admin/service/impl/MobileServiceImpl.java | 4 +- .../impl/SysDeptRelationServiceImpl.java | 8 +- .../service/impl/SysDeptServiceImpl.java | 21 +-- .../service/impl/SysDictServiceImpl.java | 14 +- .../admin/service/impl/SysLogServiceImpl.java | 15 +- .../service/impl/SysMenuServiceImpl.java | 11 +- .../SysOauthClientDetailsServiceImpl.java | 17 ++- .../service/impl/SysRoleMenuServiceImpl.java | 8 +- .../service/impl/SysRoleServiceImpl.java | 8 +- .../service/impl/SysRouteConfServiceImpl.java | 11 +- .../impl/SysSocialDetailsServiceImpl.java | 21 ++- .../service/impl/SysUserRoleServiceImpl.java | 2 +- .../service/impl/SysUserServiceImpl.java | 29 ++-- .../main/resources/mapper/SysDictMapper.xml | 77 +++++++--- .../main/resources/mapper/SysLogMapper.xml | 107 +++++++++++--- .../mapper/SysOauthClientDetailsMapper.xml | 83 ++++++++--- .../mapper/SysSocialDetailsMapper.xml | 94 ++++++++---- .../main/resources/mapper/SysUserMapper.xml | 2 +- pigx-visual/pigx-activiti/Dockerfile | 2 +- .../act/config/MybatisPlusConfigurer.java | 8 +- .../act/controller/LeaveBillController.java | 23 ++- .../pigx/act/controller/ModelController.java | 6 +- .../act/controller/ProcessController.java | 6 +- .../pigx/act/controller/TaskController.java | 6 +- .../pig4cloud/pigx/act/entity/LeaveBill.java | 10 +- .../pigx/act/mapper/LeaveBillMapper.java | 11 +- .../pigx/act/service/ActTaskService.java | 4 +- .../pigx/act/service/LeaveBillService.java | 11 +- .../pigx/act/service/ModelService.java | 4 +- .../pigx/act/service/ProcessService.java | 4 +- .../act/service/impl/ActTaskServiceImpl.java | 12 +- .../service/impl/LeaveBillServiceImpl.java | 15 +- .../act/service/impl/ModelServiceImpl.java | 12 +- .../act/service/impl/ProcessServiceImpl.java | 12 +- .../src/main/resources/bootstrap.yml | 2 +- .../main/resources/mapper/LeaveBillMapper.xml | 42 +++++- .../codegen/config/MybatisPlusConfigurer.java | 2 +- .../controller/SysGeneratorController.java | 12 +- .../pigx/codegen/entity/ColumnEntity.java | 2 +- .../codegen/mapper/SysGeneratorMapper.java | 7 +- .../codegen/service/SysGeneratorService.java | 7 +- .../service/impl/SysGeneratorServiceImpl.java | 10 +- .../resources/template/Controller.java.vm | 134 ++++++++++-------- .../main/resources/template/Entity.java.vm | 52 ++++--- .../main/resources/template/Mapper.java.vm | 30 +++- .../src/main/resources/template/Mapper.xml.vm | 54 ++++++- .../main/resources/template/Service.java.vm | 30 +++- .../resources/template/ServiceImpl.java.vm | 44 ++++-- .../src/main/resources/template/crud.js.vm | 1 + .../src/main/resources/template/index.vue.vm | 74 +++++----- .../src/main/resources/template/menu.sql.vm | 16 +-- .../daemon/config/MybatisPlusConfigurer.java | 2 +- .../controller/ExecutionLogController.java | 22 +-- .../controller/StatusTraceLogController.java | 23 ++- .../pigx/daemon/entity/ExecutionLog.java | 8 +- .../pigx/daemon/entity/StatusTraceLog.java | 16 +-- .../daemon/mapper/ExecutionLogMapper.java | 20 ++- .../daemon/mapper/StatusTraceLogMapper.java | 20 ++- .../daemon/service/ExecutionLogService.java | 20 ++- .../daemon/service/StatusTraceLogService.java | 20 ++- .../service/impl/ExecutionLogServiceImpl.java | 23 ++- .../impl/StatusTraceLogServiceImpl.java | 25 +++- .../src/main/resources/bootstrap.yml | 2 +- .../resources/mapper/ExecutionLogMapper.xml | 57 +++++++- .../resources/mapper/StatusTraceLogMapper.xml | 55 ++++++- pom.xml | 2 +- 128 files changed, 1579 insertions(+), 749 deletions(-) create mode 100644 pigx-common/pigx-common-aspect/pom.xml create mode 100644 pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java create mode 100644 pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java create mode 100644 pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories create mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/PaginationConstant.java delete mode 100644 pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/Query.java diff --git a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java index 564955d57..b4d70dccc 100644 --- a/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java +++ b/pigx-auth/src/main/java/com/pig4cloud/pigx/auth/endpoint/PigxTokenEndpoint.java @@ -21,7 +21,9 @@ package com.pig4cloud.pigx.auth.endpoint; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.core.util.TenantUtils; @@ -127,7 +129,7 @@ public class PigxTokenEndpoint { List> list = new ArrayList<>(); //根据分页参数获取对应数据 - List pages = findKeysForPage(PIGX_OAUTH_ACCESS + "*", MapUtil.getInt(params, "page"), MapUtil.getInt(params, "limit")); + List pages = findKeysForPage(PIGX_OAUTH_ACCESS + "*", MapUtil.getInt(params, PaginationConstant.CURRENT), MapUtil.getInt(params, PaginationConstant.SIZE)); for (String page : pages) { String accessToken = StrUtil.subAfter(page, PIGX_OAUTH_ACCESS, true); @@ -161,9 +163,9 @@ public class PigxTokenEndpoint { list.add(map); } - Page result = new Page(MapUtil.getInt(params, "page"), MapUtil.getInt(params, "limit")); + Page result = new Page(MapUtil.getInt(params, PaginationConstant.CURRENT), MapUtil.getInt(params, PaginationConstant.SIZE)); result.setRecords(list); - result.setTotal(redisTemplate.keys(PIGX_OAUTH_ACCESS + "*").size()); + result.setTotal(Long.valueOf(redisTemplate.keys(PIGX_OAUTH_ACCESS + "*").size())); return new R<>(result); } diff --git a/pigx-common/pigx-common-aspect/pom.xml b/pigx-common/pigx-common-aspect/pom.xml new file mode 100644 index 000000000..28e3f4d4a --- /dev/null +++ b/pigx-common/pigx-common-aspect/pom.xml @@ -0,0 +1,62 @@ + + + + + com.pig4cloud + pigx-common + 1.8.0 + + 4.0.0 + + pigx-common-aspect + 公共切面包 + jar + + + + javax.servlet + javax.servlet-api + provided + + + org.springframework + spring-webmvc + provided + + + + com.baomidou + mybatis-plus-extension + ${mybatis-plus.version} + provided + + + + org.slf4j + slf4j-api + provided + + + + + + diff --git a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java new file mode 100644 index 000000000..27622359f --- /dev/null +++ b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/config/WebMvcConfig.java @@ -0,0 +1,64 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ +package com.pig4cloud.pigx.common.aspect.config; + +import com.pig4cloud.pigx.common.aspect.resolver.PaginationArgumentResolver; +import org.springframework.context.annotation.Configuration; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.servlet.config.annotation.DefaultServletHandlerConfigurer; +import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +import java.util.List; + +/** + * WebMvcConfig + * + * @author: lishangbu + * @date: 2018/10/18 + */ +@Configuration +public class WebMvcConfig implements WebMvcConfigurer { + @Override + public void addArgumentResolvers(List argumentResolvers) { + argumentResolvers.add(new PaginationArgumentResolver()); + } + + /** + * 如果继承了WebMvcConfigurationSupport，则在yml中配置的相关内容会失效。 需要重新指定静态资源 + * + * @param registry + */ + @Override + public void addResourceHandlers(ResourceHandlerRegistry registry) { + // 重写默认的相关配置 + registry.addResourceHandler("/**").addResourceLocations( + "classpath:/META-INF/resources/,classpath:/resources/,classpath:/static/,classpath:/public/"); + // 放行swagger相关资源 + registry.addResourceHandler("doc.html").addResourceLocations("classpath:/META-INF/resources/"); + registry.addResourceHandler("/webjars/**").addResourceLocations("classpath:/META-INF/resources/webjars/"); + } + + /** + * 配置servlet处理 + */ + @Override + public void configureDefaultServletHandling( + DefaultServletHandlerConfigurer configurer) { + configurer.enable(); + } +} diff --git a/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java new file mode 100644 index 000000000..ab5d925fc --- /dev/null +++ b/pigx-common/pigx-common-aspect/src/main/java/com/pig4cloud/pigx/common/aspect/resolver/PaginationArgumentResolver.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ +package com.pig4cloud.pigx.common.aspect.resolver; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.extern.slf4j.Slf4j; +import org.springframework.context.annotation.Configuration; +import org.springframework.core.MethodParameter; +import org.springframework.web.bind.support.WebDataBinderFactory; +import org.springframework.web.context.request.NativeWebRequest; +import org.springframework.web.method.support.HandlerMethodArgumentResolver; +import org.springframework.web.method.support.ModelAndViewContainer; + +import javax.servlet.http.HttpServletRequest; +import java.util.Optional; + +/** + * PaginationArgumentResolver + * 分页参数解析器 + * + * @author: lishangbu + * @date: 2018/10/18 + */ +@Configuration +@Slf4j +public class PaginationArgumentResolver implements HandlerMethodArgumentResolver { + /** + * 当前页 + */ + private static final String CURRENT = "current"; + + /** + * 每页显示条数 + */ + private static final String SIZE = "size"; + + /** + * 入参筛选 + * + * @param parameter 参数集合 + * @return 格式化后的参数 + */ + @Override + public boolean supportsParameter(MethodParameter parameter) { + return parameter.getParameterType().equals(Page.class); + } + + /** + * @param parameter 入参集合 + * @param mavContainer model 和 view + * @param webRequest web相关 + * @param binderFactory 入参解析 + * @return 包装对象 + * @throws Exception + */ + @Override + public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer mavContainer, NativeWebRequest webRequest, WebDataBinderFactory binderFactory) throws Exception { + HttpServletRequest request = webRequest.getNativeRequest(HttpServletRequest.class); + try { + return new Page(Long.valueOf(Optional.ofNullable(request.getParameter(CURRENT)).orElse("1")), + Long.valueOf(Optional.ofNullable(request.getParameter(SIZE)).orElse("10"))); + } catch (NumberFormatException e) { + return new Page(); + } + } +} diff --git a/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories b/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories new file mode 100644 index 000000000..7ac3ec745 --- /dev/null +++ b/pigx-common/pigx-common-aspect/src/main/resources/META-INF/spring.factories @@ -0,0 +1,2 @@ +org.springframework.boot.autoconfigure.EnableAutoConfiguration=\ + com.pig4cloud.pigx.common.aspect.config.WebMvcConfig diff --git a/pigx-common/pigx-common-core/pom.xml b/pigx-common/pigx-common-core/pom.xml index 67603473c..670bbe530 100644 --- a/pigx-common/pigx-common-core/pom.xml +++ b/pigx-common/pigx-common-core/pom.xml @@ -50,10 +50,10 @@ javax.servlet javax.servlet-api - + com.baomidou - mybatis-plus-core + mybatis-plus-extension ${mybatis-plus.version} diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/PaginationConstant.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/PaginationConstant.java new file mode 100644 index 000000000..f7d8070f6 --- /dev/null +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/constant/PaginationConstant.java @@ -0,0 +1,17 @@ +package com.pig4cloud.pigx.common.core.constant; + +/** + * 分页相关的参数 + * @author lishangbu + * @date 2018/11/22 + */ +public interface PaginationConstant { + /** + * 当前页 + */ + String CURRENT="current"; + /** + * 每页大小 + */ + String SIZE="size"; +} diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScopeInterceptor.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScopeInterceptor.java index cb741a176..4862e1bdf 100644 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScopeInterceptor.java +++ b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/datascope/DataScopeInterceptor.java @@ -19,8 +19,8 @@ package com.pig4cloud.pigx.common.core.datascope; import cn.hutool.core.collection.CollectionUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.plugins.SqlParserHandler; -import com.baomidou.mybatisplus.toolkit.PluginUtils; +import com.baomidou.mybatisplus.core.toolkit.PluginUtils; +import com.baomidou.mybatisplus.extension.handlers.AbstractSqlParserHandler; import lombok.extern.slf4j.Slf4j; import org.apache.ibatis.executor.statement.StatementHandler; import org.apache.ibatis.mapping.BoundSql; @@ -44,7 +44,7 @@ import java.util.Properties; */ @Slf4j @Intercepts({@Signature(type = StatementHandler.class, method = "prepare", args = {Connection.class, Integer.class})}) -public class DataScopeInterceptor extends SqlParserHandler implements Interceptor { +public class DataScopeInterceptor extends AbstractSqlParserHandler implements Interceptor { @Override public Object intercept(Invocation invocation) throws Throwable { diff --git a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/Query.java b/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/Query.java deleted file mode 100644 index a64941996..000000000 --- a/pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/Query.java +++ /dev/null @@ -1,53 +0,0 @@ -/* - * Copyright (c) 2018-2025, lengleng All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, - * this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * Neither the name of the pig4cloud.com developer nor the names of its - * contributors may be used to endorse or promote products derived from - * this software without specific prior written permission. - * Author: lengleng (wangiegie@gmail.com) - */ - -package com.pig4cloud.pigx.common.core.util; - -import com.baomidou.mybatisplus.plugins.Page; -import org.apache.commons.lang.StringUtils; - -import java.util.Map; - -/** - * @author lengleng - * @date 2017/12/10 - */ -public class Query extends Page { - private static final String PAGE = "page"; - private static final String LIMIT = "limit"; - private static final String ORDER_BY_FIELD = "orderByField"; - private static final String IS_ASC = "isAsc"; - - public Query(Map params) { - super(Integer.parseInt(params.getOrDefault(PAGE, 1).toString()) - , Integer.parseInt(params.getOrDefault(LIMIT, 10).toString())); - - String orderByField = params.getOrDefault(ORDER_BY_FIELD, "").toString(); - if (StringUtils.isNotEmpty(orderByField)) { - this.setOrderByField(orderByField); - } - - Boolean isAsc = Boolean.parseBoolean(params.getOrDefault(IS_ASC, Boolean.TRUE).toString()); - this.setAsc(isAsc); - - params.remove(PAGE); - params.remove(LIMIT); - params.remove(ORDER_BY_FIELD); - params.remove(IS_ASC); - this.setCondition(params); - } -} diff --git a/pigx-common/pom.xml b/pigx-common/pom.xml index e8d3258d7..1ce16a87f 100644 --- a/pigx-common/pom.xml +++ b/pigx-common/pom.xml @@ -33,10 +33,11 @@ pigx 公共聚合模块 + pigx-common-aspect pigx-common-cache pigx-common-core - pigx-common-job pigx-common-gateway + pigx-common-job pigx-common-log pigx-common-security pigx-common-swagger diff --git a/pigx-config/src/main/resources/config/application-dev.yml b/pigx-config/src/main/resources/config/application-dev.yml index 23c7ed93f..f0cca1bf3 100644 --- a/pigx-config/src/main/resources/config/application-dev.yml +++ b/pigx-config/src/main/resources/config/application-dev.yml @@ -53,26 +53,29 @@ ribbon: ReadTimeout: 10000 ConnectTimeout: 10000 -#mybaits-plus配置，修改主键类型，mapper.xml、type 别名等 +# mybaits-plus配置 mybatis-plus: + # MyBatis Mapper所对应的XML文件位置 mapper-locations: classpath:/mapper/*Mapper.xml global-config: - #主键类型 0:"数据库ID自增", 1:"用户输入ID",2:"全局唯一ID (数字类型唯一ID)", 3:"全局唯一ID UUID"; - id-type: 0 - #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断" - field-strategy: 1 - #驼峰下划线转换 - db-column-underline: true - #刷新mapper 调试神器 - refresh-mapper: false - # 逻辑删除字段 - logic-delete-value: 1 - logic-not-delete-value: 0 - #自定义SQL注入器 - sql-injector: com.baomidou.mybatisplus.mapper.LogicSqlInjector + # 自动刷新Mapper对应的XML文件 + refresh: true + # 关闭MP3.0自带的banner + banner: false + db-config: + # 主键类型 0:数据库ID自增 1.未定义 2.用户输入 3 id_worker 4.uuid 5.id_worker字符串表示 + id-type: 0 + #字段策略 0:"忽略判断",1:"非 NULL 判断"),2:"非空判断" + field-strategy: 1 + # 默认数据库表下划线命名 + table-underline: true + # 逻辑删除配置 + # 逻辑删除全局值（1表示已删除，这也是Mybatis Plus的默认配置） + logic-delete-value: 1 + # 逻辑未删除全局值（0表示未删除，这也是Mybatis Plus的默认配置） + logic-not-delete-value: 0 configuration: map-underscore-to-camel-case: true - cache-enabled: true #swagger公共信息 swagger: diff --git a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml index 9eb9743cc..716fd594e 100644 --- a/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml +++ b/pigx-config/src/main/resources/config/pigx-upms-biz-dev.yml @@ -33,3 +33,7 @@ swagger: description: 'read all' - scope: 'write' description: 'access all' +# Logger Config +logging: + level: + com.pig4cloud.pigx.admin.mapper: debug diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java index 23a85b046..95541ebbc 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDept.java @@ -19,16 +19,15 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -65,17 +64,13 @@ public class SysDept extends Model { * 修改时间 */ private LocalDateTime updateTime; + + private Integer parentId; + /** * 是否删除 -1：已删除 0：正常 */ @TableLogic private String delFlag; - private Integer parentId; - - - @Override - protected Serializable pkVal() { - return this.deptId; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java index 2ae64c99a..ec38fe9b9 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDeptRelation.java @@ -19,8 +19,8 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -51,9 +51,4 @@ public class SysDeptRelation extends Model { private Integer descendant; - @Override - protected Serializable pkVal() { - return this.ancestor; - } - } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java index c9e04153f..2125e64df 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysDict.java @@ -19,11 +19,11 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -92,10 +92,4 @@ public class SysDict extends Model { @TableLogic private String delFlag; - - @Override - protected Serializable pkVal() { - return this.id; - } - } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java index 90e60d16a..85b605a41 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysLog.java @@ -19,9 +19,9 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; import lombok.Data; import javax.validation.constraints.NotBlank; @@ -93,12 +93,6 @@ public class SysLog implements Serializable { */ private Long time; - /** - * 删除标记 - */ - @TableLogic - private String delFlag; - /** * 异常信息 */ @@ -109,5 +103,12 @@ public class SysLog implements Serializable { */ private String serviceId; + /** + * 删除标记 + */ + @TableLogic + private String delFlag; + + } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java index e4db7dfb4..0d8aa073b 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysMenu.java @@ -19,17 +19,16 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; import javax.validation.constraints.NotBlank; import javax.validation.constraints.NotNull; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -107,9 +106,4 @@ public class SysMenu extends Model { private String path; - @Override - protected Serializable pkVal() { - return this.menuId; - } - } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java index cd996636e..46eab38aa 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysOauthClientDetails.java @@ -19,10 +19,10 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java index 62a1cc4aa..d5314ba0f 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRole.java @@ -19,11 +19,11 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java index f2c6fabde..ec319bca1 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRoleMenu.java @@ -19,15 +19,11 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; - /** *

* 角色菜单表 @@ -46,16 +42,9 @@ public class SysRoleMenu extends Model { /** * 角色ID */ - @TableId(type = IdType.INPUT) private Integer roleId; /** * 菜单ID */ - @TableId(type = IdType.INPUT) private Integer menuId; - - @Override - protected Serializable pkVal() { - return this.roleId; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java index afb794d3f..461b5beb2 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysRouteConf.java @@ -17,16 +17,12 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.*; +import com.baomidou.mybatisplus.extension.activerecord.Model; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; import java.time.LocalDateTime; /** @@ -56,12 +52,13 @@ public class SysRouteConf extends Model { */ private String filters; /** - * + * uri */ private String uri; /** * 排序 */ + @TableField(value="`order`") private Integer order; /** * 创建时间 @@ -77,11 +74,4 @@ public class SysRouteConf extends Model { @TableLogic private String delFlag; - /** - * 主键值 - */ - @Override - protected Serializable pkVal() { - return this.routeId; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java index b8fb73f50..f6cdf201d 100755 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysSocialDetails.java @@ -17,10 +17,10 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; @@ -87,11 +87,4 @@ public class SysSocialDetails extends Model { */ private Integer tenantId; - /** - * 主键值 - */ - @Override - protected Serializable pkVal() { - return this.id; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java index 695d92817..8a41a0f04 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUser.java @@ -19,10 +19,10 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; import com.fasterxml.jackson.annotation.JsonIgnore; import lombok.Data; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java index 8c8dcfe19..6ff63a81c 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/entity/SysUserRole.java @@ -19,15 +19,11 @@ package com.pig4cloud.pigx.admin.api.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; -import java.io.Serializable; - /** *

* 用户角色表 @@ -46,17 +42,10 @@ public class SysUserRole extends Model { /** * 用户ID */ - @TableId(type = IdType.INPUT) private Integer userId; /** * 角色ID */ - @TableId(type = IdType.INPUT) private Integer roleId; - - @Override - protected Serializable pkVal() { - return this.userId; - } } diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java index 5532ea33b..d7396382d 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/RemoteTokenService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.api.feign; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.feign.factory.RemoteTokenServiceFallbackFactory; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.constant.ServiceNameConstant; diff --git a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java index 052e937b7..0896c5e06 100644 --- a/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java +++ b/pigx-upms/pigx-upms-api/src/main/java/com/pig4cloud/pigx/admin/api/feign/fallback/RemoteTokenServiceFallbackImpl.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.api.feign.fallback; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService; import com.pig4cloud.pigx.common.core.util.R; import lombok.Setter; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java index b39066cd8..f90eed13e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/config/MybatisPlusConfigurer.java @@ -20,10 +20,10 @@ package com.pig4cloud.pigx.admin.config; import cn.hutool.core.util.ArrayUtil; -import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.baomidou.mybatisplus.plugins.parser.ISqlParser; -import com.baomidou.mybatisplus.plugins.parser.tenant.TenantHandler; -import com.baomidou.mybatisplus.plugins.parser.tenant.TenantSqlParser; +import com.baomidou.mybatisplus.core.parser.ISqlParser; +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; +import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; import com.pig4cloud.pigx.common.core.datascope.DataScopeInterceptor; import com.pig4cloud.pigx.common.core.util.TenantUtils; import lombok.extern.slf4j.Slf4j; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java index 0b0988881..d7244ee05 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DeptController.java @@ -56,7 +56,7 @@ public class DeptController { */ @GetMapping("/{id}") public R get(@PathVariable Integer id) { - return new R<>(sysDeptService.selectById(id)); + return new R<>(sysDeptService.getById(id)); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java index 97ce68666..b08c8a5e7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/DictController.java @@ -20,11 +20,11 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.service.SysDictService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import io.swagger.annotations.Api; @@ -36,7 +36,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** *

@@ -61,18 +60,18 @@ public class DictController { */ @GetMapping("/{id}") public R dict(@PathVariable Integer id) { - return new R<>(sysDictService.selectById(id)); + return new R<>(sysDictService.getById(id)); } /** * 分页查询字典信息 * - * @param params 分页对象 + * @param page 分页对象 * @return 分页对象 */ @GetMapping("/page") - public R dictPage(@RequestParam Map params) { - return new R<>(sysDictService.selectPage(new Query<>(params), new EntityWrapper<>())); + public R> getSysDictPage(Page page, SysDict sysDict) { + return new R<>(sysDictService.getSysDictPage(page,sysDict)); } /** @@ -86,7 +85,7 @@ public class DictController { public R> findDictByType(@PathVariable String type) { SysDict condition = new SysDict(); condition.setType(type); - return new R<>(sysDictService.selectList(new EntityWrapper<>(condition))); + return new R<>(sysDictService.list(new QueryWrapper<>(condition))); } /** @@ -100,7 +99,7 @@ public class DictController { @CacheEvict(value = "dict_details", key = "#sysDict.type") @PreAuthorize("@pms.hasPermission('sys_dict_add')") public R dict(@Valid @RequestBody SysDict sysDict) { - return new R<>(sysDictService.insert(sysDict)); + return new R<>(sysDictService.save(sysDict)); } /** @@ -115,7 +114,7 @@ public class DictController { @CacheEvict(value = "dict_details", key = "#type") @PreAuthorize("@pms.hasPermission('sys_dict_del')") public R deleteDict(@PathVariable Integer id, @PathVariable String type) { - return new R<>(sysDictService.deleteById(id)); + return new R<>(sysDictService.removeById(id)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java index 7bbf9dbf4..627256de8 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/LogController.java @@ -20,12 +20,11 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; import com.pig4cloud.pigx.admin.service.SysLogService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import io.swagger.annotations.Api; import lombok.AllArgsConstructor; @@ -34,7 +33,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** *

@@ -52,14 +50,14 @@ public class LogController { private final SysLogService sysLogService; /** - * 分页查询日志信息 - * - * @param params 分页对象 - * @return 分页对象 + * 简单分页查询 + * @param page 分页对象 + * @param sysLog 系统日志 + * @return */ @GetMapping("/page") - public R logPage(@RequestParam Map params) { - return new R<>(sysLogService.selectPage(new Query<>(params), new EntityWrapper<>())); + public R> getSysLogPage(Page page, SysLog sysLog) { + return new R<>(sysLogService.getSysLogPage(page,sysLog)); } /** @@ -71,7 +69,7 @@ public class LogController { @DeleteMapping("/{id}") @PreAuthorize("@pms.hasPermission('sys_log_del')") public R delete(@PathVariable Long id) { - return new R<>(sysLogService.deleteById(id)); + return new R<>(sysLogService.removeById(id)); } /** @@ -82,7 +80,7 @@ public class LogController { */ @PostMapping public R save(@Valid @RequestBody SysLog sysLog) { - return new R<>(sysLogService.insert(sysLog)); + return new R<>(sysLogService.save(sysLog)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java index d9f81d14d..be462ce94 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/MenuController.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pig4cloud.pigx.admin.api.dto.MenuTree; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; @@ -78,7 +78,8 @@ public class MenuController { */ @GetMapping(value = "/tree") public R> getTree() { - return new R<>(TreeUtil.bulidTree(sysMenuService.selectList(new EntityWrapper<>()), -1)); + return new R<>(TreeUtil.bulidTree(sysMenuService.list(new QueryWrapper() + .lambda().eq(SysMenu::getDelFlag,CommonConstant.STATUS_NORMAL)), -1)); } /** @@ -103,7 +104,7 @@ public class MenuController { */ @GetMapping("/{id}") public R menu(@PathVariable Integer id) { - return new R<>(sysMenuService.selectById(id)); + return new R<>(sysMenuService.getById(id)); } /** @@ -116,7 +117,7 @@ public class MenuController { @PostMapping @PreAuthorize("@pms.hasPermission('sys_menu_add')") public R menu(@Valid @RequestBody SysMenu sysMenu) { - return new R<>(sysMenuService.insert(sysMenu)); + return new R<>(sysMenuService.save(sysMenu)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java index 15d70b386..9c7bc5a5f 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/OauthClientDetailsController.java @@ -19,11 +19,10 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import io.swagger.annotations.Api; @@ -32,7 +31,6 @@ import org.springframework.security.access.prepost.PreAuthorize; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Map; /** *

@@ -57,19 +55,19 @@ public class OauthClientDetailsController { */ @GetMapping("/{id}") public R get(@PathVariable Integer id) { - return new R<>(sysOauthClientDetailsService.selectById(id)); + return new R<>(sysOauthClientDetailsService.getById(id)); } /** - * 分页查询信息 - * - * @param params 分页对象 - * @return 分页对象 + * 简单分页查询 + * @param page 分页对象 + * @param sysOauthClientDetails 系统终端 + * @return */ @GetMapping("/page") - public R page(@RequestParam Map params) { - return new R<>(sysOauthClientDetailsService.selectPage(new Query<>(params), new EntityWrapper<>())); + public R> getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails) { + return new R<>(sysOauthClientDetailsService.getSysOauthClientDetailsPage(page,sysOauthClientDetails)); } /** @@ -82,7 +80,7 @@ public class OauthClientDetailsController { @PostMapping @PreAuthorize("@pms.hasPermission('sys_client_add')") public R add(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) { - return new R<>(sysOauthClientDetailsService.insert(sysOauthClientDetails)); + return new R<>(sysOauthClientDetailsService.save(sysOauthClientDetails)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java index a2278f1d5..bb828453e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/RoleController.java @@ -19,12 +19,12 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysRole; import com.pig4cloud.pigx.admin.service.SysRoleMenuService; import com.pig4cloud.pigx.admin.service.SysRoleService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import io.swagger.annotations.Api; @@ -55,7 +55,7 @@ public class RoleController { */ @GetMapping("/{id}") public R role(@PathVariable Integer id) { - return new R<>(sysRoleService.selectById(id)); + return new R<>(sysRoleService.getById(id)); } /** @@ -68,7 +68,7 @@ public class RoleController { @PostMapping @PreAuthorize("@pms.hasPermission('sys_role_add')") public R role(@RequestBody SysRole sysRole) { - return new R<>(sysRoleService.insert(sysRole)); + return new R<>(sysRoleService.save(sysRole)); } /** @@ -104,18 +104,18 @@ public class RoleController { */ @GetMapping("/list") public R> roleList() { - return new R<>(sysRoleService.selectList(new EntityWrapper<>())); + return new R<>(sysRoleService.list(new QueryWrapper<>())); } /** * 分页查询角色信息 * - * @param params 分页对象 + * @param page 分页对象 * @return 分页对象 */ @GetMapping("/page") - public R rolePage(@RequestParam Map params) { - return new R<>(sysRoleService.selectPage(new Query<>(params), new EntityWrapper<>())); + public R rolePage(Page page) { + return new R<>(sysRoleService.page(page, new QueryWrapper<>())); } /** @@ -129,7 +129,7 @@ public class RoleController { @PutMapping("/upd-menu") @PreAuthorize("@pms.hasPermission('sys_role_perm')") public R roleMenuUpd(Integer roleId, @RequestParam(value = "menuIds", required = false) String menuIds) { - SysRole sysRole = sysRoleService.selectById(roleId); + SysRole sysRole = sysRoleService.getById(roleId); return new R<>(sysRoleMenuService.insertRoleMenus(sysRole.getRoleCode(), roleId, menuIds)); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java index cb29c0ced..8b5e36e6b 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/SysSocialDetailsController.java @@ -17,12 +17,11 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import com.pig4cloud.pigx.admin.service.SysSocialDetailsService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import io.swagger.annotations.Api; @@ -30,7 +29,6 @@ import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.validation.Valid; -import java.util.Map; /** @@ -48,14 +46,15 @@ public class SysSocialDetailsController { /** - * 列表 + * 社交登录账户简单分页查询 * - * @param params + * @param page 分页对象 + * @param sysSocialDetails 社交登录 * @return */ @GetMapping("/page") - public R page(@RequestParam Map params) { - return new R<>(sysSocialDetailsService.selectPage(new Query<>(params), new EntityWrapper<>())); + public R> getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { + return new R<>(sysSocialDetailsService.getSysSocialDetailsPage(page, sysSocialDetails)); } @@ -67,7 +66,7 @@ public class SysSocialDetailsController { */ @GetMapping("/{id}") public R info(@PathVariable("id") Integer id) { - return new R<>(sysSocialDetailsService.selectById(id)); + return new R<>(sysSocialDetailsService.getById(id)); } /** @@ -79,7 +78,7 @@ public class SysSocialDetailsController { @SysLog("保存三方信息") @PostMapping public R save(@Valid @RequestBody SysSocialDetails sysSocialDetails) { - sysSocialDetailsService.insert(sysSocialDetails); + sysSocialDetailsService.save(sysSocialDetails); return new R<>(Boolean.TRUE); } @@ -105,7 +104,7 @@ public class SysSocialDetailsController { @SysLog("删除三方信息") @DeleteMapping("/{id}") public R delete(@PathVariable Integer id) { - return new R<>(sysSocialDetailsService.deleteById(id)); + return new R<>(sysSocialDetailsService.removeById(id)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java index ef27285da..f4c2207b5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/TokenController.java @@ -17,7 +17,8 @@ package com.pig4cloud.pigx.admin.controller; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.feign.RemoteTokenService; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.R; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java index 3c1a010f6..ae8916881 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/controller/UserController.java @@ -20,8 +20,9 @@ package com.pig4cloud.pigx.admin.controller; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; @@ -30,7 +31,6 @@ import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.admin.service.SysUserService; import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.log.annotation.SysLog; import com.pig4cloud.pigx.common.security.util.SecurityUtils; @@ -46,7 +46,6 @@ import org.springframework.web.bind.annotation.*; import javax.validation.Valid; import java.util.List; -import java.util.Map; /** * @author lengleng @@ -82,7 +81,7 @@ public class UserController { SysUser condition = new SysUser(); condition.setUsername(username); - SysUser sysUser = userService.selectOne(new EntityWrapper<>(condition)); + SysUser sysUser = userService.getOne(new QueryWrapper<>(condition)); if (sysUser == null) { return new R<>(); } @@ -110,7 +109,7 @@ public class UserController { public R user(@PathVariable String username) { SysUser condition = new SysUser(); condition.setUsername(username); - return new R<>(userService.selectOne(new EntityWrapper<>(condition))); + return new R<>(userService.getOne(new QueryWrapper<>(condition))); } /** @@ -125,7 +124,7 @@ public class UserController { @ApiOperation(value = "删除用户", notes = "根据ID删除用户") @ApiImplicitParam(name = "id", value = "用户ID", required = true, dataType = "int", paramType = "path") public R userDel(@PathVariable Integer id) { - SysUser sysUser = userService.selectById(id); + SysUser sysUser = userService.getById(id); return new R<>(userService.deleteUserById(sysUser)); } @@ -143,7 +142,7 @@ public class UserController { BeanUtils.copyProperties(userDto, sysUser); sysUser.setDelFlag(CommonConstant.STATUS_NORMAL); sysUser.setPassword(ENCODER.encode(userDto.getPassword())); - userService.insert(sysUser); + userService.save(sysUser); userDto.getRole().forEach(roleId -> { SysUserRole userRole = new SysUserRole(); userRole.setUserId(sysUser.getUserId()); @@ -169,12 +168,13 @@ public class UserController { /** * 分页查询用户 * - * @param params 参数集 + * @param page 参数集 + * @param username 用户名 * @return 用户集合 */ @GetMapping("/page") - public R userPage(@RequestParam Map params) { - return new R<>(userService.selectWithRolePage(new Query(params))); + public R userPage(Page> page, @RequestParam(required = false) String username,@RequestParam(required = false) String deptId) { + return new R<>(userService.getUsersWithRolePage(page,username,deptId)); } /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java index d073f7dbb..cc5d82620 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/SmsLoginHandler.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.handler; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.service.SysUserService; @@ -58,7 +58,7 @@ public class SmsLoginHandler extends AbstractLoginHandler { SysUser condition = new SysUser(); condition.setPhone(identify); SysUser sysUser = sysUserService - .selectOne(new EntityWrapper<>(condition)); + .getOne(new QueryWrapper<>(condition)); if (sysUser == null) { log.info("手机号未注册:{}", identify); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java index 55d9364bb..19eec46cd 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/handler/WeChatLoginHandler.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.admin.handler; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import com.pig4cloud.pigx.admin.api.entity.SysUser; @@ -55,7 +55,7 @@ public class WeChatLoginHandler extends AbstractLoginHandler { public String identify(String code) { SysSocialDetails condition = new SysSocialDetails(); condition.setType(EnumLoginType.WECHAT.getType()); - SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(condition); + SysSocialDetails socialDetails = sysSocialDetailsMapper.selectOne(new QueryWrapper<>(condition)); String url = String.format(SecurityConstants.WX_AUTHORIZATION_CODE_URL , socialDetails.getAppId(), socialDetails.getAppSecret(), code); @@ -77,7 +77,7 @@ public class WeChatLoginHandler extends AbstractLoginHandler { SysUser condition = new SysUser(); condition.setWxOpenid(openId); SysUser sysUser = sysUserService - .selectOne(new EntityWrapper<>(condition)); + .getOne(new QueryWrapper<>(condition)); if (sysUser == null) { log.info("微信未绑定:{}", openId); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java index 4ac7d3b8e..a77724a30 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptMapper.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysDept; import java.util.List; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java index cdbfb3bcd..850ebeb3b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDeptRelationMapper.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java index 20c9c9c82..b5ca1468b 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysDictMapper.java @@ -19,8 +19,11 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysDict; +import org.apache.ibatis.annotations.Param; /** *

@@ -31,5 +34,12 @@ import com.pig4cloud.pigx.admin.api.entity.SysDict; * @since 2017-11-19 */ public interface SysDictMapper extends BaseMapper { + /** + * 系统字典简单分页查询 + * @param sysDict 系统字典 + * @return + */ + IPage getSysDictPage(Page page, @Param("sysDict") SysDict sysDict); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java index c248310a4..b8fbafee7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysLogMapper.java @@ -19,8 +19,11 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysLog; +import org.apache.ibatis.annotations.Param; /** *

@@ -31,5 +34,10 @@ import com.pig4cloud.pigx.admin.api.entity.SysLog; * @since 2017-11-20 */ public interface SysLogMapper extends BaseMapper { - + /** + * 系统日志简单分页查询 + * @param sysLog 系统日志 + * @return + */ + IPage getSysLogPage(Page page, @Param("sysLog") SysLog sysLog); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java index c0c0164f6..26f7ca31e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysMenuMapper.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java index 0baffe4b3..99e2318bb 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysOauthClientDetailsMapper.java @@ -20,8 +20,11 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; +import org.apache.ibatis.annotations.Param; /** *

@@ -32,5 +35,12 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; * @since 2018-05-15 */ public interface SysOauthClientDetailsMapper extends BaseMapper { + /** + * 系统终端简单分页查询 + * @param sysOauthClientDetails 系统终端 + * @return + */ + IPage getSysOauthClientDetailsPage(Page page, @Param("sysOauthClientDetails") SysOauthClientDetails sysOauthClientDetails); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java index ab9603351..cc0cb9cb0 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMapper.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysRole; import java.util.List; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java index 0843d7b08..0183fda50 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRoleMenuMapper.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java index 4369897de..73527d2c0 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysRouteConfMapper.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import org.apache.ibatis.annotations.Mapper; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java index b18f2da09..f8a212fc5 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysSocialDetailsMapper.java @@ -17,9 +17,12 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 系统社交登录账号表 @@ -29,5 +32,10 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface SysSocialDetailsMapper extends BaseMapper { - + /** + * 社交登录简单分页查询 + * @param sysSocialDetails 社交登录 + * @return + */ + IPage getSysSocialDetailsPage(Page page, @Param("sysSocialDetails") SysSocialDetails sysSocialDetails); } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java index 6183fca83..84490092e 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserMapper.java @@ -19,11 +19,12 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.common.core.datascope.DataScope; -import com.pig4cloud.pigx.common.core.util.Query; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -48,13 +49,12 @@ public interface SysUserMapper extends BaseMapper { /** * 分页查询用户信息（含角色） * - * @param query 分页条件 + * @param page 分页 * @param username 用户名 - * @param deptId 部门ID - * @param dataScope 数据权限 + * @param dataScope * @return list */ - List selectUserVoPage(Query query, @Param("username") Object username, @Param("deptId") Object deptId, DataScope dataScope); + IPage> getUserVosPage(Page page, @Param("username") String username,@Param("deptId")String deptId,DataScope dataScope); /** * 通过ID查询用户信息 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java index 71d9ec14e..4029bf69a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/mapper/SysUserRoleMapper.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.pig4cloud.pigx.admin.api.entity.SysUserRole; import org.apache.ibatis.annotations.Param; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java index 8a69b5659..89d6c1a43 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptRelationService.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java index d6489fdc7..098d29959 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDeptService.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.DeptTree; import com.pig4cloud.pigx.admin.api.entity.SysDept; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java index e5a5b3ff5..a74af2a48 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysDictService.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysDict; /** @@ -32,4 +34,11 @@ import com.pig4cloud.pigx.admin.api.entity.SysDict; */ public interface SysDictService extends IService { + /** + * 系统字典简单分页查询 + * @param sysDict 系统字典 + * @return + */ + IPage getSysDictPage(Page page, SysDict sysDict); + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java index edd40547c..4d427ac0c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysLogService.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; @@ -35,6 +37,13 @@ import java.util.List; */ public interface SysLogService extends IService { + /** + * 系统日志简单分页查询 + * @param sysLog 系统日志 + * @return + */ + IPage getSysLogPage(Page page, SysLog sysLog); + /** * 批量插入前端错误日志 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java index b69f04ca2..4224406cc 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysMenuService.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java index df81a1012..5e7343bfa 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysOauthClientDetailsService.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; /** @@ -31,6 +33,13 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; * @since 2018-05-15 */ public interface SysOauthClientDetailsService extends IService { + /** + * 系统终端简单分页查询 + * @param sysOauthClientDetails 系统终端 + * @return + */ + IPage getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails); + /** * 通过ID删除客户端 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java index 4a451c610..172d5ecbf 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleMenuService.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java index 9e98670ca..935948ee1 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRoleService.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysRole; import java.util.List; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java index 362a871f8..dd0b55ad1 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysRouteConfService.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.admin.service; import cn.hutool.json.JSONArray; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import reactor.core.publisher.Mono; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java index d5f10a04f..57cd5da17 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysSocialDetailsService.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; @@ -29,6 +31,13 @@ import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails; */ public interface SysSocialDetailsService extends IService { + /** + * 社交登录简单分页查询 + * @param sysSocialDetails 社交登录 + * @return + */ + IPage getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails); + /** * 绑定社交账号 * diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java index 5bba86ee0..d32763167 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserRoleService.java @@ -20,7 +20,7 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.entity.SysUserRole; /** diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java index 40c33380e..149725cd2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/SysUserService.java @@ -19,13 +19,13 @@ package com.pig4cloud.pigx.admin.service; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.api.vo.UserVO; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import java.util.List; @@ -46,11 +46,11 @@ public interface SysUserService extends IService { /** * 分页查询用户信息（含有角色信息） * - * @param query 查询条件 + * @param page 分页对象 + * @param username 用户名 * @return */ - Page selectWithRolePage(Query query); - + IPage> getUsersWithRolePage(Page> page, String username,String deptId); /** * 删除用户 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java index 374b0b82f..66782b2f2 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/MobileServiceImpl.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.RandomUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.pig4cloud.pigx.admin.api.entity.SysUser; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.MobileService; @@ -60,7 +60,7 @@ public class MobileServiceImpl implements MobileService { public R sendSmsCode(String mobile) { SysUser condition = new SysUser(); condition.setPhone(mobile); - List userList = userMapper.selectList(new EntityWrapper<>(condition)); + List userList = userMapper.selectList(new QueryWrapper<>(condition)); if (CollUtil.isEmpty(userList)) { log.info("手机号未注册:{}", mobile); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java index e845c412d..378958266 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptRelationServiceImpl.java @@ -20,8 +20,8 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; import com.pig4cloud.pigx.admin.mapper.SysDeptRelationMapper; @@ -58,13 +58,13 @@ public class SysDeptRelationServiceImpl extends ServiceImpl relationList = sysDeptRelationMapper - .selectList(new EntityWrapper<>(condition)) + .selectList(new QueryWrapper<>(condition)) .stream().map(relation -> { relation.setDescendant(sysDept.getDeptId()); return relation; }).collect(Collectors.toList()); if (CollUtil.isNotEmpty(relationList)) { - this.insertBatch(relationList); + this.saveBatch(relationList); } //自己也要维护到关系表中 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java index d8375fd4b..6879a3ec4 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDeptServiceImpl.java @@ -20,9 +20,8 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.collection.CollUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.mapper.Wrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.dto.DeptTree; import com.pig4cloud.pigx.admin.api.entity.SysDept; import com.pig4cloud.pigx.admin.api.entity.SysDeptRelation; @@ -30,6 +29,7 @@ import com.pig4cloud.pigx.admin.api.vo.TreeUtil; import com.pig4cloud.pigx.admin.mapper.SysDeptMapper; import com.pig4cloud.pigx.admin.service.SysDeptRelationService; import com.pig4cloud.pigx.admin.service.SysDeptService; +import com.pig4cloud.pigx.common.core.constant.CommonConstant; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import org.springframework.beans.BeanUtils; @@ -63,7 +63,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl public Boolean insertDept(SysDept dept) { SysDept sysDept = new SysDept(); BeanUtils.copyProperties(dept, sysDept); - this.insert(sysDept); + this.save(sysDept); sysDeptRelationService.insertDeptRelation(sysDept); return Boolean.TRUE; } @@ -82,13 +82,13 @@ public class SysDeptServiceImpl extends ServiceImpl impl SysDeptRelation condition = new SysDeptRelation(); condition.setAncestor(id); List idList = sysDeptRelationService - .selectList(new EntityWrapper<>(condition)) + .list(new QueryWrapper<>(condition)) .stream() .map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); if (CollUtil.isNotEmpty(idList)) { - this.deleteBatchIds(idList); + this.removeByIds(idList); } //删除部门级联关系 @@ -122,9 +122,10 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public List selectTree() { - Wrapper condition = new EntityWrapper<>(); - condition.orderBy("sort", false); - return getDeptTree(this.selectList(condition)); + return getDeptTree(this.list( + new QueryWrapper() + .lambda().eq(SysDept::getDelFlag, CommonConstant.STATUS_NORMAL) + )); } /** @@ -139,7 +140,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl SysDeptRelation condition = new SysDeptRelation(); condition.setAncestor(deptId); List descendantIdList = sysDeptRelationService - .selectList(new EntityWrapper<>(condition)) + .list(new QueryWrapper<>(condition)) .stream().map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java index 39519cbad..4e07e08bd 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysDictServiceImpl.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysDict; import com.pig4cloud.pigx.admin.mapper.SysDictMapper; import com.pig4cloud.pigx.admin.service.SysDictService; @@ -35,5 +37,15 @@ import org.springframework.stereotype.Service; */ @Service public class SysDictServiceImpl extends ServiceImpl implements SysDictService { + /** + * 系统字典简单分页查询 + * @param sysDict 系统字典 + * @return + */ + @Override + public IPage getSysDictPage(Page page, SysDict sysDict){ + return baseMapper.getSysDictPage(page,sysDict); + } + } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java index cc40275a7..89660b985 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysLogServiceImpl.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysLog; import com.pig4cloud.pigx.admin.api.vo.PreLogVo; import com.pig4cloud.pigx.admin.mapper.SysLogMapper; @@ -41,6 +43,15 @@ import java.util.stream.Collectors; */ @Service public class SysLogServiceImpl extends ServiceImpl implements SysLogService { + /** + * 系统日志简单分页查询 + * @param sysLog 系统日志 + * @return + */ + @Override + public IPage getSysLogPage(Page page, SysLog sysLog){ + return baseMapper.getSysLogPage(page,sysLog); + } /** * 批量插入前端错误日志 @@ -63,6 +74,6 @@ public class SysLogServiceImpl extends ServiceImpl impleme return log; }) .collect(Collectors.toList()); - return this.insertBatch(sysLogs); + return this.saveBatch(sysLogs); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java index e894b7d48..e2c0a83fe 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysMenuServiceImpl.java @@ -19,8 +19,9 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysMenu; import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu; import com.pig4cloud.pigx.admin.api.vo.MenuVO; @@ -62,7 +63,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl // 查询父节点为当前节点的节点 SysMenu conditon = new SysMenu(); conditon.setParentId(id); - List menuIdList = this.selectList(new EntityWrapper<>(conditon)) + List menuIdList = this.list(new QueryWrapper<>(conditon)) .stream().map(SysMenu::getMenuId) .collect(Collectors.toList()); menuIdList.add(id); @@ -71,10 +72,10 @@ public class SysMenuServiceImpl extends ServiceImpl impl menuIdList.forEach(menu -> { SysRoleMenu conditon2 = new SysRoleMenu(); conditon2.setMenuId(menu); - sysRoleMenuMapper.delete(new EntityWrapper<>(conditon2)); + sysRoleMenuMapper.delete(new UpdateWrapper<>(conditon2)); }); //删除当前菜单及其子菜单 - return this.deleteBatchIds(menuIdList); + return this.removeByIds(menuIdList); } @Override diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java index aa496916e..29cf296f5 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysOauthClientDetailsServiceImpl.java @@ -19,7 +19,9 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails; import com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper; import com.pig4cloud.pigx.admin.service.SysOauthClientDetailsService; @@ -38,6 +40,17 @@ import org.springframework.stereotype.Service; @Service public class SysOauthClientDetailsServiceImpl extends ServiceImpl implements SysOauthClientDetailsService { + + /** + * 系统终端简单分页查询 + * @param sysOauthClientDetails 系统终端 + * @return + */ + @Override + public IPage getSysOauthClientDetailsPage(Page page, SysOauthClientDetails sysOauthClientDetails){ + return baseMapper.getSysOauthClientDetailsPage(page,sysOauthClientDetails); + } + /** * 通过ID删除客户端 * @@ -47,7 +60,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl(condition)); + this.remove(new UpdateWrapper<>(condition)); if (StrUtil.isBlank(menuIds)) { return Boolean.TRUE; @@ -77,6 +77,6 @@ public class SysRoleMenuServiceImpl extends ServiceImpl impl SysRoleMenu condition = new SysRoleMenu(); condition.setRoleId(id); - sysRoleMenuMapper.delete(new EntityWrapper<>(condition)); - return this.deleteById(id); + sysRoleMenuMapper.delete(new UpdateWrapper<>(condition)); + return this.removeById(id); } } diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java index 5f6a0c1ae..6b2d6b01c 100755 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRouteConfServiceImpl.java @@ -19,8 +19,9 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.json.JSONArray; import cn.hutool.json.JSONUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysRouteConf; import com.pig4cloud.pigx.admin.mapper.SysRouteConfMapper; import com.pig4cloud.pigx.admin.service.SysRouteConfService; @@ -70,7 +71,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl routes() { SysRouteConf condition = new SysRouteConf(); condition.setDelFlag(CommonConstant.STATUS_NORMAL); - return baseMapper.selectList(new EntityWrapper<>(condition)); + return baseMapper.selectList(new QueryWrapper<>(condition)); } /** @@ -132,7 +133,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl(condition)); + this.remove(new UpdateWrapper<>(condition)); //插入生效路由 List routeConfList = routeDefinitionVoList.stream().map(vo -> { @@ -144,7 +145,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl getSysSocialDetailsPage(Page page, SysSocialDetails sysSocialDetails) { + return baseMapper.getSysSocialDetailsPage(page, sysSocialDetails); + } + /** * 绑定社交账号 * @@ -65,7 +80,7 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl getOpenId(String appId, String code) { SysSocialDetails condition = new SysSocialDetails(); condition.setAppId(appId); - SysSocialDetails socialDetails = this.baseMapper.selectOne(condition); + SysSocialDetails socialDetails = this.baseMapper.selectOne(new QueryWrapper<>(condition)); String openId = null; //微信登录 diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java index 648d3e66e..3da2ab3ca 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserRoleServiceImpl.java @@ -19,7 +19,7 @@ package com.pig4cloud.pigx.admin.service.impl; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.entity.SysUserRole; import com.pig4cloud.pigx.admin.mapper.SysUserRoleMapper; import com.pig4cloud.pigx.admin.service.SysUserRoleService; diff --git a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java index f1edfbe1a..f76470ad4 100644 --- a/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java +++ b/pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysUserServiceImpl.java @@ -21,9 +21,11 @@ package com.pig4cloud.pigx.admin.service.impl; import cn.hutool.core.util.ArrayUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.admin.api.dto.UserDTO; import com.pig4cloud.pigx.admin.api.dto.UserInfo; import com.pig4cloud.pigx.admin.api.entity.*; @@ -32,7 +34,6 @@ import com.pig4cloud.pigx.admin.api.vo.UserVO; import com.pig4cloud.pigx.admin.mapper.SysUserMapper; import com.pig4cloud.pigx.admin.service.*; import com.pig4cloud.pigx.common.core.datascope.DataScope; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; @@ -103,15 +104,13 @@ public class SysUserServiceImpl extends ServiceImpl impl } @Override - public Page selectWithRolePage(Query query) { + public IPage> getUsersWithRolePage(Page> page, String username,String deptId) { DataScope dataScope = new DataScope(); dataScope.setScopeName("deptId"); dataScope.setIsOnly(true); dataScope.setDeptIds(getChildDepts()); - Object username = query.getCondition().get("username"); - Object deptId = query.getCondition().get("deptId"); - query.setRecords(baseMapper.selectUserVoPage(query, username, deptId, dataScope)); - return query; + IPage> userVosPage = baseMapper.getUserVosPage(page, username,deptId, dataScope); + return userVosPage.setTotal(Long.valueOf(userVosPage.getRecords().size())); } @@ -136,7 +135,7 @@ public class SysUserServiceImpl extends ServiceImpl impl @CacheEvict(value = "user_details", key = "#sysUser.username") public Boolean deleteUserById(SysUser sysUser) { sysUserRoleService.deleteByUserId(sysUser.getUserId()); - this.deleteById(sysUser.getUserId()); + this.removeById(sysUser.getUserId()); return Boolean.TRUE; } @@ -174,7 +173,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysUserRole condition = new SysUserRole(); condition.setUserId(userDto.getUserId()); - sysUserRoleService.delete(new EntityWrapper<>(condition)); + sysUserRoleService.remove(new UpdateWrapper<>(condition)); userDto.getRole().forEach(roleId -> { SysUserRole userRole = new SysUserRole(); userRole.setUserId(sysUser.getUserId()); @@ -194,10 +193,10 @@ public class SysUserServiceImpl extends ServiceImpl impl public List ancestorUsers(String username) { SysUser condition = new SysUser(); condition.setUsername(username); - SysUser sysUser = this.selectOne(new EntityWrapper<>(condition)); + SysUser sysUser = this.getOne(new QueryWrapper<>(condition)); Integer deptId = sysUser.getDeptId(); - SysDept sysDept = sysDeptService.selectById(deptId); + SysDept sysDept = sysDeptService.getById(deptId); if (sysDept == null) { return null; } @@ -205,7 +204,7 @@ public class SysUserServiceImpl extends ServiceImpl impl Integer parentId = sysDept.getParentId(); SysUser condition2 = new SysUser(); condition2.setDeptId(parentId); - return this.selectList(new EntityWrapper<>(condition2)); + return this.list(new QueryWrapper<>(condition2)); } /** @@ -219,7 +218,7 @@ public class SysUserServiceImpl extends ServiceImpl impl SysDeptRelation condition = new SysDeptRelation(); condition.setAncestor(deptId); return sysDeptRelationService - .selectList(new EntityWrapper<>(condition)) + .list(new QueryWrapper<>(condition)) .stream() .map(SysDeptRelation::getDescendant) .collect(Collectors.toList()); diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml index 99029776c..e4a37152a 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml @@ -1,4 +1,5 @@ + + - - - - - - - - - - - - + + + + + + + + + + + - - - id, value, label, type, description, sort, create_time AS createTime, update_time AS updateTime, remarks, del_flag AS delFlag - + + + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml index 01c09d98e..9e8b8a9f7 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml @@ -1,4 +1,5 @@ + + - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + - - - id, type, title, create_by AS createBy, create_time AS createTime, update_time AS updateTime, remote_addr AS remoteAddr, user_agent AS userAgent, request_uri AS requestUri, method, params, `time`, del_flag AS delFlag - + + + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml index 54fd10e9d..11b17f1fc 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml @@ -1,4 +1,5 @@ + + - - - - - - - - - - - - - + + + + + + + + + + + + - - - client_id AS clientId, resource_ids AS resourceIds, client_secret AS clientSecret, scope, authorized_grant_types AS authorizedGrantTypes, web_server_redirect_uri AS webServerRedirectUri, authorities, access_token_validity AS accessTokenValidity, refresh_token_validity AS refreshTokenValidity, additional_information AS additionalInformation, autoapprove - + + + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml index cae986a26..e0e021afb 100755 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml @@ -1,37 +1,83 @@ + - + - - - - - - - - - - - - + + + + + + + + + + + + + + diff --git a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml index 1f5f1c87e..f230ab92c 100644 --- a/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml +++ b/pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml @@ -131,7 +131,7 @@ `user`.user_id = #{id} - SELECT `user`.user_id, `user`.username, diff --git a/pigx-visual/pigx-activiti/Dockerfile b/pigx-visual/pigx-activiti/Dockerfile index f5f5c3085..a85c850d7 100644 --- a/pigx-visual/pigx-activiti/Dockerfile +++ b/pigx-visual/pigx-activiti/Dockerfile @@ -6,7 +6,7 @@ RUN mkdir -p /pigx/bin/com.pig4cloud/pigx-daemon WORKDIR /pigx/bin/com.pig4cloud/pigx-activiti -EXPOSE 5002 +EXPOSE 5005 ADD ./pigx-visual/pigx-activiti/target/pigx-activiti.jar ./ diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java index 3a3f7581a..c8c5ca9d5 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/config/MybatisPlusConfigurer.java @@ -17,10 +17,10 @@ package com.pig4cloud.pigx.act.config; -import com.baomidou.mybatisplus.plugins.PaginationInterceptor; -import com.baomidou.mybatisplus.plugins.parser.ISqlParser; -import com.baomidou.mybatisplus.plugins.parser.tenant.TenantHandler; -import com.baomidou.mybatisplus.plugins.parser.tenant.TenantSqlParser; +import com.baomidou.mybatisplus.core.parser.ISqlParser; +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.extension.plugins.tenant.TenantHandler; +import com.baomidou.mybatisplus.extension.plugins.tenant.TenantSqlParser; import com.pig4cloud.pigx.common.core.util.TenantUtils; import lombok.extern.slf4j.Slf4j; import net.sf.jsqlparser.expression.Expression; diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java index 5d32cdb28..ee5985800 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/LeaveBillController.java @@ -17,20 +17,17 @@ package com.pig4cloud.pigx.act.controller; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.service.LeaveBillService; import com.pig4cloud.pigx.act.service.ProcessService; import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; -import java.util.Map; - /** * 请假流程 @@ -46,14 +43,14 @@ public class LeaveBillController { private final ProcessService processService; /** - * 列表 - * - * @param params + * 请假审批单简单分页查询 + * @param page 分页对象 + * @param leaveBill 请假审批单 * @return */ @GetMapping("/page") - public Page page(@RequestParam Map params) { - return leaveBillService.selectPage(new Query<>(params), new EntityWrapper<>()); + public R> getLeaveBillPage(Page page, LeaveBill leaveBill) { + return new R<>(leaveBillService.getLeaveBillPage(page,leaveBill)); } @@ -65,7 +62,7 @@ public class LeaveBillController { */ @GetMapping("/{leaveId}") public R info(@PathVariable("leaveId") Integer leaveId) { - LeaveBill leaveBill = leaveBillService.selectById(leaveId); + LeaveBill leaveBill = leaveBillService.getById(leaveId); return new R<>(leaveBill); } @@ -79,7 +76,7 @@ public class LeaveBillController { public R save(@RequestBody LeaveBill leaveBill) { leaveBill.setUsername(SecurityUtils.getUsername()); leaveBill.setState(EnumTaskStatus.UNSUBMIT.getStatus()); - return new R<>(leaveBillService.insert(leaveBill)); + return new R<>(leaveBillService.save(leaveBill)); } /** @@ -102,7 +99,7 @@ public class LeaveBillController { */ @DeleteMapping("/{leaveId}") public R delete(@PathVariable Integer leaveId) { - return new R<>(leaveBillService.deleteById(leaveId)); + return new R<>(leaveBillService.removeById(leaveId)); } /** diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java index 47d4bad19..a53df09a3 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ModelController.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.act.controller; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.ModelForm; import com.pig4cloud.pigx.act.service.ModelService; import com.pig4cloud.pigx.common.core.util.R; @@ -52,8 +52,8 @@ public class ModelController { } @GetMapping - public Page list(@RequestParam Map params) { - return modelService.selectPage(params); + public R> list(@RequestParam Map params) { + return new R<> (modelService.selectPage(params)); } @DeleteMapping("/{id}") diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java index fc1d1e8d4..db710feb9 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/ProcessController.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.act.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.ProcessDefDTO; import com.pig4cloud.pigx.act.service.ProcessService; import com.pig4cloud.pigx.common.core.constant.enums.EnumResourceType; @@ -44,8 +44,8 @@ public class ProcessController { private final ProcessService processService; @GetMapping - public Page list(@RequestParam Map params) { - return processService.getProcessByPage(params); + public R> list(@RequestParam Map params) { + return new R<>(processService.getProcessByPage(params)); } @GetMapping(value = "/resource/{proInsId}/{procDefId}/{resType}") diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java index bc2a97941..c812175d3 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/controller/TaskController.java @@ -18,7 +18,7 @@ package com.pig4cloud.pigx.act.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.LeaveBillDto; import com.pig4cloud.pigx.act.service.ActTaskService; import com.pig4cloud.pigx.common.core.util.R; @@ -44,8 +44,8 @@ public class TaskController { private final ActTaskService actTaskService; @GetMapping("/todo") - public Page todo(@RequestParam Map params) { - return actTaskService.findTaskByName(params, SecurityUtils.getUsername()); + public R todo(@RequestParam Map params) { + return new R<>(actTaskService.findTaskByName(params, SecurityUtils.getUsername())); } @GetMapping("/{id}") diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java index a757460d2..0a7cce52d 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/entity/LeaveBill.java @@ -17,11 +17,11 @@ package com.pig4cloud.pigx.act.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableLogic; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableLogic; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java index 3df2d19f0..67fc07cf6 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/mapper/LeaveBillMapper.java @@ -1,8 +1,11 @@ package com.pig4cloud.pigx.act.mapper; -import com.baomidou.mybatisplus.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.entity.LeaveBill; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * 请假流程 @@ -12,5 +15,11 @@ import org.apache.ibatis.annotations.Mapper; */ @Mapper public interface LeaveBillMapper extends BaseMapper { + /** + * 请假审批单简单分页查询 + * @param leaveBill 请假审批单 + * @return + */ + IPage getLeaveBillPage(Page page, @Param("leaveBill") LeaveBill leaveBill); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java index fff99cbee..409f93e67 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ActTaskService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.act.service; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.CommentDto; import com.pig4cloud.pigx.act.dto.LeaveBillDto; @@ -39,7 +39,7 @@ public interface ActTaskService { * @param name * @return */ - Page findTaskByName(Map params, String name); + IPage findTaskByName(Map params, String name); /** * 通过任务ID查询任务信息关联申请单信息 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java index 1ab3605d2..db8c2dc90 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/LeaveBillService.java @@ -1,6 +1,8 @@ package com.pig4cloud.pigx.act.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import com.pig4cloud.pigx.act.entity.LeaveBill; /** @@ -10,5 +12,12 @@ import com.pig4cloud.pigx.act.entity.LeaveBill; * @date 2018-09-27 15:20:44 */ public interface LeaveBillService extends IService { + /** + * 请假审批单简单分页查询 + * + * @param leaveBill 请假审批单 + * @return + */ + IPage getLeaveBillPage(Page page, LeaveBill leaveBill); } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java index 456d0ce56..13ce1d558 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ModelService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.act.service; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import org.activiti.engine.repository.Model; import java.util.Map; @@ -45,7 +45,7 @@ public interface ModelService { * @param params * @return */ - Page selectPage(Map params); + IPage selectPage(Map params); /** * 删除流程 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java index e546c5e5a..fa0d79a99 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/ProcessService.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.act.service; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; import com.pig4cloud.pigx.act.dto.ProcessDefDTO; import java.io.InputStream; @@ -35,7 +35,7 @@ public interface ProcessService { * @param params * @return */ - Page getProcessByPage(Map params); + IPage getProcessByPage(Map params); /** * 读取xml/image资源 diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java index 91ccc95b4..679f050fb 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ActTaskServiceImpl.java @@ -19,13 +19,15 @@ package com.pig4cloud.pigx.act.service.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.dto.CommentDto; import com.pig4cloud.pigx.act.dto.LeaveBillDto; import com.pig4cloud.pigx.act.dto.TaskDTO; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.ActTaskService; +import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; import com.pig4cloud.pigx.common.security.util.SecurityUtils; import lombok.AllArgsConstructor; @@ -68,15 +70,15 @@ public class ActTaskServiceImpl implements ActTaskService { private final ProcessEngineFactoryBean processEngine; @Override - public Page findTaskByName(Map params, String name) { + public IPage findTaskByName(Map params, String name) { TaskQuery taskQuery = taskService.createTaskQuery() .taskCandidateOrAssigned(name) .orderByTaskCreateTime().asc(); - int page = MapUtil.getInt(params, "page"); - int limit = MapUtil.getInt(params, "limit"); + int page = MapUtil.getInt(params, PaginationConstant.CURRENT); + int limit = MapUtil.getInt(params, PaginationConstant.SIZE); - Page result = new Page(page, limit); + IPage result = new Page(page, limit); result.setTotal(taskQuery.count()); List taskDTOList = new ArrayList<>(); taskQuery.list().forEach(task -> { diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java index 2cda61954..0708b0781 100755 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/LeaveBillServiceImpl.java @@ -17,7 +17,9 @@ package com.pig4cloud.pigx.act.service.impl; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.LeaveBillService; @@ -30,4 +32,15 @@ import org.springframework.stereotype.Service; @Service("leaveBillService") public class LeaveBillServiceImpl extends ServiceImpl implements LeaveBillService { + /** + * 请假审批单简单分页查询 + * + * @param leaveBill 请假审批单 + * @return + */ + @Override + public IPage getLeaveBillPage(Page page, LeaveBill leaveBill) { + return baseMapper.getLeaveBillPage(page, leaveBill); + } + } diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java index cbcf2b98c..f9bbd4d5e 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ModelServiceImpl.java @@ -19,10 +19,12 @@ package com.pig4cloud.pigx.act.service.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.node.ObjectNode; import com.pig4cloud.pigx.act.service.ModelService; +import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.SecurityConstants; import com.pig4cloud.pigx.common.core.util.TenantUtils; import lombok.AllArgsConstructor; @@ -106,7 +108,7 @@ public class ModelServiceImpl implements ModelService { * @return */ @Override - public Page selectPage(Map params) { + public IPage selectPage(Map params) { ModelQuery modelQuery = repositoryService.createModelQuery() .latestVersion().orderByLastUpdateTime().desc(); String category = (String) params.get("category"); @@ -114,10 +116,10 @@ public class ModelServiceImpl implements ModelService { modelQuery.modelCategory(category); } - int page = MapUtil.getInt(params, "page"); - int limit = MapUtil.getInt(params, "limit"); + int page = MapUtil.getInt(params, PaginationConstant.CURRENT); + int limit = MapUtil.getInt(params, PaginationConstant.SIZE); - Page result = new Page(page, limit); + IPage result = new Page(page, limit); result.setTotal(modelQuery.count()); result.setRecords(modelQuery.listPage((page - 1) * limit, limit)); return result; diff --git a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java index e0f4d5ab4..d6a9331b5 100644 --- a/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java +++ b/pigx-visual/pigx-activiti/src/main/java/com/pig4cloud/pigx/act/service/impl/ProcessServiceImpl.java @@ -19,11 +19,13 @@ package com.pig4cloud.pigx.act.service.impl; import cn.hutool.core.map.MapUtil; import cn.hutool.core.util.StrUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.act.dto.ProcessDefDTO; import com.pig4cloud.pigx.act.entity.LeaveBill; import com.pig4cloud.pigx.act.mapper.LeaveBillMapper; import com.pig4cloud.pigx.act.service.ProcessService; +import com.pig4cloud.pigx.common.core.constant.PaginationConstant; import com.pig4cloud.pigx.common.core.constant.enums.EnumProcessStatus; import com.pig4cloud.pigx.common.core.constant.enums.EnumResourceType; import com.pig4cloud.pigx.common.core.constant.enums.EnumTaskStatus; @@ -60,17 +62,17 @@ public class ProcessServiceImpl implements ProcessService { * @return */ @Override - public Page getProcessByPage(Map params) { + public IPage getProcessByPage(Map params) { ProcessDefinitionQuery query = repositoryService.createProcessDefinitionQuery().latestVersion(); String category = MapUtil.getStr(params, "category"); if (StrUtil.isNotBlank(category)) { query.processDefinitionCategory(category); } - int page = MapUtil.getInt(params, "page"); - int limit = MapUtil.getInt(params, "limit"); + int page = MapUtil.getInt(params, PaginationConstant.CURRENT); + int limit = MapUtil.getInt(params, PaginationConstant.SIZE); - Page result = new Page(page, limit); + IPage result = new Page(page, limit); result.setTotal(query.count()); List deploymentList = new ArrayList<>(); diff --git a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml index 602a4d2cf..059f6bdc9 100644 --- a/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml +++ b/pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml @@ -1,5 +1,5 @@ server: - port: 5002 + port: 5005 spring: application: diff --git a/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml b/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml index aa8e82e21..d069608b9 100755 --- a/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml +++ b/pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml @@ -5,7 +5,7 @@ - + @@ -15,5 +15,45 @@ + + + diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java index 73e252f5e..244cff272 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/config/MybatisPlusConfigurer.java @@ -17,7 +17,7 @@ package com.pig4cloud.pigx.codegen.config; -import com.baomidou.mybatisplus.plugins.PaginationInterceptor; +import com.baomidou.mybatisplus.extension.plugins.PaginationInterceptor; import org.mybatis.spring.annotation.MapperScan; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java index 1e4c09be0..c500dcfc3 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/controller/SysGeneratorController.java @@ -18,17 +18,16 @@ package com.pig4cloud.pigx.codegen.controller; import cn.hutool.core.io.IoUtil; -import com.baomidou.mybatisplus.plugins.Page; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.service.SysGeneratorService; -import com.pig4cloud.pigx.common.core.util.Query; import com.pig4cloud.pigx.common.core.util.R; import lombok.AllArgsConstructor; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; import java.io.IOException; -import java.util.Map; /** * 代码生成器 @@ -45,13 +44,12 @@ public class SysGeneratorController { /** * 列表 * - * @param params 参数集 + * @param tableName 参数集 * @return 数据库表 */ @GetMapping("/page") - public R list(@RequestParam Map params) { - Query query = new Query(params); - return new R<>(query.setRecords(sysGeneratorService.queryPage(query))); + public R list(Page page, String tableName) { + return new R<>(sysGeneratorService.queryPage(page,tableName)); } /** diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/ColumnEntity.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/ColumnEntity.java index 91ef4cd7c..445a307b2 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/ColumnEntity.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/entity/ColumnEntity.java @@ -52,7 +52,7 @@ public class ColumnEntity { */ private String attrType; /** - * 其他信息。 + * 其他信息 */ private String extra; } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java index e774a7339..89fc35f93 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/mapper/SysGeneratorMapper.java @@ -17,7 +17,8 @@ package com.pig4cloud.pigx.codegen.mapper; -import com.pig4cloud.pigx.common.core.util.Query; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import org.apache.ibatis.annotations.Param; import java.util.List; @@ -34,11 +35,11 @@ public interface SysGeneratorMapper { /** * 分页查询表格 * - * @param params + * @param page * @param tableName * @return */ - List> queryList(Query params, @Param("tableName") Object tableName); + IPage>> queryList(Page page, @Param("tableName") String tableName); /** * 查询表信息 diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java index f5cc97811..36b544471 100644 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/SysGeneratorService.java @@ -17,8 +17,9 @@ package com.pig4cloud.pigx.codegen.service; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; -import com.pig4cloud.pigx.common.core.util.Query; import java.util.List; import java.util.Map; @@ -38,8 +39,8 @@ public interface SysGeneratorService { /** * 分页查询表 - * @param query 查询条件 + * @param tableName 表名 * @return */ - List> queryPage(Query query); + IPage>> queryPage(Page page, String tableName); } diff --git a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java index 204f7a9e8..34e5c45b1 100755 --- a/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java +++ b/pigx-visual/pigx-codegen/src/main/java/com/pig4cloud/pigx/codegen/service/impl/SysGeneratorServiceImpl.java @@ -18,11 +18,12 @@ package com.pig4cloud.pigx.codegen.service.impl; import cn.hutool.core.io.IoUtil; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.pig4cloud.pigx.codegen.entity.GenConfig; import com.pig4cloud.pigx.codegen.mapper.SysGeneratorMapper; import com.pig4cloud.pigx.codegen.service.SysGeneratorService; import com.pig4cloud.pigx.codegen.util.GenUtils; -import com.pig4cloud.pigx.common.core.util.Query; import lombok.AllArgsConstructor; import org.springframework.stereotype.Service; @@ -46,13 +47,12 @@ public class SysGeneratorServiceImpl implements SysGeneratorService { /** * 分页查询表 * - * @param query 查询条件 + * @param tableName 查询条件 * @return */ @Override - public List> queryPage(Query query) { - Object tableName = query.getCondition().get("tableName"); - return sysGeneratorMapper.queryList(query, tableName); + public IPage>> queryPage(Page page, String tableName) { + return sysGeneratorMapper.queryList(page,tableName); } /** diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm index c2d0349d1..b4f9c9898 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Controller.java.vm @@ -1,14 +1,31 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ package ${package}.${moduleName}.controller; -import lombok.AllArgsConstructor; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.web.bind.annotation.*; -import com.baomidou.mybatisplus.plugins.Page; -import com.pig4cloud.pigx.common.core.util.Query; - +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.pig4cloud.pigx.common.core.util.R; +import com.pig4cloud.pigx.common.log.annotation.SysLog; import ${package}.${moduleName}.entity.${className}; import ${package}.${moduleName}.service.${className}Service; -import com.pig4cloud.pigx.common.core.util.R; +import lombok.AllArgsConstructor; +import org.springframework.web.bind.annotation.*; + import java.util.Map; @@ -19,62 +36,65 @@ import java.util.Map; * @date ${datetime} */ @RestController -@RequestMapping("/${pathName}") @AllArgsConstructor +@RequestMapping("/${pathName}") public class ${className}Controller { - private final ${className}Service ${classname}Service; + + private final ${className}Service ${classname}Service; + + /** + * 简单分页查询 + * @param page 分页对象 + * @param ${classname} ${comments} + * @return + */ + @GetMapping("/page") + public R> get${className}Page(Page<${className}> page, ${className} ${classname}) { + return new R<>(${classname}Service.get${className}Page(page,${classname})); + } - /** - * 列表 - * @param params - * @return - */ - @GetMapping("/page") - public R page(@RequestParam Map params) { - return new R<>(${classname}Service.selectPage(new Query<>(params), new EntityWrapper<>())); - } + /** + * 通过id查询单条记录 + * @param ${pk.lowerAttrName} + * @return R + */ + @GetMapping("/{${pk.lowerAttrName}}") + public R<${className}> getById(@PathVariable("${pk.lowerAttrName}") ${pk.attrType} ${pk.lowerAttrName}){ + return new R<>(${classname}Service.getById(${pk.lowerAttrName})); + } + /** + * 新增记录 + * @param ${classname} + * @return R + */ + @SysLog("新增${comments}") + @PostMapping + public R save(@RequestBody ${className} ${classname}){ + return new R<>(${classname}Service.save(${classname})); + } - /** - * 信息 - * @param ${pk.lowerAttrName} - * @return R - */ - @GetMapping("/{${pk.lowerAttrName}}") - public R get${className}ById(@PathVariable("${pk.lowerAttrName}") ${pk.attrType} ${pk.lowerAttrName}){ - return new R<>(${classname}Service.selectById(${pk.lowerAttrName})); - } + /** + * 修改记录 + * @param ${classname} + * @return R + */ + @SysLog("修改${comments}") + @PutMapping + public R update(@RequestBody ${className} ${classname}){ + return new R<>(${classname}Service.updateById(${classname})); + } - /** - * 保存 - * @param ${classname} - * @return R - */ - @PostMapping - public R save${className}(@RequestBody ${className} ${classname}){ - return new R<>(${classname}Service.insert(${classname})); - } - - /** - * 修改 - * @param ${classname} - * @return R - */ - @PutMapping - public R update${className}(@RequestBody ${className} ${classname}){ - ${classname}Service.updateById(${classname}); - return new R<>(Boolean.TRUE); - } - - /** - * 删除 - * @param ${pk.lowerAttrName} - * @return R - */ - @DeleteMapping("/{${pk.lowerAttrName}}") - public R delete${className}ById(@PathVariable ${pk.attrType} ${pk.lowerAttrName}){ - return new R<>(${classname}Service.deleteById(${pk.lowerAttrName})); - } + /** + * 通过id删除一条记录 + * @param ${pk.lowerAttrName} + * @return R + */ + @SysLog("删除${comments}") + @DeleteMapping("/{${pk.lowerAttrName}}") + public R removeById(@PathVariable ${pk.attrType} ${pk.lowerAttrName}){ + return new R<>(${classname}Service.removeById(${pk.lowerAttrName})); + } } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm index bd7327c1d..0b2d23611 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Entity.java.vm @@ -1,12 +1,27 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ package ${package}.${moduleName}.entity; -import com.baomidou.mybatisplus.activerecord.Model; -import com.baomidou.mybatisplus.annotations.TableId; -import com.baomidou.mybatisplus.annotations.TableName; -import com.baomidou.mybatisplus.enums.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; +import com.baomidou.mybatisplus.extension.activerecord.Model; import lombok.Data; import lombok.EqualsAndHashCode; - #if(${hasBigDecimal}) +#if(${hasBigDecimal}) import java.math.BigDecimal; #end import java.io.Serializable; @@ -19,26 +34,19 @@ import java.time.LocalDateTime; * @date ${datetime} */ @Data -@TableName("${tableName}") @EqualsAndHashCode(callSuper = true) +@TableName("${tableName}") public class ${className} extends Model<${className}> { - private static final long serialVersionUID = 1L; - -#foreach ($column in $columns) - /** - * $column.comments - */ - #if($column.columnName == $pk.columnName) -@TableId(type = IdType.AUTO) - #end -private $column.attrType $column.lowerAttrName; -#end +private static final long serialVersionUID = 1L; + #foreach ($column in $columns) /** - * 主键值 + * $column.comments */ - @Override - protected Serializable pkVal() { - return this.$pk.lowerAttrName; - } + #if($column.columnName == $pk.columnName) + @TableId + #end + private $column.attrType $column.lowerAttrName; + #end + } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm index e48d74fcf..d1f584b6f 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.java.vm @@ -1,8 +1,26 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ package ${package}.${moduleName}.mapper; +import com.baomidou.mybatisplus.core.mapper.BaseMapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import ${package}.${moduleName}.entity.${className}; -import com.baomidou.mybatisplus.mapper.BaseMapper; -import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; /** * ${comments} @@ -10,7 +28,13 @@ import org.apache.ibatis.annotations.Mapper; * @author ${author} * @date ${datetime} */ -@Mapper public interface ${className}Mapper extends BaseMapper<${className}> { + /** + * ${comments}简单分页查询 + * @param ${classname} ${comments} + * @return + */ + IPage<${className}> get${className}Page(Page page, @Param("${classname}") ${className} ${classname}); + } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm index 54411736d..634139d33 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Mapper.xml.vm @@ -1,14 +1,58 @@ + + + - - -#foreach($column in $columns) + + #foreach($column in $columns) + #if($column.lowerAttrName==$pk.lowerAttrName) + + #else -#end - + #end + #end + + + + + diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm index 7adce4166..9ea358cd3 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/Service.java.vm @@ -1,6 +1,24 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ package ${package}.${moduleName}.service; -import com.baomidou.mybatisplus.service.IService; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.IService; import ${package}.${moduleName}.entity.${className}; /** @@ -10,5 +28,13 @@ import ${package}.${moduleName}.entity.${className}; * @date ${datetime} */ public interface ${className}Service extends IService<${className}> { -} + /** + * ${comments}简单分页查询 + * @param ${classname} ${comments} + * @return + */ + IPage<${className}> get${className}Page(Page<${className}> page, ${className} ${classname}); + + +} diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm index f9f7fe1ad..019215800 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/ServiceImpl.java.vm @@ -1,17 +1,45 @@ +/* + * Copyright (c) 2018-2025, lengleng All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions are met: + * + * Redistributions of source code must retain the above copyright notice, + * this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * Neither the name of the pig4cloud.com developer nor the names of its + * contributors may be used to endorse or promote products derived from + * this software without specific prior written permission. + * Author: lengleng (wangiegie@gmail.com) + */ package ${package}.${moduleName}.service.impl; -import org.springframework.stereotype.Service; -import java.util.Map; -import com.baomidou.mybatisplus.mapper.EntityWrapper; -import com.baomidou.mybatisplus.plugins.Page; -import com.baomidou.mybatisplus.service.impl.ServiceImpl; - -import ${package}.${moduleName}.mapper.${className}Mapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import ${package}.${moduleName}.entity.${className}; import ${package}.${moduleName}.service.${className}Service; +import org.springframework.stereotype.Service; - +/** + * ${comments} + * + * @author ${author} + * @date ${datetime} + */ @Service("${classname}Service") public class ${className}ServiceImpl extends ServiceImpl<${className}Mapper, ${className}> implements ${className}Service { + /** + * ${comments}简单分页查询 + * @param ${classname} ${comments} + * @return + */ + @Override + public IPage<${className}> get${className}Page(Page<${className}> page, ${className} ${classname}){ + return baseMapper.get${className}Page(page,${classname}); + } + } diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm b/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm index e4baf3f55..11acbe1e9 100644 --- a/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/crud.js.vm @@ -18,6 +18,7 @@ export const tableOption = { 'border': true, 'index': true, + 'indexLabel': '序号', 'stripe': true, 'menuAlign': "center", 'align': "center", diff --git a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm index 06f9cd878..851ad7e35 100755 --- a/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm +++ b/pigx-visual/pigx-codegen/src/main/resources/template/index.vue.vm @@ -1,20 +1,3 @@ - -