:arrow_up: Upgrading ORM Framework from Mybatis Plus 2.x to Mybatis Plus 3.x

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<Map<String, String>> list = new ArrayList<>();
 		//根据分页参数获取对应数据
-		List<String> pages = findKeysForPage(PIGX_OAUTH_ACCESS + "*", MapUtil.getInt(params, "page"), MapUtil.getInt(params, "limit"));
+		List<String> 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);
 	}
 

pigx-common/pigx-common-aspect/pom.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~
+  ~      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)
+  ~
+  -->
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+		 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+	<parent>
+		<groupId>com.pig4cloud</groupId>
+		<artifactId>pigx-common</artifactId>
+		<version>1.8.0</version>
+	</parent>
+	<modelVersion>4.0.0</modelVersion>
+
+	<artifactId>pigx-common-aspect</artifactId>
+	<description>公共切面包</description>
+	<packaging>jar</packaging>
+	<dependencies>
+		<!--servlet-api-->
+		<dependency>
+			<groupId>javax.servlet</groupId>
+			<artifactId>javax.servlet-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.springframework</groupId>
+			<artifactId>spring-webmvc</artifactId>
+			<scope>provided</scope>
+		</dependency>
+		<!--mybatis plus extension,包含了mybatis plus core-->
+		<dependency>
+			<groupId>com.baomidou</groupId>
+			<artifactId>mybatis-plus-extension</artifactId>
+			<version>${mybatis-plus.version}</version>
+			<scope>provided</scope>
+		</dependency>
+		<!-- slf4j-api -->
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<scope>provided</scope>
+		</dependency>
+	</dependencies>
+
+
+
+</project>

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<HandlerMethodArgumentResolver> 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();
+	}
+}

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();
+		}
+	}
+}

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

pigx-common/pigx-common-core/pom.xml

@@ -50,10 +50,10 @@
 			<groupId>javax.servlet</groupId>
 			<artifactId>javax.servlet-api</artifactId>
 		</dependency>
-		<!--mybatis-->
+		<!--mybatis plus extension,包含了mybatis plus core-->
 		<dependency>
 			<groupId>com.baomidou</groupId>
-			<artifactId>mybatis-plus-core</artifactId>
+			<artifactId>mybatis-plus-extension</artifactId>
 			<version>${mybatis-plus.version}</version>
 		</dependency>
 		<!--feign 依赖-->

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";
+}

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 {

pigx-common/pigx-common-core/src/main/java/com/pig4cloud/pigx/common/core/util/Query.java

@@ -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<T> extends Page<T> {
-	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<String, Object> 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);
-	}
-}

pigx-common/pom.xml

@@ -33,10 +33,11 @@
 	<description>pigx 公共聚合模块</description>
 
 	<modules>
+		<module>pigx-common-aspect</module>
 		<module>pigx-common-cache</module>
 		<module>pigx-common-core</module>
-		<module>pigx-common-job</module>
 		<module>pigx-common-gateway</module>
+		<module>pigx-common-job</module>
 		<module>pigx-common-log</module>
 		<module>pigx-common-security</module>
 		<module>pigx-common-swagger</module>

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:

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

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<SysDept> {
 	 * 修改时间
 	 */
 	private LocalDateTime updateTime;
+
+	private Integer parentId;
+
 	/**
 	 * 是否删除  -1：已删除  0：正常
 	 */
 	@TableLogic
 	private String delFlag;
 
-	private Integer parentId;
-
-
-	@Override
-	protected Serializable pkVal() {
-		return this.deptId;
-	}
 }

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<SysDeptRelation> {
 	private Integer descendant;
 
 
-	@Override
-	protected Serializable pkVal() {
-		return this.ancestor;
-	}
-
 }

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<SysDict> {
 	@TableLogic
 	private String delFlag;
 
-
-	@Override
-	protected Serializable pkVal() {
-		return this.id;
-	}
-
 }

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;
+
+
 
 }

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<SysMenu> {
 	private String path;
 
 
-	@Override
-	protected Serializable pkVal() {
-		return this.menuId;
-	}
-
 }

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;
 

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;
 

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;
-
 /**
  * <p>
  * 角色菜单表
@@ -46,16 +42,9 @@ public class SysRoleMenu extends Model<SysRoleMenu> {
 	/**
 	 * 角色ID
 	 */
-	@TableId(type = IdType.INPUT)
 	private Integer roleId;
 	/**
 	 * 菜单ID
 	 */
-	@TableId(type = IdType.INPUT)
 	private Integer menuId;
-
-	@Override
-	protected Serializable pkVal() {
-		return this.roleId;
-	}
 }

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<SysRouteConf> {
 	 */
 	private String filters;
 	/**
-	 *
+	 * uri
 	 */
 	private String uri;
 	/**
 	 * 排序
 	 */
+	@TableField(value="`order`")
 	private Integer order;
 	/**
 	 * 创建时间
@@ -77,11 +74,4 @@ public class SysRouteConf extends Model<SysRouteConf> {
 	@TableLogic
 	private String delFlag;
 
-	/**
-	 * 主键值
-	 */
-	@Override
-	protected Serializable pkVal() {
-		return this.routeId;
-	}
 }

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<SysSocialDetails> {
 	 */
 	private Integer tenantId;
 
-	/**
-	 * 主键值
-	 */
-	@Override
-	protected Serializable pkVal() {
-		return this.id;
-	}
 }

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;
 

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;
-
 /**
  * <p>
  * 用户角色表
@@ -46,17 +42,10 @@ public class SysUserRole extends Model<SysUserRole> {
 	/**
 	 * 用户ID
 	 */
-	@TableId(type = IdType.INPUT)
 	private Integer userId;
 	/**
 	 * 角色ID
 	 */
-	@TableId(type = IdType.INPUT)
 	private Integer roleId;
 
-
-	@Override
-	protected Serializable pkVal() {
-		return this.userId;
-	}
 }

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;

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;

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;

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<SysDept> get(@PathVariable Integer id) {
-		return new R<>(sysDeptService.selectById(id));
+		return new R<>(sysDeptService.getById(id));
 	}
 
 

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;
 
 /**
  * <p>
@@ -61,18 +60,18 @@ public class DictController {
 	 */
 	@GetMapping("/{id}")
 	public R<SysDict> 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<Page> dictPage(@RequestParam Map<String, Object> params) {
-		return new R<>(sysDictService.selectPage(new Query<>(params), new EntityWrapper<>()));
+	public R<IPage<SysDict>> getSysDictPage(Page<SysDict> page, SysDict sysDict) {
+		return  new R<>(sysDictService.getSysDictPage(page,sysDict));
 	}
 
 	/**
@@ -86,7 +85,7 @@ public class DictController {
 	public R<List<SysDict>> 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<Boolean> 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<Boolean> deleteDict(@PathVariable Integer id, @PathVariable String type) {
-		return new R<>(sysDictService.deleteById(id));
+		return new R<>(sysDictService.removeById(id));
 	}
 
 	/**

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;
 
 /**
  * <p>
@@ -52,14 +50,14 @@ public class LogController {
 	private final SysLogService sysLogService;
 
 	/**
-	 * 分页查询日志信息
-	 *
-	 * @param params 分页对象
-	 * @return 分页对象
+	 * 简单分页查询
+	 * @param page 分页对象
+	 * @param sysLog 系统日志
+	 * @return
 	 */
 	@GetMapping("/page")
-	public R<Page> logPage(@RequestParam Map<String, Object> params) {
-		return new R<>(sysLogService.selectPage(new Query<>(params), new EntityWrapper<>()));
+	public R<IPage<SysLog>> getSysLogPage(Page<SysLog> 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<Boolean> 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<Boolean> save(@Valid @RequestBody SysLog sysLog) {
-		return new R<>(sysLogService.insert(sysLog));
+		return new R<>(sysLogService.save(sysLog));
 	}
 
 	/**

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<List<MenuTree>> getTree() {
-		return new R<>(TreeUtil.bulidTree(sysMenuService.selectList(new EntityWrapper<>()), -1));
+		return new R<>(TreeUtil.bulidTree(sysMenuService.list(new QueryWrapper<SysMenu>()
+			.lambda().eq(SysMenu::getDelFlag,CommonConstant.STATUS_NORMAL)), -1));
 	}
 
 	/**
@@ -103,7 +104,7 @@ public class MenuController {
 	 */
 	@GetMapping("/{id}")
 	public R<SysMenu> 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<Boolean> menu(@Valid @RequestBody SysMenu sysMenu) {
-		return new R<>(sysMenuService.insert(sysMenu));
+		return new R<>(sysMenuService.save(sysMenu));
 	}
 
 	/**

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;
 
 /**
  * <p>
@@ -57,19 +55,19 @@ public class OauthClientDetailsController {
 	 */
 	@GetMapping("/{id}")
 	public R<SysOauthClientDetails> 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> page(@RequestParam Map<String, Object> params) {
-		return new R<>(sysOauthClientDetailsService.selectPage(new Query<>(params), new EntityWrapper<>()));
+	public R<IPage<SysOauthClientDetails>> getSysOauthClientDetailsPage(Page<SysOauthClientDetails> 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<Boolean> add(@Valid @RequestBody SysOauthClientDetails sysOauthClientDetails) {
-		return new R<>(sysOauthClientDetailsService.insert(sysOauthClientDetails));
+		return new R<>(sysOauthClientDetailsService.save(sysOauthClientDetails));
 	}
 
 	/**

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<SysRole> 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<Boolean> 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<List<SysRole>> roleList() {
-		return new R<>(sysRoleService.selectList(new EntityWrapper<>()));
+		return new R<>(sysRoleService.list(new QueryWrapper<>()));
 	}
 
 	/**
 	 * 分页查询角色信息
 	 *
-	 * @param params 分页对象
+	 * @param page 分页对象
 	 * @return 分页对象
 	 */
 	@GetMapping("/page")
-	public R<Page> rolePage(@RequestParam Map<String, Object> params) {
-		return new R<>(sysRoleService.selectPage(new Query<>(params), new EntityWrapper<>()));
+	public R<IPage> 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<Boolean> 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));
 	}
 }

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> page(@RequestParam Map<String, Object> params) {
-		return new R<>(sysSocialDetailsService.selectPage(new Query<>(params), new EntityWrapper<>()));
+	public R<IPage<SysSocialDetails>> getSysSocialDetailsPage(Page<SysSocialDetails> page, SysSocialDetails sysSocialDetails) {
+		return new R<>(sysSocialDetailsService.getSysSocialDetailsPage(page, sysSocialDetails));
 	}
 
 
@@ -67,7 +66,7 @@ public class SysSocialDetailsController {
 	 */
 	@GetMapping("/{id}")
 	public R<SysSocialDetails> 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));
 	}
 
 	/**

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;

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<SysUser> 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<Boolean> 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<Page> userPage(@RequestParam Map<String, Object> params) {
-		return new R<>(userService.selectWithRolePage(new Query(params)));
+	public R<IPage> userPage(Page<List<UserVO>> page, @RequestParam(required = false) String username,@RequestParam(required = false) String deptId) {
+		return new R<>(userService.getUsersWithRolePage(page,username,deptId));
 	}
 
 	/**

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);

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);

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;

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;
 
 /**

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;
 
 /**
  * <p>
@@ -31,5 +34,12 @@ import com.pig4cloud.pigx.admin.api.entity.SysDict;
  * @since 2017-11-19
  */
 public interface SysDictMapper extends BaseMapper<SysDict> {
+	/**
+	 * 系统字典简单分页查询
+	 * @param sysDict 系统字典
+	 * @return
+	 */
+	IPage<SysDict> getSysDictPage(Page page, @Param("sysDict") SysDict sysDict);
+
 
 }

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;
 
 /**
  * <p>
@@ -31,5 +34,10 @@ import com.pig4cloud.pigx.admin.api.entity.SysLog;
  * @since 2017-11-20
  */
 public interface SysLogMapper extends BaseMapper<SysLog> {
-
+	/**
+	 * 系统日志简单分页查询
+	 * @param sysLog 系统日志
+	 * @return
+	 */
+	IPage<SysLog> getSysLogPage(Page page, @Param("sysLog") SysLog sysLog);
 }

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;
 

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;
 
 /**
  * <p>
@@ -32,5 +35,12 @@ import com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails;
  * @since 2018-05-15
  */
 public interface SysOauthClientDetailsMapper extends BaseMapper<SysOauthClientDetails> {
+	/**
+	 * 系统终端简单分页查询
+	 * @param sysOauthClientDetails 系统终端
+	 * @return
+	 */
+	IPage<SysOauthClientDetails> getSysOauthClientDetailsPage(Page page, @Param("sysOauthClientDetails") SysOauthClientDetails sysOauthClientDetails);
+
 
 }

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;

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;
 
 /**

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;
 

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<SysSocialDetails> {
-
+	/**
+	 * 社交登录简单分页查询
+	 * @param sysSocialDetails 社交登录
+	 * @return
+	 */
+	IPage<SysSocialDetails> getSysSocialDetailsPage(Page page, @Param("sysSocialDetails") SysSocialDetails sysSocialDetails);
 }

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<SysUser> {
 	/**
 	 * 分页查询用户信息（含角色）
 	 *
-	 * @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<List<UserVO>> getUserVosPage(Page page, @Param("username") String username,@Param("deptId")String deptId,DataScope dataScope);
 
 	/**
 	 * 通过ID查询用户信息

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;
 

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;
 

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;
 

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<SysDict> {
 
+	/**
+	 * 系统字典简单分页查询
+	 * @param sysDict 系统字典
+	 * @return
+	 */
+	IPage<SysDict> getSysDictPage(Page<SysDict> page, SysDict sysDict);
+
 }

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<SysLog> {
 
+	/**
+	 * 系统日志简单分页查询
+	 * @param sysLog 系统日志
+	 * @return
+	 */
+	IPage<SysLog> getSysLogPage(Page<SysLog> page, SysLog sysLog);
+
 	/**
 	 * 批量插入前端错误日志
 	 *

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;
 

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<SysOauthClientDetails> {
+	/**
+	 * 系统终端简单分页查询
+	 * @param sysOauthClientDetails 系统终端
+	 * @return
+	 */
+	IPage<SysOauthClientDetails> getSysOauthClientDetailsPage(Page<SysOauthClientDetails> page, SysOauthClientDetails sysOauthClientDetails);
+
 
 	/**
 	 * 通过ID删除客户端

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;
 
 /**

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;

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;
 

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<SysSocialDetails> {
 
+	/**
+	 * 社交登录简单分页查询
+	 * @param sysSocialDetails 社交登录
+	 * @return
+	 */
+	IPage<SysSocialDetails> getSysSocialDetailsPage(Page<SysSocialDetails> page, SysSocialDetails sysSocialDetails);
+
 	/**
 	 * 绑定社交账号
 	 *

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;
 
 /**

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<SysUser> {
 	/**
 	 * 分页查询用户信息（含有角色信息）
 	 *
-	 * @param query 查询条件
+	 * @param page 分页对象
+	 * @param username 用户名
 	 * @return
 	 */
-	Page selectWithRolePage(Query query);
-
+	IPage<List<UserVO>> getUsersWithRolePage(Page<List<UserVO>> page, String username,String deptId);
 
 	/**
 	 * 删除用户

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<Boolean> sendSmsCode(String mobile) {
 		SysUser condition = new SysUser();
 		condition.setPhone(mobile);
-		List<SysUser> userList = userMapper.selectList(new EntityWrapper<>(condition));
+		List<SysUser> userList = userMapper.selectList(new QueryWrapper<>(condition));
 
 		if (CollUtil.isEmpty(userList)) {
 			log.info("手机号未注册:{}", mobile);

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<SysDeptRelationMappe
 		SysDeptRelation condition = new SysDeptRelation();
 		condition.setDescendant(sysDept.getParentId());
 		List<SysDeptRelation> 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);
 		}
 
 		//自己也要维护到关系表中

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<SysDeptMapper, SysDept> 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<SysDeptMapper, SysDept> impl
 		SysDeptRelation condition = new SysDeptRelation();
 		condition.setAncestor(id);
 		List<Integer> 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<SysDeptMapper, SysDept> impl
 	 */
 	@Override
 	public List<DeptTree> selectTree() {
-		Wrapper condition = new EntityWrapper<>();
-		condition.orderBy("sort", false);
-		return getDeptTree(this.selectList(condition));
+		return getDeptTree(this.list(
+			new QueryWrapper<SysDept>()
+				.lambda().eq(SysDept::getDelFlag, CommonConstant.STATUS_NORMAL)
+		));
 	}
 
 	/**
@@ -139,7 +140,7 @@ public class SysDeptServiceImpl extends ServiceImpl<SysDeptMapper, SysDept> impl
 		SysDeptRelation condition = new SysDeptRelation();
 		condition.setAncestor(deptId);
 		List<Integer> descendantIdList = sysDeptRelationService
-			.selectList(new EntityWrapper<>(condition))
+			.list(new QueryWrapper<>(condition))
 			.stream().map(SysDeptRelation::getDescendant)
 			.collect(Collectors.toList());
 

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<SysDictMapper, SysDict> implements SysDictService {
+	/**
+	 * 系统字典简单分页查询
+	 * @param sysDict 系统字典
+	 * @return
+	 */
+	@Override
+	public IPage<SysDict> getSysDictPage(Page<SysDict> page, SysDict sysDict){
+		return baseMapper.getSysDictPage(page,sysDict);
+	}
+
 
 }

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<SysLogMapper, SysLog> implements SysLogService {
+	/**
+	 * 系统日志简单分页查询
+	 * @param sysLog 系统日志
+	 * @return
+	 */
+	@Override
+	public IPage<SysLog> getSysLogPage(Page<SysLog> page, SysLog sysLog){
+		return baseMapper.getSysLogPage(page,sysLog);
+	}
 
 	/**
 	 * 批量插入前端错误日志
@@ -63,6 +74,6 @@ public class SysLogServiceImpl extends ServiceImpl<SysLogMapper, SysLog> impleme
 				return log;
 			})
 			.collect(Collectors.toList());
-		return this.insertBatch(sysLogs);
+		return this.saveBatch(sysLogs);
 	}
 }

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<SysMenuMapper, SysMenu> impl
 		// 查询父节点为当前节点的节点
 		SysMenu conditon = new SysMenu();
 		conditon.setParentId(id);
-		List<Integer> menuIdList = this.selectList(new EntityWrapper<>(conditon))
+		List<Integer> 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<SysMenuMapper, SysMenu> 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

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<SysOauthClientDetailsMapper, SysOauthClientDetails> implements SysOauthClientDetailsService {
 
+
+	/**
+	 * 系统终端简单分页查询
+	 * @param sysOauthClientDetails 系统终端
+	 * @return
+	 */
+	@Override
+	public IPage<SysOauthClientDetails> getSysOauthClientDetailsPage(Page<SysOauthClientDetails> page, SysOauthClientDetails sysOauthClientDetails){
+		return baseMapper.getSysOauthClientDetailsPage(page,sysOauthClientDetails);
+	}
+
 	/**
 	 * 通过ID删除客户端
 	 *
@@ -47,7 +60,7 @@ public class SysOauthClientDetailsServiceImpl extends ServiceImpl<SysOauthClient
 	@Override
 	@CacheEvict(value = SecurityConstants.CLIENT_DETAILS_KEY, key = "#id")
 	public Boolean deleteClientDetailsById(String id) {
-		return this.deleteById(id);
+		return this.removeById(id);
 	}
 
 	/**

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleMenuServiceImpl.java

@@ -20,8 +20,8 @@
 package com.pig4cloud.pigx.admin.service.impl;
 
 import cn.hutool.core.util.StrUtil;
-import com.baomidou.mybatisplus.mapper.EntityWrapper;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu;
 import com.pig4cloud.pigx.admin.mapper.SysRoleMenuMapper;
 import com.pig4cloud.pigx.admin.service.SysRoleMenuService;
@@ -60,7 +60,7 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
 	public Boolean insertRoleMenus(String role, Integer roleId, String menuIds) {
 		SysRoleMenu condition = new SysRoleMenu();
 		condition.setRoleId(roleId);
-		this.delete(new EntityWrapper<>(condition));
+		this.remove(new UpdateWrapper<>(condition));
 
 		if (StrUtil.isBlank(menuIds)) {
 			return Boolean.TRUE;
@@ -77,6 +77,6 @@ public class SysRoleMenuServiceImpl extends ServiceImpl<SysRoleMenuMapper, SysRo
 
 		//清空userinfo
 		cacheManager.getCache("user_details").clear();
-		return this.insertBatch(roleMenuList);
+		return this.saveBatch(roleMenuList);
 	}
 }

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysRoleServiceImpl.java

@@ -19,8 +19,8 @@
 
 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.update.UpdateWrapper;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.entity.SysRole;
 import com.pig4cloud.pigx.admin.api.entity.SysRoleMenu;
 import com.pig4cloud.pigx.admin.mapper.SysRoleMapper;
@@ -70,7 +70,7 @@ public class SysRoleServiceImpl extends ServiceImpl<SysRoleMapper, SysRole> 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);
 	}
 }

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<SysRouteConfMapper, Sys
 	public List<SysRouteConf> 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<SysRouteConfMapper, Sys
 		// 逻辑删除全部
 		SysRouteConf condition = new SysRouteConf();
 		condition.setDelFlag(CommonConstant.STATUS_NORMAL);
-		this.delete(new EntityWrapper<>(condition));
+		this.remove(new UpdateWrapper<>(condition));
 
 		//插入生效路由
 		List<SysRouteConf> routeConfList = routeDefinitionVoList.stream().map(vo -> {
@@ -144,7 +145,7 @@ public class SysRouteConfServiceImpl extends ServiceImpl<SysRouteConfMapper, Sys
 			routeConf.setUri(vo.getUri().toString());
 			return routeConf;
 		}).collect(Collectors.toList());
-		this.insertBatch(routeConfList);
+		this.saveBatch(routeConfList);
 		log.debug("更新网关路由结束 ");
 
 		this.applicationEventPublisher.publishEvent(new RefreshRoutesEvent(this));

pigx-upms/pigx-upms-biz/src/main/java/com/pig4cloud/pigx/admin/service/impl/SysSocialDetailsServiceImpl.java

@@ -18,7 +18,10 @@
 package com.pig4cloud.pigx.admin.service.impl;
 
 import cn.hutool.json.JSONUtil;
-import com.baomidou.mybatisplus.service.impl.ServiceImpl;
+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.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.pig4cloud.pigx.admin.api.dto.UserInfo;
 import com.pig4cloud.pigx.admin.api.entity.SysSocialDetails;
 import com.pig4cloud.pigx.admin.api.entity.SysUser;
@@ -51,6 +54,18 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl<SysSocialDetailsMap
 	private final RestTemplate restTemplate;
 	private final SysUserMapper sysUserMapper;
 
+
+	/**
+	 * 社交登录简单分页查询
+	 *
+	 * @param sysSocialDetails 社交登录
+	 * @return
+	 */
+	@Override
+	public IPage<SysSocialDetails> getSysSocialDetailsPage(Page<SysSocialDetails> page, SysSocialDetails sysSocialDetails) {
+		return baseMapper.getSysSocialDetailsPage(page, sysSocialDetails);
+	}
+
 	/**
 	 * 绑定社交账号
 	 *
@@ -65,7 +80,7 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl<SysSocialDetailsMap
 		SysUser sysUser = sysUserMapper.selectById(SecurityUtils.getUser().getId());
 		sysUser.setWxOpenid(result.get("openId"));
 
-		sysUserMapper.updateAllColumnById(sysUser);
+		sysUserMapper.updateById(sysUser);
 		//更新緩存
 		cacheManager.getCache("user_details").evict(result.get("openId"));
 		return Boolean.TRUE;
@@ -95,7 +110,7 @@ public class SysSocialDetailsServiceImpl extends ServiceImpl<SysSocialDetailsMap
 	private Map<String, String> 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;
 		//微信登录

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;

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<SysUserMapper, SysUser> impl
 	}
 
 	@Override
-	public Page selectWithRolePage(Query query) {
+	public IPage<List<UserVO>> getUsersWithRolePage(Page<List<UserVO>> 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<List<UserVO>> userVosPage = baseMapper.getUserVosPage(page, username,deptId, dataScope);
+		return userVosPage.setTotal(Long.valueOf(userVosPage.getRecords().size()));
 	}
 
 
@@ -136,7 +135,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> 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<SysUserMapper, SysUser> 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<SysUserMapper, SysUser> impl
 	public List<SysUser> 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<SysUserMapper, SysUser> 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<SysUserMapper, SysUser> 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());

pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysDictMapper.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~
   ~      Copyright (c) 2018-2025, lengleng All rights reserved.
@@ -19,25 +20,69 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.pig4cloud.pigx.admin.mapper.SysDictMapper">
 
-	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.pig4cloud.pigx.admin.api.entity.SysDict">
-		<id column="id" property="id"/>
-		<result column="value" property="value"/>
-		<result column="label" property="label"/>
-		<result column="type" property="type"/>
-		<result column="description" property="description"/>
-		<result column="sort" property="sort"/>
-		<result column="create_time" property="createTime"/>
-		<result column="update_time" property="updateTime"/>
-		<result column="remarks" property="remarks"/>
-		<result column="del_flag" property="delFlag"/>
+	<resultMap id="sysDictMap" type="com.pig4cloud.pigx.admin.api.entity.SysDict">
+		<id property="id" column="id"/>
+		<result property="value" column="value"/>
+		<result property="label" column="label"/>
+		<result property="type" column="type"/>
+		<result property="description" column="description"/>
+		<result property="sort" column="sort"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="remarks" column="remarks"/>
+		<result property="delFlag" column="del_flag"/>
 	</resultMap>
 
-	<!-- 通用查询结果列 -->
-	<sql id="Base_Column_List">
-        id, value, label, type, description, sort, create_time AS createTime, update_time AS updateTime, remarks, del_flag AS delFlag
-    </sql>
+	<!--sysDict简单分页查询-->
+	<select id="getSysDictPage" resultMap="sysDictMap">
+		SELECT
+		id,
+		`value`,
+		label,
+		`type`,
+		description,
+		sort,
+		create_time,
+		update_time,
+		remarks,
+		del_flag
+		FROM sys_dict
+		<where>
+			<if test="sysDict.id!=null and sysDict.id.trim() != ''">
+				AND id = #{sysDict.id}
+			</if>
+			<if test="sysDict.value!=null and sysDict.value.trim() != ''">
+				AND value = #{sysDict.value}
+			</if>
+			<if test="sysDict.label!=null and sysDict.label.trim() != ''">
+				AND label = #{sysDict.label}
+			</if>
+			<if test="sysDict.type!=null and sysDict.type.trim() != ''">
+				AND type = #{sysDict.type}
+			</if>
+			<if test="sysDict.description!=null and sysDict.description.trim() != ''">
+				AND description = #{sysDict.description}
+			</if>
+			<if test="sysDict.sort!=null and sysDict.sort.trim() != ''">
+				AND sort = #{sysDict.sort}
+			</if>
+			<if test="sysDict.createTime!=null and sysDict.createTime.trim() != ''">
+				AND create_time = #{sysDict.createTime}
+			</if>
+			<if test="sysDict.updateTime!=null and sysDict.updateTime.trim() != ''">
+				AND update_time = #{sysDict.updateTime}
+			</if>
+			<if test="sysDict.remarks!=null and sysDict.remarks.trim() != ''">
+				AND remarks = #{sysDict.remarks}
+			</if>
+			<if test="sysDict.delFlag!=null and sysDict.delFlag.trim() != ''">
+				AND del_flag = #{sysDict.delFlag}
+			</if>
+		</where>
+	</select>
+
 
 </mapper>

pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysLogMapper.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~
   ~      Copyright (c) 2018-2025, lengleng All rights reserved.
@@ -19,30 +20,94 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.pig4cloud.pigx.admin.mapper.SysLogMapper">
 
-	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.pig4cloud.pigx.admin.api.entity.SysLog">
-		<id column="id" property="id"/>
-		<result column="type" property="type"/>
-		<result column="title" property="title"/>
-		<result column="service_id" property="serviceId"/>
-		<result column="create_by" property="createBy"/>
-		<result column="create_time" property="createTime"/>
-		<result column="update_time" property="updateTime"/>
-		<result column="remote_addr" property="remoteAddr"/>
-		<result column="user_agent" property="userAgent"/>
-		<result column="request_uri" property="requestUri"/>
-		<result column="method" property="method"/>
-		<result column="params" property="params"/>
-		<result column="time" property="time"/>
-		<result column="del_flag" property="delFlag"/>
-		<result column="exception" property="exception"/>
+	<resultMap id="sysLogMap" type="com.pig4cloud.pigx.admin.api.entity.SysLog">
+		<id property="id" column="id"/>
+		<result property="type" column="type"/>
+		<result property="title" column="title"/>
+		<result property="serviceId" column="service_id"/>
+		<result property="createBy" column="create_by"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="remoteAddr" column="remote_addr"/>
+		<result property="userAgent" column="user_agent"/>
+		<result property="requestUri" column="request_uri"/>
+		<result property="method" column="method"/>
+		<result property="params" column="params"/>
+		<result property="time" column="time"/>
+		<result property="delFlag" column="del_flag"/>
+		<result property="exception" column="exception"/>
 	</resultMap>
 
-	<!-- 通用查询结果列 -->
-	<sql id="Base_Column_List">
-        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
-    </sql>
+	<!--sysLog简单分页查询-->
+	<select id="getSysLogPage" resultMap="sysLogMap">
+		SELECT
+		id,
+		type,
+		title,
+		service_id,
+		create_by,
+		create_time,
+		update_time,
+		remote_addr,
+		user_agent,
+		request_uri,
+		method,
+		params,
+		time,
+		del_flag,
+		exception
+		FROM sys_log
+		<where>
+			<if test="sysLog.id != null and sysLog.id.trim() != ''">
+				AND id = #{sysLog.id}
+			</if>
+			<if test="sysLog.type != null and sysLog.type.trim() != ''">
+				AND type = #{sysLog.type}
+			</if>
+			<if test="sysLog.title != null and sysLog.title.trim() != ''">
+				AND title = #{sysLog.title}
+			</if>
+			<if test="sysLog.serviceId != null and sysLog.serviceId.trim() != ''">
+				AND service_id = #{sysLog.serviceId}
+			</if>
+			<if test="sysLog.createBy != null and sysLog.createBy.trim() != ''">
+				AND create_by = #{sysLog.createBy}
+			</if>
+			<if test="sysLog.createTime != null and sysLog.createTime.trim() != ''">
+				AND create_time = #{sysLog.createTime}
+			</if>
+			<if test="sysLog.updateTime != null and sysLog.updateTime.trim() != ''">
+				AND update_time = #{sysLog.updateTime}
+			</if>
+			<if test="sysLog.remoteAddr != null and sysLog.remoteAddr.trim() != ''">
+				AND remote_addr LIKE CONCAT('%',#{sysLog.remoteAddr},'%')
+			</if>
+			<if test="sysLog.userAgent != null and sysLog.userAgent.trim() != ''">
+				AND user_agent = #{sysLog.userAgent}
+			</if>
+			<if test="sysLog.requestUri != null and sysLog.requestUri.trim() != ''">
+				AND request_uri LIKE CONCAT('%',#{sysLog.requestUri},'%')
+			</if>
+			<if test="sysLog.method != null and sysLog.method.trim() != ''">
+				AND method = #{sysLog.method}
+			</if>
+			<if test="sysLog.params != null and sysLog.params.trim() != ''">
+				AND params = #{sysLog.params}
+			</if>
+			<if test="sysLog.time != null and sysLog.time.trim() != ''">
+				AND time = #{sysLog.time}
+			</if>
+			<if test="sysLog.delFlag != null and sysLog.delFlag.trim() != ''">
+				AND del_flag = #{sysLog.delFlag}
+			</if>
+			<if test="sysLog.exception != null and sysLog.exception.trim() != ''">
+				AND exception = #{sysLog.exception}
+			</if>
+		</where>
+	</select>
+
 
 </mapper>

pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysOauthClientDetailsMapper.xml

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
   ~
   ~      Copyright (c) 2018-2025, lengleng All rights reserved.
@@ -19,26 +20,74 @@
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+
 <mapper namespace="com.pig4cloud.pigx.admin.mapper.SysOauthClientDetailsMapper">
 
-	<!-- 通用查询映射结果 -->
-	<resultMap id="BaseResultMap" type="com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails">
-		<id column="client_id" property="clientId"/>
-		<result column="resource_ids" property="resourceIds"/>
-		<result column="client_secret" property="clientSecret"/>
-		<result column="scope" property="scope"/>
-		<result column="authorized_grant_types" property="authorizedGrantTypes"/>
-		<result column="web_server_redirect_uri" property="webServerRedirectUri"/>
-		<result column="authorities" property="authorities"/>
-		<result column="access_token_validity" property="accessTokenValidity"/>
-		<result column="refresh_token_validity" property="refreshTokenValidity"/>
-		<result column="additional_information" property="additionalInformation"/>
-		<result column="autoapprove" property="autoapprove"/>
+	<resultMap id="sysOauthClientDetailsMap" type="com.pig4cloud.pigx.admin.api.entity.SysOauthClientDetails">
+		<id property="clientId" column="client_id"/>
+		<result property="resourceIds" column="resource_ids"/>
+		<result property="clientSecret" column="client_secret"/>
+		<result property="scope" column="scope"/>
+		<result property="authorizedGrantTypes" column="authorized_grant_types"/>
+		<result property="webServerRedirectUri" column="web_server_redirect_uri"/>
+		<result property="authorities" column="authorities"/>
+		<result property="accessTokenValidity" column="access_token_validity"/>
+		<result property="refreshTokenValidity" column="refresh_token_validity"/>
+		<result property="additionalInformation" column="additional_information"/>
+		<result property="autoapprove" column="autoapprove"/>
 	</resultMap>
 
-	<!-- 通用查询结果列 -->
-	<sql id="Base_Column_List">
-        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
-    </sql>
+	<!--sysOauthClientDetails简单分页查询-->
+	<select id="getSysOauthClientDetailsPage" resultMap="sysOauthClientDetailsMap">
+		SELECT
+		client_id,
+		resource_ids,
+		client_secret,
+		scope,
+		authorized_grant_types,
+		web_server_redirect_uri,
+		authorities,
+		access_token_validity,
+		refresh_token_validity,
+		additional_information,
+		autoapprove
+		FROM sys_oauth_client_details
+		<where>
+			<if test="sysOauthClientDetails.clientId != null and sysOauthClientDetails.clientId != ''">
+				AND client_id = #{sysOauthClientDetails.clientId}
+			</if>
+			<if test="sysOauthClientDetails.resourceIds != null and sysOauthClientDetails.resourceIds != ''">
+				AND resource_ids = #{sysOauthClientDetails.resourceIds}
+			</if>
+			<if test="sysOauthClientDetails.clientSecret != null and sysOauthClientDetails.clientSecret != ''">
+				AND client_secret = #{sysOauthClientDetails.clientSecret}
+			</if>
+			<if test="sysOauthClientDetails.scope != null and sysOauthClientDetails.scope != ''">
+				AND scope = #{sysOauthClientDetails.scope}
+			</if>
+			<if test="sysOauthClientDetails.authorizedGrantTypes != null and sysOauthClientDetails.authorizedGrantTypes != ''">
+				AND authorized_grant_types = #{sysOauthClientDetails.authorizedGrantTypes}
+			</if>
+			<if test="sysOauthClientDetails.webServerRedirectUri != null and sysOauthClientDetails.webServerRedirectUri != ''">
+				AND web_server_redirect_uri = #{sysOauthClientDetails.webServerRedirectUri}
+			</if>
+			<if test="sysOauthClientDetails.authorities != null and sysOauthClientDetails.authorities != ''">
+				AND authorities = #{sysOauthClientDetails.authorities}
+			</if>
+			<if test="sysOauthClientDetails.accessTokenValidity != null and sysOauthClientDetails.accessTokenValidity != ''">
+				AND access_token_validity = #{sysOauthClientDetails.accessTokenValidity}
+			</if>
+			<if test="sysOauthClientDetails.refreshTokenValidity != null and sysOauthClientDetails.refreshTokenValidity != ''">
+				AND refresh_token_validity = #{sysOauthClientDetails.refreshTokenValidity}
+			</if>
+			<if test="sysOauthClientDetails.additionalInformation != null and sysOauthClientDetails.additionalInformation != ''">
+				AND additional_information = #{sysOauthClientDetails.additionalInformation}
+			</if>
+			<if test="sysOauthClientDetails.autoapprove != null and sysOauthClientDetails.autoapprove != ''">
+				AND autoapprove = #{sysOauthClientDetails.autoapprove}
+			</if>
+		</where>
+	</select>
+
 
 </mapper>

pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysSocialDetailsMapper.xml

@@ -1,37 +1,83 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
 <!--
-  ~    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:
+  ~      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)
+  ~  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)
+  ~
   -->
 
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 
-<mapper namespace="com.pig4cloud.pigx.generator.mapper.SysSocialDetailsMappper">
+<mapper namespace="com.pig4cloud.pigx.admin.mapper.SysSocialDetailsMapper">
+
+	<resultMap id="sysSocialDetailsMap" type="com.pig4cloud.pigx.admin.api.entity.SysSocialDetails">
+		<id property="id" column="id"/>
+		<result property="type" column="type"/>
+		<result property="remark" column="remark"/>
+		<result property="appId" column="app_id"/>
+		<result property="appSecret" column="app_secret"/>
+		<result property="redirectUrl" column="redirect_url"/>
+		<result property="createTime" column="create_time"/>
+		<result property="updateTime" column="update_time"/>
+		<result property="delFlag" column="del_flag"/>
+	</resultMap>
 
-	<!-- 可根据自己的需求，是否要使用 -->
-    <resultMap type="com.pig4cloud.pigx.admin.api.entity.SysSocialDetails" id="sysSocialDetailsMap">
-        <result property="id" column="id"/>
-        <result property="type" column="type"/>
-        <result property="remark" column="remark"/>
-        <result property="appId" column="app_id"/>
-        <result property="appSecret" column="app_secret"/>
-        <result property="redirectUrl" column="redirect_url"/>
-        <result property="createTime" column="create_time"/>
-        <result property="updateTime" column="update_time"/>
-        <result property="delFlag" column="del_flag"/>
-    </resultMap>
+	<!--sysSocialDetails简单分页查询-->
+	<select id="getSysSocialDetailsPage" resultMap="sysSocialDetailsMap">
+		SELECT
+		id,
+		type,
+		remark,
+		app_id,
+		app_secret,
+		redirect_url,
+		create_time,
+		update_time,
+		del_flag
+		FROM sys_social_details
+		<where>
+			<if test="sysSocialDetails.id != null and sysSocialDetails.id != ''">
+				AND id = #{sysSocialDetails.id}
+			</if>
+			<if test="sysSocialDetails.type != null and sysSocialDetails.type != ''">
+				AND type = #{sysSocialDetails.type}
+			</if>
+			<if test="sysSocialDetails.remark != null and sysSocialDetails.remark != ''">
+				AND remark = #{sysSocialDetails.remark}
+			</if>
+			<if test="sysSocialDetails.appId != null and sysSocialDetails.appId != ''">
+				AND app_id = #{sysSocialDetails.appId}
+			</if>
+			<if test="sysSocialDetails.appSecret != null and sysSocialDetails.appSecret != ''">
+				AND app_secret = #{sysSocialDetails.appSecret}
+			</if>
+			<if test="sysSocialDetails.redirectUrl != null and sysSocialDetails.redirectUrl != ''">
+				AND redirect_url = #{sysSocialDetails.redirectUrl}
+			</if>
+			<if test="sysSocialDetails.createTime != null and sysSocialDetails.createTime != ''">
+				AND create_time = #{sysSocialDetails.createTime}
+			</if>
+			<if test="sysSocialDetails.updateTime != null and sysSocialDetails.updateTime != ''">
+				AND update_time = #{sysSocialDetails.updateTime}
+			</if>
+			<if test="sysSocialDetails.delFlag != null and sysSocialDetails.delFlag != ''">
+				AND del_flag = #{sysSocialDetails.delFlag}
+			</if>
+		</where>
+	</select>
 
 
 </mapper>

pigx-upms/pigx-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -131,7 +131,7 @@
            `user`.user_id = #{id}
     </select>
 
-	<select id="selectUserVoPage" resultMap="userVoResultMap">
+	<select id="getUserVosPage" resultMap="userVoResultMap">
 		SELECT
 		`user`.user_id,
 		`user`.username,

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 ./
 

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;

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<String, Object> params) {
-		return leaveBillService.selectPage(new Query<>(params), new EntityWrapper<>());
+	public R<IPage<LeaveBill>> getLeaveBillPage(Page<LeaveBill> 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));
 	}
 
 	/**

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<Model> list(@RequestParam Map<String, Object> params) {
-		return modelService.selectPage(params);
+	public R<IPage<Model>> list(@RequestParam Map<String, Object> params) {
+		return new R<> (modelService.selectPage(params));
 	}
 
 	@DeleteMapping("/{id}")

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<ProcessDefDTO> list(@RequestParam Map<String, Object> params) {
-		return processService.getProcessByPage(params);
+	public R<IPage<ProcessDefDTO>> list(@RequestParam Map<String, Object> params) {
+		return new R<>(processService.getProcessByPage(params));
 	}
 
 	@GetMapping(value = "/resource/{proInsId}/{procDefId}/{resType}")

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<String, Object> params) {
-		return actTaskService.findTaskByName(params, SecurityUtils.getUsername());
+	public R<IPage> todo(@RequestParam Map<String, Object> params) {
+		return new R<>(actTaskService.findTaskByName(params, SecurityUtils.getUsername()));
 	}
 
 	@GetMapping("/{id}")

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;
 

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<LeaveBill> {
+	/**
+	 * 请假审批单简单分页查询
+	 * @param leaveBill 请假审批单
+	 * @return
+	 */
+	IPage<LeaveBill> getLeaveBillPage(Page page, @Param("leaveBill") LeaveBill leaveBill);
 
 }

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<String, Object> params, String name);
+	IPage findTaskByName(Map<String, Object> params, String name);
 
 	/**
 	 * 通过任务ID查询任务信息关联申请单信息

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<LeaveBill> {
+	/**
+	 * 请假审批单简单分页查询
+	 *
+	 * @param leaveBill 请假审批单
+	 * @return
+	 */
+	IPage<LeaveBill> getLeaveBillPage(Page<LeaveBill> page, LeaveBill leaveBill);
 }
 

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<Model> selectPage(Map<String, Object> params);
+	IPage<Model> selectPage(Map<String, Object> params);
 
 	/**
 	 * 删除流程

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<ProcessDefDTO> getProcessByPage(Map<String, Object> params);
+	IPage<ProcessDefDTO> getProcessByPage(Map<String, Object> params);
 
 	/**
 	 * 读取xml/image资源

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<String, Object> params, String name) {
+	public IPage findTaskByName(Map<String, Object> 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<TaskDTO> taskDTOList = new ArrayList<>();
 		taskQuery.list().forEach(task -> {

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<LeaveBillMapper, LeaveBill> implements LeaveBillService {
 
+	/**
+	 * 请假审批单简单分页查询
+	 *
+	 * @param leaveBill 请假审批单
+	 * @return
+	 */
+	@Override
+	public IPage<LeaveBill> getLeaveBillPage(Page<LeaveBill> page, LeaveBill leaveBill) {
+		return baseMapper.getLeaveBillPage(page, leaveBill);
+	}
+
 }

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<Model> selectPage(Map<String, Object> params) {
+	public IPage<Model> selectPage(Map<String, Object> 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;

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<ProcessDefDTO> getProcessByPage(Map<String, Object> params) {
+	public IPage<ProcessDefDTO> getProcessByPage(Map<String, Object> 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<ProcessDefDTO> deploymentList = new ArrayList<>();

pigx-visual/pigx-activiti/src/main/resources/bootstrap.yml

@@ -1,5 +1,5 @@
 server:
-  port: 5002
+  port: 5005
 
 spring:
   application:

pigx-visual/pigx-activiti/src/main/resources/mapper/LeaveBillMapper.xml

@@ -5,7 +5,7 @@
 
 	<!-- 可根据自己的需求，是否要使用 -->
     <resultMap type="com.pig4cloud.pigx.act.entity.LeaveBill" id="leaveBillMap">
-        <result property="leaveId" column="leave_id"/>
+        <id property="leaveId" column="leave_id"/>
         <result property="username" column="username"/>
         <result property="days" column="days"/>
         <result property="content" column="content"/>
@@ -15,5 +15,45 @@
         <result property="delFlag" column="del_flag"/>
     </resultMap>
 
+	<!--leaveBill简单分页查询-->
+	<select id="getLeaveBillPage" resultMap="leaveBillMap">
+		SELECT
+		leave_id,
+		username,
+		days,
+		content,
+		state,
+		create_time,
+		update_time,
+		del_flag
+		FROM oa_leave_bill
+		<where>
+			<if test="leaveBill.leaveId != null and leaveBill.leaveId != ''">
+				AND leave_id = #{leaveBill.leaveId}
+			</if>
+			<if test="leaveBill.username != null and leaveBill.username != ''">
+				AND username = #{leaveBill.username}
+			</if>
+			<if test="leaveBill.days != null and leaveBill.days != ''">
+				AND days = #{leaveBill.days}
+			</if>
+			<if test="leaveBill.content != null and leaveBill.content != ''">
+				AND content = #{leaveBill.content}
+			</if>
+			<if test="leaveBill.state != null and leaveBill.state != ''">
+				AND state = #{leaveBill.state}
+			</if>
+			<if test="leaveBill.createTime != null and leaveBill.createTime != ''">
+				AND create_time = #{leaveBill.createTime}
+			</if>
+			<if test="leaveBill.updateTime != null and leaveBill.updateTime != ''">
+				AND update_time = #{leaveBill.updateTime}
+			</if>
+			<if test="leaveBill.delFlag != null and leaveBill.delFlag != ''">
+				AND del_flag = #{leaveBill.delFlag}
+			</if>
+		</where>
+	</select>
+
 
 </mapper>

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;