diff --git a/cloud-common/cloud-common-core/pom.xml b/cloud-common/cloud-common-core/pom.xml index 57cf128..f3591e8 100644 --- a/cloud-common/cloud-common-core/pom.xml +++ b/cloud-common/cloud-common-core/pom.xml @@ -47,33 +47,14 @@ transmittable-thread-local - - - com.github.pagehelper - pagehelper-spring-boot-starter - - com.baomidou mybatis-plus-spring-boot3-starter - 3.5.6 - - - com.github.jsqlparser - jsqlparser - - - org.mybatis - mybatis - - - - org.mybatis - mybatis - 3.5.16 + com.baomidou + mybatis-plus-jsqlparser diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java new file mode 100644 index 0000000..e19980c --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/config/MybatisPlusConfig.java @@ -0,0 +1,21 @@ +package com.muyu.common.core.config; + +import com.baomidou.mybatisplus.annotation.DbType; +import com.baomidou.mybatisplus.extension.plugins.MybatisPlusInterceptor; +import com.baomidou.mybatisplus.extension.plugins.inner.PaginationInnerInterceptor; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class MybatisPlusConfig { + + /** + * 添加分页插件 + */ + @Bean + public MybatisPlusInterceptor mybatisPlusInterceptor() { + MybatisPlusInterceptor interceptor = new MybatisPlusInterceptor(); + interceptor.addInnerInterceptor(new PaginationInnerInterceptor(DbType.MYSQL)); // 如果配置多个插件, 切记分页最后添加 + return interceptor; + } +} \ No newline at end of file diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java index fb57cb9..1730c9c 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/text/Convert.java @@ -876,17 +876,17 @@ public class Convert { String head = n < 0 ? "负" : ""; n = Math.abs(n); - String s = ""; + StringBuilder s = new StringBuilder(); for (int i = 0 ; i < fraction.length ; i++) { // 优化double计算精度丢失问题 BigDecimal nNum = new BigDecimal(n); BigDecimal decimal = new BigDecimal(10); BigDecimal scale = nNum.multiply(decimal).setScale(2, RoundingMode.HALF_EVEN); double d = scale.doubleValue(); - s += (digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", ""); + s.append((digit[(int) (Math.floor(d * Math.pow(10, i)) % 10)] + fraction[i]).replaceAll("(零.)+", "")); } - if (s.length() < 1) { - s = "整"; + if (s.isEmpty()) { + s = new StringBuilder("整"); } int integerPart = (int) Math.floor(n); @@ -896,8 +896,8 @@ public class Convert { p = digit[integerPart % 10] + unit[1][j] + p; integerPart = integerPart / 10; } - s = p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i] + s; + s.insert(0, p.replaceAll("(零.)*零$", "").replaceAll("^$", "零") + unit[0][i]); } - return head + s.replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); + return head + s.toString().replaceAll("(零.)*零元", "元").replaceFirst("(零.)+", "").replaceAll("(零.)+", "零").replaceAll("^整$", "零元整"); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java deleted file mode 100644 index d4b0554..0000000 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/PageUtils.java +++ /dev/null @@ -1,32 +0,0 @@ -package com.muyu.common.core.utils; - -import com.github.pagehelper.PageHelper; -import com.muyu.common.core.utils.sql.SqlUtil; -import com.muyu.common.core.web.page.PageDomain; -import com.muyu.common.core.web.page.TableSupport; - -/** - * 分页工具类 - * - * @author muyu - */ -public class PageUtils extends PageHelper { - /** - * 设置请求分页数据 - */ - public static void startPage () { - PageDomain pageDomain = TableSupport.buildPageRequest(); - Integer pageNum = pageDomain.getPageNum(); - Integer pageSize = pageDomain.getPageSize(); - String orderBy = SqlUtil.escapeOrderBySql(pageDomain.getOrderBy()); - Boolean reasonable = pageDomain.getReasonable(); - PageHelper.startPage(pageNum, pageSize, orderBy).setReasonable(reasonable); - } - - /** - * 清理分页的线程变量 - */ - public static void clearPage () { - PageHelper.clearPage(); - } -} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java index c37a65c..8ddb3af 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/SpringUtils.java @@ -43,8 +43,7 @@ public final class SpringUtils implements BeanFactoryPostProcessor { * @throws org.springframework.beans.BeansException */ public static T getBean (Class clz) throws BeansException { - T result = (T) beanFactory.getBean(clz); - return result; + return beanFactory.getBean(clz); } /** diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java index 2ec7e4f..9f9bd63 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/utils/reflect/ReflectUtils.java @@ -2,13 +2,13 @@ package com.muyu.common.core.utils.reflect; import com.muyu.common.core.text.Convert; import com.muyu.common.core.utils.DateUtils; +import lombok.extern.log4j.Log4j2; import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.Validate; import org.apache.poi.ss.usermodel.DateUtil; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import java.lang.reflect.*; +import java.util.Arrays; import java.util.Date; /** @@ -17,6 +17,7 @@ import java.util.Date; * @author muyu */ @SuppressWarnings("rawtypes") +@Log4j2 public class ReflectUtils { private static final String SETTER_PREFIX = "set"; @@ -24,8 +25,6 @@ public class ReflectUtils { private static final String CGLIB_CLASS_SEPARATOR = "$$"; - private static Logger logger = LoggerFactory.getLogger(ReflectUtils.class); - /** * 调用Getter方法. * 支持多级，如：对象名.对象名.方法 @@ -65,14 +64,14 @@ public class ReflectUtils { public static E getFieldValue (final Object obj, final String fieldName) { Field field = getAccessibleField(obj, fieldName); if (field == null) { - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + log.debug("在 [{}] 中，没有找到 [{}] 字段 ", obj.getClass(), fieldName); return null; } E result = null; try { result = (E) field.get(obj); } catch (IllegalAccessException e) { - logger.error("不可能抛出的异常{}", e.getMessage()); + log.error("不可能抛出的异常{}", e.getMessage()); } return result; } @@ -84,13 +83,13 @@ public class ReflectUtils { Field field = getAccessibleField(obj, fieldName); if (field == null) { // throw new IllegalArgumentException("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + fieldName + "] 字段 "); + log.debug("在 [{}] 中，没有找到 [{}] 字段 ", obj.getClass(), fieldName); return; } try { field.set(obj, value); } catch (IllegalAccessException e) { - logger.error("不可能抛出的异常: {}", e.getMessage()); + log.error("不可能抛出的异常: {}", e.getMessage()); } } @@ -107,13 +106,13 @@ public class ReflectUtils { } Method method = getAccessibleMethod(obj, methodName, parameterTypes); if (method == null) { - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); + log.debug("在 [{}] 中，没有找到 [{}] 方法 ", obj.getClass(), methodName); return null; } try { return (E) method.invoke(obj, args); } catch (Exception e) { - String msg = "method: " + method + ", obj: " + obj + ", args: " + args + ""; + String msg = "method: " + method + ", obj: " + obj + ", args: " + Arrays.toString(args); throw convertReflectionExceptionToUnchecked(msg, e); } } @@ -128,7 +127,7 @@ public class ReflectUtils { Method method = getAccessibleMethodByName(obj, methodName, args.length); if (method == null) { // 如果为空不报错，直接返回空。 - logger.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); + log.debug("在 [" + obj.getClass() + "] 中，没有找到 [" + methodName + "] 方法 "); return null; } try { @@ -182,9 +181,7 @@ public class ReflectUtils { Field field = superClass.getDeclaredField(fieldName); makeAccessible(field); return field; - } catch (NoSuchFieldException e) { - continue; - } + } catch (NoSuchFieldException ignored) {} } return null; } @@ -207,9 +204,7 @@ public class ReflectUtils { Method method = searchType.getDeclaredMethod(methodName, parameterTypes); makeAccessible(method); return method; - } catch (NoSuchMethodException e) { - continue; - } + } catch (NoSuchMethodException ignored) {} } return null; } @@ -275,19 +270,18 @@ public class ReflectUtils { Type genType = clazz.getGenericSuperclass(); if (!(genType instanceof ParameterizedType)) { - logger.debug(clazz.getSimpleName() + "'s superclass not ParameterizedType"); + log.debug("{}'s superclass not ParameterizedType", clazz.getSimpleName()); return Object.class; } Type[] params = ((ParameterizedType) genType).getActualTypeArguments(); if (index >= params.length || index < 0) { - logger.debug("Index: " + index + ", Size of " + clazz.getSimpleName() + "'s Parameterized Type: " - + params.length); + log.debug("Index: {}, Size of {}'s Parameterized Type: {}", index, clazz.getSimpleName(), params.length); return Object.class; } if (!(params[index] instanceof Class)) { - logger.debug(clazz.getSimpleName() + " not set the actual class on superclass generic parameter"); + log.debug("{} not set the actual class on superclass generic parameter", clazz.getSimpleName()); return Object.class; } @@ -299,7 +293,7 @@ public class ReflectUtils { throw new RuntimeException("Instance must not be null"); } Class clazz = instance.getClass(); - if (clazz != null && clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) { + if (clazz.getName().contains(CGLIB_CLASS_SEPARATOR)) { Class superClass = clazz.getSuperclass(); if (superClass != null && !Object.class.equals(superClass)) { return superClass; diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java new file mode 100644 index 0000000..cf7411b --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/SuperBasic.java @@ -0,0 +1,34 @@ +package com.muyu.common.core.web; + +import com.muyu.common.core.utils.reflect.ReflectUtils; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.io.Serial; +import java.io.Serializable; + +/** + * 列表查询模型 + * + * @author DongZeLiang + * @date 2024-01-07 10:01 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SuperBasic implements Serializable { + + @Serial + private static final long serialVersionUID = 1L; + + /** + * 业务ID - 暂时可以不用 + * + * 设计上可以用来重写日志的tracId + */ + private String serviceId; + +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java index 3789a82..17267b7 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/controller/BaseController.java @@ -1,10 +1,9 @@ package com.muyu.common.core.web.controller; -import com.github.pagehelper.PageInfo; import com.muyu.common.core.utils.DateUtils; -import com.muyu.common.core.utils.PageUtils; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; +import com.muyu.common.core.web.page.PageQueryModel; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.web.bind.WebDataBinder; @@ -12,7 +11,6 @@ import org.springframework.web.bind.annotation.InitBinder; import java.beans.PropertyEditorSupport; import java.util.Date; -import java.util.List; /** * web层通用数据处理 @@ -37,71 +35,54 @@ public class BaseController { } /** - * 设置请求分页数据 + * 返回结果集封装 + * @param pageQueryModel 查询模型对象 + * @return 返回结果集 + * @param 数据类型 */ - protected void startPage () { - PageUtils.startPage(); - } - - /** - * 清理分页的线程变量 - */ - protected void clearPage () { - PageUtils.clearPage(); - } - - /** - * 响应请求分页数据 - */ - @SuppressWarnings({"rawtypes", "unchecked"}) - protected Result> getDataTable (List list) { - return Result.success( - TableDataInfo.builder() - .total(new PageInfo(list).getTotal()) - .rows(list) - .build() - ); + protected Result> resultList(PageQueryModel pageQueryModel) { + return Result.success(DataPageResp.of(pageQueryModel)); } /** * 返回成功 */ - public Result success () { + public Result success () { return Result.success(); } /** * 返回成功消息 */ - public Result success (String message) { + public Result success (String message) { return Result.success(message); } /** * 返回成功消息 */ - public Result success (Object data) { + public Result success (T data) { return Result.success(data); } /** * 返回失败消息 */ - public Result error () { + public Result error () { return Result.error(); } /** * 返回失败消息 */ - public Result error (String message) { + public Result error (String message) { return Result.error(message); } /** * 返回警告消息 */ - public Result warn (String message) { + public Result warn (String message) { return Result.warn(message); } @@ -112,7 +93,7 @@ public class BaseController { * * @return 操作结果 */ - protected Result toAjax (int rows) { + protected Result toAjax (int rows) { return rows > 0 ? Result.success() : Result.error(); } @@ -123,7 +104,7 @@ public class BaseController { * * @return 操作结果 */ - protected Result toAjax (boolean result) { + protected Result toAjax (boolean result) { return result ? success() : error(); } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java new file mode 100644 index 0000000..6dfd192 --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/model/QueryModel.java @@ -0,0 +1,73 @@ +package com.muyu.common.core.web.model; + + +import com.baomidou.mybatisplus.core.metadata.OrderItem; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.SuperBasic; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.List; + +/** + * 列表查询模型 + * + * @author DongZeLiang + * @date 2024-11-20 14:18 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class QueryModel extends SuperBasic { + + /** + * 当前记录起始索引 + */ + private Integer pageNum; + + /** + * 每页显示记录数 + */ + private Integer pageSize; + + /** + * 排序列 + */ + private String orderByColumn; + + /** + * 排序的方向desc或者asc + */ + private boolean isAsc = true; + + /** + * 构建模型分页对象 + * @param pageReq 分页参数 + * @return 模型分页对象 + */ + public T domainBuild(PageReq pageReq) { + this.pageNum = pageReq.getPageNum(); + this.pageSize = pageReq.getPageSize(); + this.orderByColumn = pageReq.getOrderByColumn(); + this.isAsc = "asc".equals(pageReq.getIsAsc()); + return (T) this; + } + + /** + * 构建查询分页对象 + * @return 查询分页对象 + */ + public Page buildPage(){ + Page page = Page.of(this.getPageNum(), this.getPageSize()); + if(StringUtils.isNotBlank(this.getOrderByColumn())){ + page.setOrders(List.of(this.isAsc() + ? OrderItem.asc(this.getOrderByColumn()) : OrderItem.desc(this.getOrderByColumn()))); + } + return page; + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java similarity index 68% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java index d677cce..f05fe81 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableDataInfo.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/DataPageResp.java @@ -4,7 +4,6 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; -import org.apache.poi.ss.formula.functions.T; import java.io.Serializable; import java.util.List; @@ -19,7 +18,7 @@ import java.util.List; @Builder @NoArgsConstructor @AllArgsConstructor -public class TableDataInfo implements Serializable { +public class DataPageResp implements Serializable { private static final long serialVersionUID = 1L; /** @@ -32,14 +31,7 @@ public class TableDataInfo implements Serializable { */ private List rows; - /** - * 消息状态码 - */ - private int code; - - /** - * 消息内容 - */ - private String msg; - + public static DataPageResp of(PageQueryModel pageQueryModel) { + return new DataPageResp<>(pageQueryModel.getTotal(), pageQueryModel.getDataList()); + } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java new file mode 100644 index 0000000..383cc75 --- /dev/null +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageQueryModel.java @@ -0,0 +1,39 @@ +package com.muyu.common.core.web.page; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +import java.util.List; + +/** + * 分页查询模型 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class PageQueryModel { + + /** + * 总记录数 + */ + private long total; + + /** + * 列表数据 + */ + private List dataList; + + /** + * 构建分页查询模型对象 + * @param page 分页对象 + * @return 分页模型对象 + * @param 入参 + */ + public static PageQueryModel of(Page page) { + return new PageQueryModel<>(page.getTotal(), page.getRecords()); + } +} diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java similarity index 64% rename from cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java rename to cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java index b9c5e45..6f16f91 100644 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageDomain.java +++ b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/PageReq.java @@ -1,13 +1,21 @@ package com.muyu.common.core.web.page; import com.muyu.common.core.utils.StringUtils; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; /** * 分页数据 * * @author muyu */ -public class PageDomain { +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class PageReq { /** * 当前记录起始索引 */ @@ -40,34 +48,6 @@ public class PageDomain { return StringUtils.toUnderScoreCase(orderByColumn) + " " + isAsc; } - public Integer getPageNum () { - return pageNum; - } - - public void setPageNum (Integer pageNum) { - this.pageNum = pageNum; - } - - public Integer getPageSize () { - return pageSize; - } - - public void setPageSize (Integer pageSize) { - this.pageSize = pageSize; - } - - public String getOrderByColumn () { - return orderByColumn; - } - - public void setOrderByColumn (String orderByColumn) { - this.orderByColumn = orderByColumn; - } - - public String getIsAsc () { - return isAsc; - } - public void setIsAsc (String isAsc) { if (StringUtils.isNotEmpty(isAsc)) { // 兼容前端排序类型 @@ -87,7 +67,4 @@ public class PageDomain { return reasonable; } - public void setReasonable (Boolean reasonable) { - this.reasonable = reasonable; - } } diff --git a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java b/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java deleted file mode 100644 index ce0328d..0000000 --- a/cloud-common/cloud-common-core/src/main/java/com/muyu/common/core/web/page/TableSupport.java +++ /dev/null @@ -1,53 +0,0 @@ -package com.muyu.common.core.web.page; - -import com.muyu.common.core.text.Convert; -import com.muyu.common.core.utils.ServletUtils; - -/** - * 表格数据处理 - * - * @author muyu - */ -public class TableSupport { - /** - * 当前记录起始索引 - */ - public static final String PAGE_NUM = "pageNum"; - - /** - * 每页显示记录数 - */ - public static final String PAGE_SIZE = "pageSize"; - - /** - * 排序列 - */ - public static final String ORDER_BY_COLUMN = "orderByColumn"; - - /** - * 排序的方向 "desc" 或者 "asc". - */ - public static final String IS_ASC = "isAsc"; - - /** - * 分页参数合理化 - */ - public static final String REASONABLE = "reasonable"; - - /** - * 封装分页对象 - */ - public static PageDomain getPageDomain () { - PageDomain pageDomain = new PageDomain(); - pageDomain.setPageNum(Convert.toInt(ServletUtils.getParameter(PAGE_NUM), 1)); - pageDomain.setPageSize(Convert.toInt(ServletUtils.getParameter(PAGE_SIZE), 10)); - pageDomain.setOrderByColumn(ServletUtils.getParameter(ORDER_BY_COLUMN)); - pageDomain.setIsAsc(ServletUtils.getParameter(IS_ASC)); - pageDomain.setReasonable(ServletUtils.getParameterToBool(REASONABLE)); - return pageDomain; - } - - public static PageDomain buildPageRequest () { - return getPageDomain(); - } -} diff --git a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports b/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports index 17f73ec..0db8834 100644 --- a/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports +++ b/cloud-common/cloud-common-core/src/main/resources/META-INF/spring/org.springframework.boot.autoconfigure.AutoConfiguration.imports @@ -1,2 +1,3 @@ com.muyu.common.core.utils.SpringUtils com.muyu.common.core.feign.FeginConfig +com.muyu.common.core.config.MybatisPlusConfig \ No newline at end of file diff --git a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java index 3d66b0d..ff9110d 100644 --- a/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java +++ b/cloud-common/cloud-common-datascope/src/main/java/com/muyu/common/datascope/aspect/DataScopeAspect.java @@ -109,8 +109,7 @@ public class DataScopeAspect { if (StringUtils.isNotBlank(sqlString.toString())) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) { baseEntity.getParams().put(DATA_SCOPE, " AND (" + sqlString.substring(4) + ")"); } } @@ -141,8 +140,7 @@ public class DataScopeAspect { */ private void clearDataScope (final JoinPoint joinPoint) { Object params = joinPoint.getArgs()[0]; - if (StringUtils.isNotNull(params) && params instanceof BaseEntity) { - BaseEntity baseEntity = (BaseEntity) params; + if (StringUtils.isNotNull(params) && params instanceof BaseEntity baseEntity) { baseEntity.getParams().put(DATA_SCOPE, ""); } } diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java index 65ada9e..c7247bd 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysDept.java @@ -1,5 +1,9 @@ package com.muyu.common.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import jakarta.validation.constraints.NotNull; import jakarta.validation.constraints.Size; @@ -20,6 +24,7 @@ import java.util.List; @SuperBuilder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_dept") @EqualsAndHashCode(callSuper = true) public class SysDept extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,6 +32,7 @@ public class SysDept extends BaseEntity { /** * 部门ID */ + @TableId(type = IdType.AUTO) private Long deptId; /** @@ -77,11 +83,13 @@ public class SysDept extends BaseEntity { /** * 父部门名称 */ + @TableField(exist = false) private String parentName; /** * 子部门 */ + @TableField(exist = false) private List children = new ArrayList(); @NotBlank(message = "部门名称不能为空") diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java index c66f131..a931f13 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysLogininfor.java @@ -21,8 +21,7 @@ import java.util.Date; @SuperBuilder @NoArgsConstructor @AllArgsConstructor -@EqualsAndHashCode(callSuper = true) -public class SysLogininfor extends BaseEntity { +public class SysLogininfor { private static final long serialVersionUID = 1L; /** diff --git a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java index 1aab56a..9526346 100644 --- a/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java +++ b/cloud-common/cloud-common-system/src/main/java/com/muyu/common/system/domain/SysRole.java @@ -1,5 +1,7 @@ package com.muyu.common.system.domain; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableLogic; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; @@ -73,26 +75,31 @@ public class SysRole extends BaseEntity { /** * 删除标志（0代表存在 2代表删除） */ + @TableLogic private String delFlag; /** * 用户是否存在此角色标识 默认不存在 */ + @TableField(exist = false) private boolean flag = false; /** * 菜单组 */ + @TableField(exist = false) private Long[] menuIds; /** * 部门组（数据权限） */ + @TableField(exist = false) private Long[] deptIds; /** * 角色菜单权限 */ + @TableField(exist = false) private Set permissions; diff --git a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java index 1dfe039..64e0b76 100644 --- a/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java +++ b/cloud-modules/cloud-modules-gen/src/main/java/com/muyu/gen/controller/GenController.java @@ -3,7 +3,7 @@ package com.muyu.gen.controller; import com.muyu.common.core.text.Convert; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -40,11 +40,10 @@ public class GenController extends BaseController { * 查询代码生成列表 */ @RequiresPermissions("tool:gen:list") - @GetMapping("/list") - public Result> genList (GenTable genTable) { - startPage(); + @PostMapping("/list") + public Result> genList (GenTable genTable) { List list = genTableService.selectGenTableList(genTable); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** @@ -68,20 +67,19 @@ public class GenController extends BaseController { */ @RequiresPermissions("tool:gen:list") @GetMapping("/db/list") - public Result> dataList (GenTable genTable) { - startPage(); + public Result> dataList (GenTable genTable) { List list = genTableService.selectDbTableList(genTable); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** * 查询数据表字段列表 */ @GetMapping(value = "/column/{tableId}") - public Result> columnList (Long tableId) { + public Result> columnList (Long tableId) { List list = genTableColumnService.selectGenTableColumnListByTableId(tableId); return Result.success( - TableDataInfo.builder() + DataPageResp.builder() .total(list.size()) .rows(list) .build() diff --git a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm index 1df5be0..baa0527 100644 --- a/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm +++ b/cloud-modules/cloud-modules-gen/src/main/resources/vm/java/controller.java.vm @@ -1,7 +1,7 @@ package ${packageName}.controller; import java.util.List; -import java.io.IOException; + import jakarta.servlet.http.HttpServletResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.GetMapping; @@ -21,7 +21,7 @@ import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.poi.ExcelUtil; #if($table.crud || $table.sub) -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; #elseif($table.tree) #end @@ -42,13 +42,12 @@ public class ${ClassName}Controller extends BaseController * 查询${functionName}列表 */ @RequiresPermissions("${permissionPrefix}:list") - @GetMapping("/list") + @PostMapping("/list") #if($table.crud || $table.sub) - public Result list(${ClassName} ${className}) + public Result list(${ClassName} ${className}) { - startPage(); List<${ClassName}> list = ${className}Service.select${ClassName}List(${className}); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } #elseif($table.tree) public Result list(${ClassName} ${className}) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java index 3bced52..24c5852 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysConfigController.java @@ -1,14 +1,21 @@ package com.muyu.system.controller; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.muyu.common.core.domain.Result; +import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysConfigPageQueryModel; +import com.muyu.system.domain.rep.SysConfigAddReq; +import com.muyu.system.domain.rep.SysConfigListReq; +import com.muyu.system.domain.rep.SysConfigUpdReq; import com.muyu.system.service.SysConfigService; import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.tags.Tag; @@ -18,7 +25,6 @@ import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import java.util.Arrays; -import java.util.List; /** * 参数配置 信息操作处理 @@ -27,7 +33,7 @@ import java.util.List; */ @RestController @RequestMapping("/config") -@Tag(name = "SysConfigController", description = "系统参数配置") +@Tag(name = "SysConfigController", description = "系统参数配置") public class SysConfigController extends BaseController { @Autowired @@ -37,28 +43,27 @@ public class SysConfigController extends BaseController { * 获取参数配置列表 */ @RequiresPermissions("system:config:list") - @GetMapping("/list") + @PostMapping("/list") @Operation(summary = "查询集合", description = "更新水果信息") - public Result> list (SysConfig config) { - startPage(); - List list = configService.pageQuery(config); - return getDataTable(list); + public Result> list (@RequestBody SysConfigListReq sysConfigListReq) { + PageQueryModel pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); + return resultList(pageQueryModel); } @Log(title = "参数管理", businessType = BusinessType.EXPORT) @RequiresPermissions("system:config:export") @PostMapping("/export") - public void export (HttpServletResponse response, SysConfig config) { - List list = configService.pageQuery(config); - ExcelUtil util = new ExcelUtil(SysConfig.class); - util.exportExcel(response, list, "参数数据"); + public void export (HttpServletResponse response, SysConfigListReq sysConfigListReq) { + PageQueryModel pageQueryModel = configService.pageQuery(SysConfigPageQueryModel.reqBuild(sysConfigListReq)); + ExcelUtil util = new ExcelUtil<>(SysConfig.class); + util.exportExcel(response, pageQueryModel.getDataList(), "参数数据"); } /** * 根据参数编号获取详细信息 */ @GetMapping(value = "/{configId}") - public Result getInfo (@PathVariable("configId") Long configId) { + public Result getInfo (@PathVariable("configId") Long configId) { return success(configService.getById(configId)); } @@ -76,12 +81,11 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:add") @Log(title = "参数管理", businessType = BusinessType.INSERT) @PostMapping - public Result add (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { - return error("新增参数'" + config.getConfigName() + "'失败，参数键名已存在"); + public Result add (@Validated @RequestBody SysConfigAddReq sysConfigAddReq) { + if (!configService.checkConfigKeyUnique(sysConfigAddReq.getConfigKey())) { + return error(StringUtils.format("新增参数「{}」失败，参数键名已存在",sysConfigAddReq.getConfigName())); } - config.setCreateBy(SecurityUtils.getUsername()); - return toAjax(configService.save(config)); + return toAjax(configService.save(SysConfig.addReqBuild(sysConfigAddReq))); } /** @@ -89,13 +93,14 @@ public class SysConfigController extends BaseController { */ @RequiresPermissions("system:config:edit") @Log(title = "参数管理", businessType = BusinessType.UPDATE) - @PutMapping - public Result edit (@Validated @RequestBody SysConfig config) { - if (!configService.checkConfigKeyUnique(config)) { - return error("修改参数'" + config.getConfigName() + "'失败，参数键名已存在"); + @PutMapping("/{sysConfigId}") + public Result edit (@PathVariable("sysConfigId")Long sysConfigId, @Validated @RequestBody SysConfigUpdReq sysConfigUpdReq) { + if (!configService.checkConfigKeyUnique(sysConfigUpdReq.getConfigKey())) { + return error("修改参数'" + sysConfigUpdReq.getConfigName() + "'失败，参数键名已存在"); } - config.setUpdateBy(SecurityUtils.getUsername()); - return toAjax(configService.updateById(config)); + return toAjax(configService.updateById( + SysConfig.updReqBuild(sysConfigUpdReq, sysConfigId) + )); } /** @@ -104,7 +109,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.DELETE) @DeleteMapping("/{configIds}") - public Result remove (@PathVariable("configIds") Long[] configIds) { + public Result remove (@PathVariable("configIds") Long[] configIds) { configService.removeBatchByIds(Arrays.asList(configIds)); return success(); } @@ -115,7 +120,7 @@ public class SysConfigController extends BaseController { @RequiresPermissions("system:config:remove") @Log(title = "参数管理", businessType = BusinessType.CLEAN) @DeleteMapping("/refreshCache") - public Result refreshCache () { + public Result refreshCache () { configService.resetConfigCache(); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java index 37e48fc..8bcd88c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java @@ -9,7 +9,10 @@ import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; +import com.muyu.system.domain.model.SysDeptPageQueryModel; +import com.muyu.system.domain.rep.SysDeptListReq; import com.muyu.system.service.SysDeptService; +import io.swagger.v3.oas.annotations.tags.Tag; import org.apache.commons.lang3.ArrayUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.validation.annotation.Validated; @@ -24,6 +27,7 @@ import java.util.List; */ @RestController @RequestMapping("/dept") +@Tag(name = "SysDeptController", description = "部门管理") public class SysDeptController extends BaseController { @Autowired @@ -33,10 +37,10 @@ public class SysDeptController extends BaseController { * 获取部门列表 */ @RequiresPermissions("system:dept:list") - @GetMapping("/list") - public Result list (SysDept dept) { - List depts = deptService.selectDeptList(dept); - return success(depts); + @PostMapping("/list") + public Result> list (@RequestBody SysDeptListReq sysDeptListReq) { + List deptList = deptService.queryList(SysDeptPageQueryModel.reqBuild(sysDeptListReq)); + return success(deptList); } /** @@ -45,9 +49,9 @@ public class SysDeptController extends BaseController { @RequiresPermissions("system:dept:list") @GetMapping("/list/exclude/{deptId}") public Result excludeChild (@PathVariable(value = "deptId", required = false) Long deptId) { - List depts = deptService.selectDeptList(new SysDept()); - depts.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId + "")); - return success(depts); + List deptList = deptService.queryList(SysDeptPageQueryModel.builder().build()); + deptList.removeIf(d -> d.getDeptId().intValue() == deptId || ArrayUtils.contains(StringUtils.split(d.getAncestors(), ","), deptId)); + return success(deptList); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java index f9862d9..376e1c7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictDataController.java @@ -4,7 +4,7 @@ import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -35,11 +35,10 @@ public class SysDictDataController extends BaseController { private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") - @GetMapping("/list") - public Result> list (SysDictData dictData) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysDictData dictData) { List list = dictDataService.selectDictDataList(dictData); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "字典数据", businessType = BusinessType.EXPORT) @@ -67,7 +66,7 @@ public class SysDictDataController extends BaseController { public Result dictType (@PathVariable("dictType") String dictType) { List data = dictTypeService.selectDictDataByType(dictType); if (StringUtils.isNull(data)) { - data = new ArrayList(); + data = new ArrayList<>(); } return success(data); } @@ -100,7 +99,7 @@ public class SysDictDataController extends BaseController { @RequiresPermissions("system:dict:remove") @Log(title = "字典类型", businessType = BusinessType.DELETE) @DeleteMapping("/{dictCodes}") - public Result remove (@PathVariable("dictCode") Long[] dictCodes) { + public Result remove (@PathVariable("dictCodes") Long[] dictCodes) { dictDataService.deleteDictDataByIds(dictCodes); return success(); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java index c4a7b9f..1e17fe7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDictTypeController.java @@ -3,7 +3,7 @@ package com.muyu.system.controller; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -29,11 +29,10 @@ public class SysDictTypeController extends BaseController { private SysDictTypeService dictTypeService; @RequiresPermissions("system:dict:list") - @GetMapping("/list") - public Result> list (SysDictType dictType) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysDictType dictType) { List list = dictTypeService.selectDictTypeList(dictType); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "字典类型", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java index c1e92b7..5293796 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysLogininforController.java @@ -4,13 +4,17 @@ import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.redis.service.RedisService; import com.muyu.common.security.annotation.InnerAuth; import com.muyu.common.security.annotation.RequiresPermissions; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforExportModel; +import com.muyu.system.domain.model.SysLogininforListModel; +import com.muyu.system.domain.rep.SysLogininforListReq; import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; @@ -33,20 +37,21 @@ public class SysLogininforController extends BaseController { private RedisService redisService; @RequiresPermissions("system:logininfor:list") - @GetMapping("/list") - public Result> list (SysLogininfor logininfor) { - startPage(); - List list = logininforService.selectLogininforList(logininfor); - return getDataTable(list); + @PostMapping("/list") + public Result> list (@RequestBody SysLogininforListReq sysLogininforListReq) { + PageQueryModel pageQueryModel = logininforService.pageQuery(SysLogininforListModel.reqBuild(sysLogininforListReq)); + return Result.success( + DataPageResp.of(pageQueryModel) + ); } @Log(title = "登录日志", businessType = BusinessType.EXPORT) @RequiresPermissions("system:logininfor:export") @PostMapping("/export") - public void export (HttpServletResponse response, SysLogininfor logininfor) { - List list = logininforService.selectLogininforList(logininfor); + public void export (HttpServletResponse response, SysLogininforListReq sysLogininforListReq) { + List sysLogininforList = logininforService.exportQuery(SysLogininforExportModel.reqBuild(sysLogininforListReq)); ExcelUtil util = new ExcelUtil(SysLogininfor.class); - util.exportExcel(response, list, "登录日志"); + util.exportExcel(response, sysLogininforList, "登录日志"); } @RequiresPermissions("system:logininfor:remove") diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java index e5ae348..5f055b8 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysMenuController.java @@ -32,8 +32,8 @@ public class SysMenuController extends BaseController { * 获取菜单列表 */ @RequiresPermissions("system:menu:list") - @GetMapping("/list") - public Result list (SysMenu menu) { + @PostMapping("/list") + public Result list (@RequestBody SysMenu menu) { Long userId = SecurityUtils.getUserId(); List menus = menuService.selectMenuList(menu, userId); return success(menus); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java index e6b9ede..eb29bfa 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysNoticeController.java @@ -2,7 +2,7 @@ package com.muyu.system.controller; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -30,11 +30,10 @@ public class SysNoticeController extends BaseController { * 获取通知公告列表 */ @RequiresPermissions("system:notice:list") - @GetMapping("/list") - public Result> list (SysNotice notice) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysNotice notice) { List list = noticeService.selectNoticeList(notice); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java index bb00d1d..c0c5e91 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysOperlogController.java @@ -3,7 +3,7 @@ package com.muyu.system.controller; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; @@ -28,11 +28,10 @@ public class SysOperlogController extends BaseController { private SysOperLogService operLogService; @RequiresPermissions("system:operlog:list") - @GetMapping("/list") - public Result> list (SysOperLog operLog) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysOperLog operLog) { List list = operLogService.selectOperLogList(operLog); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "操作日志", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java index 79f3f47..1888eb7 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysPostController.java @@ -3,7 +3,7 @@ package com.muyu.system.controller; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -32,11 +32,10 @@ public class SysPostController extends BaseController { * 获取岗位列表 */ @RequiresPermissions("system:post:list") - @GetMapping("/list") - public Result> list (SysPost post) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysPost post) { List list = postService.selectPostList(post); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "岗位管理", businessType = BusinessType.EXPORT) diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java index f8b05ad..9c45f4c 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysRoleController.java @@ -3,7 +3,7 @@ package com.muyu.system.controller; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.RequiresPermissions; @@ -41,11 +41,10 @@ public class SysRoleController extends BaseController { private SysDeptService deptService; @RequiresPermissions("system:role:list") - @GetMapping("/list") - public Result> list (SysRole role) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysRole role) { List list = roleService.selectRoleList(role); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "角色管理", businessType = BusinessType.EXPORT) @@ -151,10 +150,9 @@ public class SysRoleController extends BaseController { */ @RequiresPermissions("system:role:list") @GetMapping("/authUser/allocatedList") - public Result> allocatedList (SysUser user) { - startPage(); + public Result> allocatedList (SysUser user) { List list = userService.selectAllocatedList(user); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** @@ -162,10 +160,9 @@ public class SysRoleController extends BaseController { */ @RequiresPermissions("system:role:list") @GetMapping("/authUser/unallocatedList") - public Result> unallocatedList (SysUser user) { - startPage(); + public Result> unallocatedList (SysUser user) { List list = userService.selectUnallocatedList(user); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } /** @@ -207,7 +204,7 @@ public class SysRoleController extends BaseController { public Result deptTree (@PathVariable("roleId") Long roleId) { return Result.success( DeptTreeResp.builder() - .depts(deptService.selectDeptTreeList(new SysDept())) + .depts(deptService.selectDeptTreeList()) .checkedKeys(deptService.selectDeptListByRoleId(roleId)) .build() ); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java index bc0b5fe..54a14de 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java @@ -4,7 +4,7 @@ import com.muyu.common.core.domain.Result; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.poi.ExcelUtil; import com.muyu.common.core.web.controller.BaseController; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.security.annotation.InnerAuth; @@ -60,11 +60,10 @@ public class SysUserController extends BaseController { * 获取用户列表 */ @RequiresPermissions("system:user:list") - @GetMapping("/list") - public Result> list (SysUser user) { - startPage(); + @PostMapping("/list") + public Result> list (@RequestBody SysUser user) { List list = userService.selectUserList(user); - return getDataTable(list); + return Result.success(new DataPageResp<>(0,list)); } @Log(title = "用户管理", businessType = BusinessType.EXPORT) @@ -135,7 +134,7 @@ public class SysUserController extends BaseController { * * @return 用户信息 */ - @GetMapping("getInfo") + @GetMapping("/getInfo") public Result getInfo () { SysUser user = userService.selectUserById(SecurityUtils.getUserId()); // 角色集合 @@ -287,7 +286,7 @@ public class SysUserController extends BaseController { */ @RequiresPermissions("system:user:list") @GetMapping("/deptTree") - public Result deptTree (SysDept dept) { - return success(deptService.selectDeptTreeList(dept)); + public Result deptTree () { + return success(deptService.selectDeptTreeList()); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java index 5b78721..99a2325 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserOnlineController.java @@ -4,7 +4,7 @@ import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.web.controller.BaseController; import com.muyu.common.core.domain.Result; -import com.muyu.common.core.web.page.TableDataInfo; +import com.muyu.common.core.web.page.DataPageResp; import com.muyu.common.log.annotation.Log; import com.muyu.common.log.enums.BusinessType; import com.muyu.common.redis.service.RedisService; @@ -35,8 +35,8 @@ public class SysUserOnlineController extends BaseController { private RedisService redisService; @RequiresPermissions("monitor:online:list") - @GetMapping("/list") - public Result> list (String ipaddr, String userName) { + @PostMapping("/list") + public Result> list (@RequestBody String ipaddr, String userName) { Collection keys = redisService.keys(CacheConstants.LOGIN_TOKEN_KEY + "*"); List userOnlineList = new ArrayList(); for (String key : keys) { @@ -53,7 +53,7 @@ public class SysUserOnlineController extends BaseController { } Collections.reverse(userOnlineList); userOnlineList.removeAll(Collections.singleton(null)); - return getDataTable(userOnlineList); + return Result.success(new DataPageResp(0, userOnlineList)); } /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java index 6f7e8bf..3ff99b0 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysConfig.java @@ -6,6 +6,9 @@ import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; +import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.system.domain.rep.SysConfigAddReq; +import com.muyu.system.domain.rep.SysConfigUpdReq; import lombok.AllArgsConstructor; import lombok.Data; import lombok.EqualsAndHashCode; @@ -78,4 +81,35 @@ public class SysConfig extends BaseEntity { return configValue; } + /** + * 通过请求参数直接构建数据库 + * @param addReq 请求对象 + * @return 添加对象 + */ + public static SysConfig addReqBuild(SysConfigAddReq addReq) { + return builder() + .configKey(addReq.getConfigKey()) + .configName(addReq.getConfigName()) + .configValue(addReq.getConfigValue()) + .configType(addReq.getConfigType()) + .remark(addReq.getRemark()) + .createBy(SecurityUtils.getUsername()) + .build(); + } + /** + * 通过请求参数直接构建数据库 + * @param updReq 请求对象 + * @return 添加对象 + */ + public static SysConfig updReqBuild(SysConfigUpdReq updReq, Long sysConfigId) { + return builder() + .configId(sysConfigId) + .configKey(updReq.getConfigKey()) + .configName(updReq.getConfigName()) + .configValue(updReq.getConfigValue()) + .configType(updReq.getConfigType()) + .remark(updReq.getRemark()) + .updateBy(SecurityUtils.getUsername()) + .build(); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java index e4ad4e4..9252b3b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysMenu.java @@ -1,5 +1,9 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableField; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import lombok.*; import lombok.experimental.SuperBuilder; @@ -20,82 +24,98 @@ import java.util.List; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) +@TableName("sys_menu") public class SysMenu extends BaseEntity { private static final long serialVersionUID = 1L; /** * 菜单ID */ + @TableId(type = IdType.AUTO) private Long menuId; /** * 菜单名称 */ + @TableField() private String menuName; /** * 父菜单名称 */ + @TableField() private String parentName; /** * 父菜单ID */ + @TableField() private Long parentId; /** * 显示顺序 */ + @TableField() private Integer orderNum; /** * 路由地址 */ + @TableField() private String path; /** * 组件路径 */ + @TableField() private String component; /** * 路由参数 */ + @TableField() private String query; /** * 是否为外链（0是 1否） */ + @TableField() private String isFrame; /** * 是否缓存（0缓存 1不缓存） */ + @TableField() private String isCache; /** * 类型（M目录 C菜单 F按钮） */ + @TableField() private String menuType; /** * 显示状态（0显示 1隐藏） */ + @TableField() private String visible; /** * 菜单状态（0正常 1停用） */ + @TableField() private String status; /** * 权限字符串 */ + @TableField() private String perms; /** * 菜单图标 */ + @TableField() private String icon; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java index a0c30e0..f574890 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysNotice.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.web.domain.BaseEntity; import com.muyu.common.core.xss.Xss; import lombok.AllArgsConstructor; @@ -21,12 +24,14 @@ import jakarta.validation.constraints.Size; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) +@TableName("sys_notice") public class SysNotice extends BaseEntity { private static final long serialVersionUID = 1L; /** * 公告ID */ + @TableId(type = IdType.AUTO) private Long noticeId; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java index 326987c..d82919b 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysPost.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import com.muyu.common.core.annotation.Excel; import com.muyu.common.core.annotation.Excel.ColumnType; import com.muyu.common.core.web.domain.BaseEntity; @@ -20,6 +23,7 @@ import jakarta.validation.constraints.Size; @NoArgsConstructor @AllArgsConstructor @EqualsAndHashCode(callSuper = true) +@TableName("sys_post") public class SysPost extends BaseEntity { private static final long serialVersionUID = 1L; @@ -27,6 +31,7 @@ public class SysPost extends BaseEntity { * 岗位序号 */ @Excel(name = "岗位序号", cellType = ColumnType.NUMERIC) + @TableId(type = IdType.AUTO) private Long postId; /** diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java index ef9f13c..49e5170 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleDept.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,6 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_role_dept") public class SysRoleDept { /** * 角色ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java index fe4074b..c548b8a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysRoleMenu.java @@ -1,6 +1,9 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -15,6 +18,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_role_menu") public class SysRoleMenu { /** * 角色ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java index 23d1979..5a4c364 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserOnline.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,6 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_user_online") public class SysUserOnline { /** * 会话编号 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java index 229dc70..f83249d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserPost.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,6 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_user_post") public class SysUserPost { /** * 用户ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java index ee9c945..1bead41 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/SysUserRole.java @@ -1,5 +1,8 @@ package com.muyu.system.domain; +import com.baomidou.mybatisplus.annotation.IdType; +import com.baomidou.mybatisplus.annotation.TableId; +import com.baomidou.mybatisplus.annotation.TableName; import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; @@ -14,6 +17,7 @@ import lombok.NoArgsConstructor; @Builder @NoArgsConstructor @AllArgsConstructor +@TableName("sys_user_role") public class SysUserRole { /** * 用户ID diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysConfigPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysConfigPageQueryModel.java new file mode 100644 index 0000000..e1551e8 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysConfigPageQueryModel.java @@ -0,0 +1,60 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysConfigListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysConfigPageQueryModel extends QueryModel { + + /** + * 配置名称 + */ + private String configName; + + /** + * 配置Key + */ + private String configKey; + + /** + * 配置类型 + */ + private String configType; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + + public static SysConfigPageQueryModel reqBuild(SysConfigListReq sysConfigListReq) { + SysConfigPageQueryModel configPageQueryModel = SysConfigPageQueryModel.builder() + .configName(sysConfigListReq.getConfigName()) + .configType(sysConfigListReq.getConfigType()) + .configKey(sysConfigListReq.getConfigKey()) + .beginTime(sysConfigListReq.getBeginTime()) + .endTime(sysConfigListReq.getEndTime()) + .build(); + configPageQueryModel.domainBuild(sysConfigListReq); + return configPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java new file mode 100644 index 0000000..829100d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDeptPageQueryModel.java @@ -0,0 +1,67 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDeptListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDeptPageQueryModel extends QueryModel { + + /** + * 部门ID + */ + private Long deptId; + + /** + * 部门名称 + */ + private String deptName; + + /** + * 部门状态:0正常,1停用 + */ + private String status; + + + /** + * 根据部门请求对象构建查询对象 + * @param sysDeptListReq 部门列表请求对象 + * @return 部门请求构建查询对象 + */ + public static SysDeptPageQueryModel reqBuild(SysDeptListReq sysDeptListReq) { + return SysDeptPageQueryModel.builder() + .deptName(sysDeptListReq.getDeptName()) + .status(sysDeptListReq.getStatus()) + .build(); + } + + /** + * 根据部门ID构建查询对象 + * @param deptId 部门ID + * @return 部门查询对象 + */ + public static SysDeptPageQueryModel ofToDeptId(Long deptId) { + return SysDeptPageQueryModel.builder() + .deptId(deptId) + .build(); + } + + /** + * 构建一个空对象 + * @return 查询模型空对象 + */ + public static SysDeptPageQueryModel ofNull() { + return new SysDeptPageQueryModel(); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java new file mode 100644 index 0000000..733351b --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictDataPageQueryModel.java @@ -0,0 +1,46 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDictDataListReq; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDictDataPageQueryModel extends QueryModel { + + /** + * 字典类型 + */ + private String dictType; + /** + * 字典标签 + */ + private String dictLabel; + /** + * 状态（0正常 1停用） + */ + private String status; + + public static SysDictDataPageQueryModel reqBuild(SysDictDataListReq sysDictDataListReq) { + SysDictDataPageQueryModel sysDictDataPageQueryModel = SysDictDataPageQueryModel.builder() + .dictType(sysDictDataListReq.getDictType()) + .dictLabel(sysDictDataListReq.getDictLabel()) + .status(sysDictDataListReq.getStatus()) + .build(); + sysDictDataPageQueryModel.domainBuild(sysDictDataListReq); + return sysDictDataPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java new file mode 100644 index 0000000..ab6ae4b --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysDictTypePageQueryModel.java @@ -0,0 +1,62 @@ +package com.muyu.system.domain.model; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDeptListReq; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysDictTypePageQueryModel extends QueryModel { + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 状态（0正常 1停用） + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + public static SysDictTypePageQueryModel reqBuild(SysDictTypeListReq sysDictTypeListReq) { + SysDictTypePageQueryModel sysDictTypePageQueryModel = SysDictTypePageQueryModel.builder() + .dictName(sysDictTypeListReq.getDictName()) + .dictType(sysDictTypeListReq.getDictType()) + .status(sysDictTypeListReq.getStatus()) + .beginTime(sysDictTypeListReq.getBeginTime()) + .endTime(sysDictTypeListReq.getEndTime()) + .build(); + sysDictTypePageQueryModel.domainBuild(sysDictTypeListReq); + return sysDictTypePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java new file mode 100644 index 0000000..4a55bda --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforExportModel.java @@ -0,0 +1,53 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysLogininforListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户登录日志导出模型对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysLogininforExportModel { + /** + * IP地址 + */ + private String ipaddr; + + /** + * 用户名称 + */ + private String userName; + + /** + * 装填 + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + public static SysLogininforExportModel reqBuild(SysLogininforListReq req){ + return SysLogininforExportModel.builder() + .ipaddr(req.getIpaddr()) + .userName(req.getUserName()) + .beginTime(req.getBeginTime()) + .endTime(req.getEndTime()) + .build(); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java new file mode 100644 index 0000000..6b0d3bf --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforListModel.java @@ -0,0 +1,56 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.core.web.page.PageReq; +import com.muyu.system.domain.rep.SysLogininforListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户登录日志查询模型对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysLogininforListModel extends QueryModel { + /** + * IP地址 + */ + private String ipaddr; + + /** + * 用户名称 + */ + private String userName; + + /** + * 装填 + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; + + public static SysLogininforListModel reqBuild(SysLogininforListReq req){ + return SysLogininforListModel.builder() + .ipaddr(req.getIpaddr()) + .userName(req.getUserName()) + .beginTime(req.getBeginTime()) + .endTime(req.getEndTime()) + .build() + .domainBuild(req); + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java new file mode 100644 index 0000000..e8f0f5c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysLogininforPageQueryModel.java @@ -0,0 +1,57 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysDictTypeListReq; +import com.muyu.system.domain.rep.SysLogininforListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; +import lombok.EqualsAndHashCode; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysLogininforPageQueryModel extends QueryModel { + + /** + * 用户账号 + */ + private String userName; + /** + * 状态 0成功 1失败 + */ + private String status; + /** + * 地址 + */ + private String ipaddr; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysLogininforPageQueryModel reqBuild(SysLogininforListReq sysLogininforListReq) { + SysLogininforPageQueryModel sysLogininforPageQueryModel = SysLogininforPageQueryModel.builder() + .userName(sysLogininforListReq.getUserName()) + .status(sysLogininforListReq.getStatus()) + .ipaddr(sysLogininforListReq.getIpaddr()) + .beginTime(sysLogininforListReq.getBeginTime()) + .endTime(sysLogininforListReq.getEndTime()) + .build(); + sysLogininforPageQueryModel.domainBuild(sysLogininforListReq); + return sysLogininforPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java new file mode 100644 index 0000000..ce4410c --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysMenuPageQueryModel.java @@ -0,0 +1,39 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysLogininforListReq; +import com.muyu.system.domain.rep.SysMenuListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysMenuPageQueryModel extends QueryModel { + /** + * 菜单名称 + */ + private String menuName; + /** + * 菜单状态（0正常 1停用） + */ + private String status; + + public static SysMenuPageQueryModel reqBuild(SysMenuListReq sysMenuListReq) { + SysMenuPageQueryModel sysMenuPageQueryModel = SysMenuPageQueryModel.builder() + .menuName(sysMenuListReq.getMenuName()) + .status(sysMenuListReq.getStatus()) + .build(); + sysMenuPageQueryModel.domainBuild(sysMenuListReq); + return sysMenuPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java new file mode 100644 index 0000000..7038148 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysNoticePageQueryModel.java @@ -0,0 +1,45 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysMenuListReq; +import com.muyu.system.domain.rep.SysNoticeListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysNoticePageQueryModel extends QueryModel { + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; + /** + * 创建者 + */ + private String createBy; + + public static SysNoticePageQueryModel reqBuild(SysNoticeListReq sysNoticeListReq) { + SysNoticePageQueryModel sysNoticePageQueryModel = SysNoticePageQueryModel.builder() + .noticeTitle(sysNoticeListReq.getNoticeTitle()) + .noticeType(sysNoticeListReq.getNoticeType()) + .createBy(sysNoticeListReq.getCreateBy()) + .build(); + sysNoticePageQueryModel.domainBuild(sysNoticeListReq); + return sysNoticePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java new file mode 100644 index 0000000..a87b94d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysOperlogPageQueryModel.java @@ -0,0 +1,66 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysNoticeListReq; +import com.muyu.system.domain.rep.SysOperlogListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + + +/** + * 参数配置 分页 模型 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysOperlogPageQueryModel extends QueryModel { + /** + * 操作地址 + */ + private String operIp; + /** + * 操作模块 + */ + private String title; + /** + * 操作人员 + */ + private String operName; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysOperlogPageQueryModel reqBuild(SysOperlogListReq sysOperlogListReq) { + SysOperlogPageQueryModel sysOperlogPageQueryModel = SysOperlogPageQueryModel.builder() + .operIp(sysOperlogListReq.getOperIp()) + .title(sysOperlogListReq.getTitle()) + .operName(sysOperlogListReq.getOperName()) + .businessType(sysOperlogListReq.getBusinessType()) + .status(sysOperlogListReq.getStatus()) + .beginTime(sysOperlogListReq.getBeginTime()) + .endTime(sysOperlogListReq.getEndTime()) + .build(); + sysOperlogPageQueryModel.domainBuild(sysOperlogListReq); + return sysOperlogPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java new file mode 100644 index 0000000..44339d4 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysPostPageQueryModel.java @@ -0,0 +1,47 @@ +package com.muyu.system.domain.model; + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysOperlogListReq; +import com.muyu.system.domain.rep.SysPostListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysPostPageQueryModel extends QueryModel { + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 状态（0正常 1停用） + */ + private String status; + + public static SysPostPageQueryModel reqBuild(SysPostListReq sysPostListReq) { + SysPostPageQueryModel sysPostPageQueryModel = SysPostPageQueryModel.builder() + .postCode(sysPostListReq.getPostCode()) + .postName(sysPostListReq.getPostName()) + .status(sysPostListReq.getStatus()) + .build(); + sysPostPageQueryModel.domainBuild(sysPostListReq); + return sysPostPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java new file mode 100644 index 0000000..1604b04 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysRolePageQueryModel.java @@ -0,0 +1,65 @@ +package com.muyu.system.domain.model; + +/** + * @ClassName SysRolePageQueryModel + * @Author AnNan.Wang + * @Date 2024/12/16 12:34 + */ + + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysPostListReq; +import com.muyu.system.domain.rep.SysRoleListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysRolePageQueryModel extends QueryModel { + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + /** + * 角色状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + + public static SysRolePageQueryModel reqBuild(SysRoleListReq sysRoleListReq) { + SysRolePageQueryModel sysRolePageQueryModel = SysRolePageQueryModel.builder() + .roleName(sysRoleListReq.getRoleName()) + .roleKey(sysRoleListReq.getRoleKey()) + .status(sysRoleListReq.getStatus()) + .beginTime(sysRoleListReq.getBeginTime()) + .endTime(sysRoleListReq.getEndTime()) + .build(); + sysRolePageQueryModel.domainBuild(sysRoleListReq); + return sysRolePageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java new file mode 100644 index 0000000..b8e8417 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/model/SysUserPageQueryModel.java @@ -0,0 +1,58 @@ +package com.muyu.system.domain.model; + + +import com.muyu.common.core.web.model.QueryModel; +import com.muyu.system.domain.rep.SysPostListReq; +import com.muyu.system.domain.rep.SysUserListReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数配置 分页 模型 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = false) +public class SysUserPageQueryModel extends QueryModel { + + /** + * 用户昵称 + */ + private String nickName; + /** + * 手机号码 + */ + private String phonenumber; + /** + * 帐号状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; + + public static SysUserPageQueryModel reqBuild(SysUserListReq sysUserListReq) { + SysUserPageQueryModel sysUserPageQueryModel = SysUserPageQueryModel.builder() + .nickName(sysUserListReq.getNickName()) + .phonenumber(sysUserListReq.getPhonenumber()) + .status(sysUserListReq.getStatus()) + .beginTime(sysUserListReq.getBeginTime()) + .endTime(sysUserListReq.getEndTime()) + .build(); + sysUserPageQueryModel.domainBuild(sysUserListReq); + return sysUserPageQueryModel; + } +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java new file mode 100644 index 0000000..482aae0 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigAddReq.java @@ -0,0 +1,44 @@ +package com.muyu.system.domain.rep; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @description: 系统配置添加请求 + * @author dongzeliang + * @date 2025/1/10 17:24 + * @version 1.0 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysConfigAddReq { + + /** + * 参数名称 + */ + private String configName; + + /** + * 参数键名 + */ + private String configKey; + + /** + * 参数键值 + */ + private String configValue; + + /** + * 系统内置（Y是 N否） + */ + private String configType; + + /** + * 备注 + */ + private String remark; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java new file mode 100644 index 0000000..88bd617 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigListReq.java @@ -0,0 +1,43 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.*; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 参数请求列表查询对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysConfigListReq extends PageReq { + + /** + * 配置名称 + */ + private String configName; + + /** + * 配置Key + */ + private String configKey; + + /** + * 配置类型 + */ + private String configType; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java new file mode 100644 index 0000000..b90e226 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysConfigUpdReq.java @@ -0,0 +1,43 @@ +package com.muyu.system.domain.rep; + +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; + +/** + * @author dongzeliang + * @version 1.0 + * @description: 系统配置修改请求 + * @date 2025/1/14 10:39 + */ +@Data +@Builder +@NoArgsConstructor +@AllArgsConstructor +public class SysConfigUpdReq { + /** + * 参数名称 + */ + private String configName; + + /** + * 参数键名 + */ + private String configKey; + + /** + * 参数键值 + */ + private String configValue; + + /** + * 系统内置（Y是 N否） + */ + private String configType; + + /** + * 备注 + */ + private String remark; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java new file mode 100644 index 0000000..48687cc --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDeptListReq.java @@ -0,0 +1,34 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 部门信息请求列表查询对象 + * + * @ClassName SysDeptListReq + * @Author AnNan.Wang + * @Date 2024/12/14 11:44 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDeptListReq extends PageReq { + + /** + * 部门名称 + */ + private String deptName; + + /** + * 部门状态:0正常,1停用 + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java new file mode 100644 index 0000000..5e44bbe --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictDataListReq.java @@ -0,0 +1,37 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 数据字典信息 + * + * @ClassName SysDictDataListReq + * @Author AnNan.Wang + * @Date 2024/12/15 17:29 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDictDataListReq extends PageReq { + + /** + * 字典名称 + */ + private String dictType; + /** + * 字典标签 + */ + private String dictLabel; + /** + * 状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java new file mode 100644 index 0000000..886216a --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysDictTypeListReq.java @@ -0,0 +1,51 @@ +package com.muyu.system.domain.rep; + +import com.fasterxml.jackson.annotation.JsonFormat; +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 字典数据表 请求列表查询对象 + * + * @author muyu + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysDictTypeListReq extends PageReq { + + /** + * 字典名称 + */ + private String dictName; + + /** + * 字典类型 + */ + private String dictType; + + /** + * 状态（0正常 1停用） + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java new file mode 100644 index 0000000..eefc8a8 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysLogininforListReq.java @@ -0,0 +1,45 @@ +package com.muyu.system.domain.rep; + +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户登录请求对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +public class SysLogininforListReq extends PageReq { + /** + * IP地址 + */ + private String ipaddr; + + /** + * 用户名称 + */ + private String userName; + + /** + * 装填 + */ + private String status; + + /** + * 开始时间 + */ + private Date beginTime; + + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java new file mode 100644 index 0000000..7cf9817 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysMenuListReq.java @@ -0,0 +1,32 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 菜单信息请求列表查询对象 + * + * @ClassName SysMenuListReq + * @Author AnNan.Wang + * @Date 2024/12/16 10:55 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysMenuListReq extends PageReq { + /** + * 菜单名称 + */ + private String menuName; + /** + * 菜单状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java new file mode 100644 index 0000000..790c44f --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysNoticeListReq.java @@ -0,0 +1,37 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 公告信息操作处理请求列表查询对象 + * + * @ClassName SysNoticeListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:02 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysNoticeListReq extends PageReq { + /** + * 公告标题 + */ + private String noticeTitle; + + /** + * 公告类型（1通知 2公告） + */ + private String noticeType; + /** + * 创建者 + */ + private String createBy; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java new file mode 100644 index 0000000..70cc11d --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysOperlogListReq.java @@ -0,0 +1,54 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 操作日志记录请求列表查询对象 + * + * @ClassName SysOperlogListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:18 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysOperlogListReq extends PageReq { + /** + * 操作地址 + */ + private String operIp; + /** + * 操作模块 + */ + private String title; + /** + * 操作人员 + */ + private String operName; + /** + * 业务类型（0其它 1新增 2修改 3删除） + */ + private Integer businessType; + /** + * 操作状态（0正常 1异常） + */ + private Integer status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java new file mode 100644 index 0000000..3ad620e --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysPostListReq.java @@ -0,0 +1,40 @@ +package com.muyu.system.domain.rep; + +/** + * @ClassName SysPostListReq + * @Author AnNan.Wang + * @Date 2024/12/16 11:32 + */ + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +/** + * 岗位信息操作处理 请求列表查询对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysPostListReq extends PageReq { + /** + * 岗位编码 + */ + private String postCode; + + /** + * 岗位名称 + */ + private String postName; + + /** + * 状态（0正常 1停用） + */ + private String status; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java new file mode 100644 index 0000000..4d90125 --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysRoleListReq.java @@ -0,0 +1,44 @@ +package com.muyu.system.domain.rep; + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 角色信息 请求列表查询对象 + */ + +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysRoleListReq extends PageReq { + /** + * 角色名称 + */ + private String roleName; + + /** + * 角色权限 + */ + private String roleKey; + /** + * 角色状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java new file mode 100644 index 0000000..db9480f --- /dev/null +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/domain/rep/SysUserListReq.java @@ -0,0 +1,48 @@ +package com.muyu.system.domain.rep; + +/** + * @ClassName SysUserListReq + * @Author AnNan.Wang + * @Date 2024/12/16 12:30 + */ + +import com.muyu.common.core.annotation.Excel; +import com.muyu.common.core.web.page.PageReq; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import lombok.experimental.SuperBuilder; + +import java.util.Date; + +/** + * 用户信息 请求列表查询对象 + */ +@Data +@SuperBuilder +@NoArgsConstructor +@AllArgsConstructor +@EqualsAndHashCode(callSuper = true) +public class SysUserListReq extends PageReq { + /** + * 用户昵称 + */ + private String nickName; + /** + * 手机号码 + */ + private String phonenumber; + /** + * 帐号状态（0正常 1停用） + */ + private String status; + /** + * 开始时间 + */ + private Date beginTime; + /** + * 结束时间 + */ + private Date endTime; +} diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java index 2b01dc3..242a1a5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMapper.java @@ -11,14 +11,6 @@ import java.util.List; * @author muyu */ public interface SysRoleMapper extends BaseMapper { - /** - * 根据条件分页查询角色数据 - * - * @param role 角色信息 - * - * @return 角色数据集合信息 - */ - public List selectRoleList (SysRole role); /** * 根据用户ID查询角色 @@ -67,9 +59,9 @@ public interface SysRoleMapper extends BaseMapper { * 校验角色名称是否唯一 * * @param roleName 角色名称 - * * @return 角色信息 */ + public SysRole checkRoleNameUnique (String roleName); /** @@ -79,16 +71,9 @@ public interface SysRoleMapper extends BaseMapper { * * @return 角色信息 */ + public SysRole checkRoleKeyUnique (String roleKey); - /** - * 修改角色信息 - * - * @param role 角色信息 - * - * @return 结果 - */ - public int updateRole (SysRole role); /** * 新增角色信息 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java index 664ce26..45847ae 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/mapper/SysRoleMenuMapper.java @@ -3,6 +3,7 @@ package com.muyu.system.mapper; import com.baomidou.mybatisplus.core.mapper.BaseMapper; import com.muyu.system.domain.SysRoleMenu; +import feign.Param; import java.util.List; @@ -47,4 +48,8 @@ public interface SysRoleMenuMapper extends BaseMapper { * @return 结果 */ public int batchRoleMenu (List roleMenuList); + + // 批量保存角色与菜单的关联 + boolean saveBatch(@Param("roleMenuList") List roleMenuList); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java index f23d67e..ca4ff4f 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysConfigService.java @@ -1,7 +1,10 @@ package com.muyu.system.service; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysConfigPageQueryModel; import java.util.List; @@ -11,7 +14,14 @@ import java.util.List; * @Date 2023-11-13 上午 10:06 */ public interface SysConfigService extends IService { - List pageQuery (SysConfig config); + + + /** + * 分页查询 + * @param pageQueryModel 查询模型 + * @return 查询结果 + */ + PageQueryModel pageQuery (SysConfigPageQueryModel pageQueryModel); /** * 通过Key进行查询值 @@ -22,10 +32,10 @@ public interface SysConfigService extends IService { /** * 检测参数是否唯一 - * @param config - * @return + * @param configKey 配置唯一Key + * @return 重复：true 不重复：false */ - boolean checkConfigKeyUnique (SysConfig config); + boolean checkConfigKeyUnique (String configKey); /** * 刷新缓存 diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java index 140cf91..a252608 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDeptService.java @@ -2,6 +2,7 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; import com.muyu.common.system.domain.SysDept; +import com.muyu.system.domain.model.SysDeptPageQueryModel; import com.muyu.system.domain.vo.TreeSelect; import java.util.List; @@ -15,20 +16,18 @@ public interface SysDeptService extends IService { /** * 查询部门管理数据 * - * @param dept 部门信息 + * @param deptPageQueryModel 部门信息 * * @return 部门信息集合 */ - public List selectDeptList (SysDept dept); + public List selectDeptList (SysDeptPageQueryModel deptPageQueryModel); /** * 查询部门树结构信息 * - * @param dept 部门信息 - * * @return 部门树信息集合 */ - public List selectDeptTreeList (SysDept dept); + public List selectDeptTreeList (); /** * 构建前端所需要树结构 @@ -135,4 +134,11 @@ public interface SysDeptService extends IService { * @return 结果 */ public int deleteDeptById (Long deptId); + + /** + * 查询部门信息 + * @param sysDeptPageQueryModel 部门查询模型 + * @return 分页返回结果 + */ + List queryList(SysDeptPageQueryModel sysDeptPageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java index 47aae4b..0d9e8f5 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictDataService.java @@ -1,7 +1,11 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysDictData; +import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import java.util.List; @@ -63,4 +67,7 @@ public interface SysDictDataService extends IService { * @return 结果 */ public int updateDictData (SysDictData dictData); + + PageQueryModel pageQuery(SysDictDataPageQueryModel sysDictDataPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java index 1b3212d..521251e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysDictTypeService.java @@ -1,8 +1,10 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import java.util.List; @@ -103,4 +105,7 @@ public interface SysDictTypeService extends IService { * @return 结果 */ public boolean checkDictTypeUnique (SysDictType dictType); + + + PageQueryModel pageQuery(SysDictTypePageQueryModel sysDictTypePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java index bb3031e..92819a9 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysLogininforService.java @@ -1,7 +1,10 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.model.SysLogininforExportModel; +import com.muyu.system.domain.model.SysLogininforListModel; import java.util.List; @@ -21,11 +24,11 @@ public interface SysLogininforService extends IService { /** * 查询系统登录日志集合 * - * @param logininfor 访问日志对象 + * @param sysLogininforListModel 访问日志对象 * * @return 登录记录集合 */ - public List selectLogininforList (SysLogininfor logininfor); + public PageQueryModel pageQuery(SysLogininforListModel sysLogininforListModel); /** * 批量删除系统登录日志 @@ -40,4 +43,11 @@ public interface SysLogininforService extends IService { * 清空系统登录日志 */ public void cleanLogininfor (); + + /** + * 导出查询 + * @param sysLogininforExportModel + * @return + */ + List exportQuery(SysLogininforExportModel sysLogininforExportModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java index 29bfb07..5c523dc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysMenuService.java @@ -1,7 +1,11 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.model.SysLogininforPageQueryModel; +import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; @@ -158,4 +162,7 @@ public interface SysMenuService extends IService { * @return 结果 */ public boolean checkMenuNameUnique (SysMenu menu); + + PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java index a1afe02..ec3014e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysNoticeService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysNoticePageQueryModel; import java.util.List; @@ -64,4 +66,6 @@ public interface SysNoticeService extends IService { * @return 结果 */ public int deleteNoticeByIds (Long[] noticeIds); + + PageQueryModel pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java index 70b63ee..44fda25 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysOperLogService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; import java.util.List; @@ -51,4 +53,7 @@ public interface SysOperLogService extends IService { * 清空操作日志 */ public void cleanOperLog (); + + PageQueryModel pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java index fbd8677..3929549 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysPostService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysPostPageQueryModel; import java.util.List; @@ -107,4 +109,7 @@ public interface SysPostService extends IService { * @return 结果 */ public int updatePost (SysPost post); + + PageQueryModel pageQuery(SysPostPageQueryModel sysPostPageQueryModel); + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java index 47009f8..1647adc 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysRoleService.java @@ -1,8 +1,10 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysRole; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysRolePageQueryModel; import java.util.List; import java.util.Set; @@ -128,19 +130,17 @@ public interface SysRoleService extends IService { * 修改角色状态 * * @param role 角色信息 - * * @return 结果 */ - public int updateRoleStatus (SysRole role); + public boolean updateRoleStatus (SysRole role); /** * 修改数据权限信息 * * @param role 角色信息 - * * @return 结果 */ - public int authDataScope (SysRole role); + public boolean authDataScope (SysRole role); /** * 通过角色ID删除角色 @@ -188,4 +188,6 @@ public interface SysRoleService extends IService { * @return 结果 */ public int insertAuthUsers (Long roleId, Long[] userIds); + + PageQueryModel pageQuery(SysRolePageQueryModel sysRolePageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java index f4c6167..371a1d1 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/SysUserService.java @@ -1,7 +1,9 @@ package com.muyu.system.service; import com.baomidou.mybatisplus.extension.service.IService; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.model.SysUserPageQueryModel; import java.util.List; @@ -225,4 +227,6 @@ public interface SysUserService extends IService { * @return 结果 */ public String importUser (List userList, Boolean isUpdateSupport, String operName); + + PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel); } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java index bc07cc8..8582443 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysConfigServiceImpl.java @@ -1,11 +1,14 @@ package com.muyu.system.service.impl; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.CacheConstants; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.redis.service.RedisService; import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysConfigPageQueryModel; import com.muyu.system.mapper.SysConfigMapper; import com.muyu.system.service.SysConfigService; import org.springframework.beans.factory.annotation.Autowired; @@ -30,26 +33,15 @@ public class SysConfigServiceImpl extends ServiceImpl pageQuery (SysConfig config) { + public PageQueryModel pageQuery (SysConfigPageQueryModel pageQueryModel) { LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); - if (StringUtils.isNotEmpty(config.getConfigName())){ - queryWrapper.like(SysConfig::getConfigName, config.getConfigName()); - } - if (StringUtils.isNotEmpty(config.getConfigType())){ - queryWrapper.like(SysConfig::getConfigType, config.getConfigType()); - } - if (StringUtils.isNotEmpty(config.getConfigKey())){ - queryWrapper.like(SysConfig::getConfigKey, config.getConfigKey()); - } - Object beginTime = config.getParams().get("beginTime"); - if (Objects.nonNull(beginTime) && beginTime instanceof Date beginDate){ - queryWrapper.gt(SysConfig::getCreateTime, beginDate); - } - Object endTime = config.getParams().get("endTime"); - if (Objects.nonNull(endTime) && endTime instanceof Date endDate){ - queryWrapper.lt(SysConfig::getCreateTime, endDate); - } - return this.list(queryWrapper); + queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigName()),SysConfig::getConfigName, pageQueryModel.getConfigName()); + queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigType()),SysConfig::getConfigType, pageQueryModel.getConfigType()); + queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getConfigKey()),SysConfig::getConfigKey, pageQueryModel.getConfigKey()); + queryWrapper.gt(Objects.nonNull(pageQueryModel.getBeginTime()),SysConfig::getCreateTime, pageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(pageQueryModel.getEndTime()),SysConfig::getCreateTime, pageQueryModel.getEndTime()); + Page page = this.page(pageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); } /** @@ -69,10 +61,10 @@ public class SysConfigServiceImpl extends ServiceImpl queryWrapper = new LambdaQueryWrapper<>(); - queryWrapper.eq(SysConfig::getConfigKey, config.getConfigKey()); - return this.count(queryWrapper) > 0; + queryWrapper.eq(SysConfig::getConfigKey, configKey); + return this.count(queryWrapper) == 0; } @Override diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java index a55301b..57ad332 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDeptServiceImpl.java @@ -1,5 +1,6 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; @@ -11,6 +12,7 @@ import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysDept; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; +import com.muyu.system.domain.model.SysDeptPageQueryModel; import com.muyu.system.domain.vo.TreeSelect; import com.muyu.system.mapper.SysDeptMapper; import com.muyu.system.mapper.SysRoleMapper; @@ -19,8 +21,8 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.ArrayList; -import java.util.Iterator; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -29,37 +31,55 @@ import java.util.stream.Collectors; * @author muyu */ @Service -public class SysDeptServiceImpl extends ServiceImpl implements SysDeptService { +public class SysDeptServiceImpl extends ServiceImpl + implements SysDeptService { @Autowired private SysDeptMapper deptMapper; @Autowired private SysRoleMapper roleMapper; + + @Override + public List queryList(SysDeptPageQueryModel sysDeptPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus()); + return this.list(queryWrapper); + } + + /** * 查询部门管理数据 * - * @param dept 部门信息 + * @param sysDeptPageQueryModel 部门信息 * * @return 部门信息集合 */ @Override @DataScope(deptAlias = "d") - public List selectDeptList (SysDept dept) { - return deptMapper.selectDeptList(dept); + public List selectDeptList (SysDeptPageQueryModel sysDeptPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq( + StringUtils.isNotNull(sysDeptPageQueryModel.getDeptName()),SysDept::getDeptName, sysDeptPageQueryModel.getDeptName() + ); + queryWrapper.eq(Objects.nonNull(sysDeptPageQueryModel.getStatus()),SysDept::getStatus,sysDeptPageQueryModel.getStatus()); + queryWrapper.eq(sysDeptPageQueryModel.getDeptId() != null,SysDept::getDeptId,sysDeptPageQueryModel.getDeptId()); + return this.list(queryWrapper); } /** * 查询部门树结构信息 * - * @param dept 部门信息 - * * @return 部门树信息集合 */ @Override - public List selectDeptTreeList (SysDept dept) { - List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); - return buildDeptTreeSelect(depts); + public List selectDeptTreeList () { + return buildDeptTreeSelect( + SpringUtils.getAopProxy(this).selectDeptList( + SysDeptPageQueryModel.ofNull() + ) + ); } /** @@ -71,8 +91,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ @Override public List buildDeptTree (List depts) { - List returnList = new ArrayList(); - List tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList()); + List returnList = new ArrayList<>(); + List tempList = depts.stream().map(SysDept::getDeptId).toList(); for (SysDept dept : depts) { // 如果是顶级节点, 遍历该父节点的所有子节点 if (!tempList.contains(dept.getParentId())) { @@ -187,9 +207,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl @Override public void checkDeptDataScope (Long deptId) { if (!SysUser.isAdmin(SecurityUtils.getUserId())) { - SysDept dept = new SysDept(); - dept.setDeptId(deptId); - List depts = SpringUtils.getAopProxy(this).selectDeptList(dept); + List depts = SpringUtils.getAopProxy(this) + .selectDeptList(SysDeptPageQueryModel.ofToDeptId(deptId)); if (StringUtils.isEmpty(depts)) { throw new ServiceException("没有权限访问部门数据！"); } @@ -263,7 +282,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl for (SysDept child : children) { child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors)); } - if (children.size() > 0) { + if (!children.isEmpty()) { deptMapper.updateDeptChildren(children); } } @@ -280,6 +299,8 @@ public class SysDeptServiceImpl extends ServiceImpl impl return deptMapper.deleteDeptById(deptId); } + + /** * 递归列表 */ @@ -299,9 +320,7 @@ public class SysDeptServiceImpl extends ServiceImpl impl */ private List getChildList (List list, SysDept t) { List tlist = new ArrayList(); - Iterator it = list.iterator(); - while (it.hasNext()) { - SysDept n = (SysDept) it.next(); + for (SysDept n : list) { if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) { tlist.add(n); } @@ -313,6 +332,6 @@ public class SysDeptServiceImpl extends ServiceImpl impl * 判断是否有子节点 */ private boolean hasChild (List list, SysDept t) { - return getChildList(list, t).size() > 0 ? true : false; + return !getChildList(list, t).isEmpty(); } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java index 777ffbd..90b7b8d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictDataServiceImpl.java @@ -1,14 +1,22 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; +import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictDataPageQueryModel; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.service.SysDictDataService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 字典 业务层处理 @@ -20,6 +28,8 @@ public class SysDictDataServiceImpl extends ServiceImpl pageQuery(SysDictDataPageQueryModel sysDictdataPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictType()),SysDictData::getDictType, sysDictdataPageQueryModel.getDictType()); + queryWrapper.like(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getDictLabel()),SysDictData::getDictLabel, sysDictdataPageQueryModel.getDictLabel()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictdataPageQueryModel.getStatus()),SysDictData::getDictType, sysDictdataPageQueryModel.getStatus()); + Page page = this.page(sysDictdataPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java index 4117411..5dacdbd 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysDictTypeServiceImpl.java @@ -1,12 +1,16 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.DictUtils; import com.muyu.common.system.domain.SysDictData; import com.muyu.common.system.domain.SysDictType; +import com.muyu.system.domain.model.SysDictTypePageQueryModel; import com.muyu.system.mapper.SysDictDataMapper; import com.muyu.system.mapper.SysDictTypeMapper; import com.muyu.system.service.SysDictTypeService; @@ -18,6 +22,7 @@ import javax.annotation.PostConstruct; import java.util.Comparator; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -33,6 +38,18 @@ public class SysDictTypeServiceImpl extends ServiceImpl pageQuery(SysDictTypePageQueryModel sysDictDataPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictName()),SysDictType::getDictName, sysDictDataPageQueryModel.getDictName()); + queryWrapper.like(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getDictType()),SysDictType::getDictType, sysDictDataPageQueryModel.getDictType()); + queryWrapper.eq(StringUtils.isNotEmpty(sysDictDataPageQueryModel.getStatus()),SysDictType::getDictType, sysDictDataPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysDictDataPageQueryModel.getBeginTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysDictDataPageQueryModel.getEndTime()),SysDictType::getCreateTime, sysDictDataPageQueryModel.getEndTime()); + Page page = this.page(sysDictDataPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + /** * 项目启动时，初始化字典到缓存 */ diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java index 1a7c7a0..a834c38 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysLogininforServiceImpl.java @@ -1,7 +1,15 @@ package com.muyu.system.service.impl; +import cn.hutool.core.util.ObjectUtil; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.system.domain.SysLogininfor; +import com.muyu.system.domain.SysConfig; +import com.muyu.system.domain.model.SysLogininforExportModel; +import com.muyu.system.domain.model.SysLogininforListModel; import com.muyu.system.mapper.SysLogininforMapper; import com.muyu.system.service.SysLogininforService; import org.springframework.beans.factory.annotation.Autowired; @@ -33,13 +41,19 @@ public class SysLogininforServiceImpl extends ServiceImpl selectLogininforList (SysLogininfor logininfor) { - return logininforMapper.selectLogininforList(logininfor); + public PageQueryModel pageQuery(SysLogininforListModel pageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getIpaddr()), SysLogininfor::getIpaddr, pageQueryModel.getIpaddr()); + queryWrapper.eq(StringUtils.isNotEmpty(pageQueryModel.getStatus()), SysLogininfor::getStatus, pageQueryModel.getStatus()); + queryWrapper.like(StringUtils.isNotEmpty(pageQueryModel.getUserName()), SysLogininfor::getUserName, pageQueryModel.getUserName()); + queryWrapper.between(!ObjectUtil.hasNull(pageQueryModel.getBeginTime(),pageQueryModel.getEndTime()), SysLogininfor::getAccessTime, pageQueryModel.getBeginTime(), pageQueryModel.getEndTime()); + Page page = this.page(pageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); } /** @@ -61,4 +75,19 @@ public class SysLogininforServiceImpl extends ServiceImpl exportQuery(SysLogininforExportModel exportModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(exportModel.getIpaddr()), SysLogininfor::getIpaddr, exportModel.getIpaddr()); + queryWrapper.eq(StringUtils.isNotEmpty(exportModel.getStatus()), SysLogininfor::getStatus, exportModel.getStatus()); + queryWrapper.like(StringUtils.isNotEmpty(exportModel.getUserName()), SysLogininfor::getUserName, exportModel.getUserName()); + queryWrapper.between(!ObjectUtil.hasNull(exportModel.getBeginTime(),exportModel.getEndTime()), SysLogininfor::getAccessTime, exportModel.getBeginTime(), exportModel.getEndTime()); + return this.list(queryWrapper); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java index d23ecdb..88b738a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysMenuServiceImpl.java @@ -1,13 +1,18 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.Constants; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysMenu; +import com.muyu.system.domain.model.SysMenuPageQueryModel; import com.muyu.system.domain.vo.MetaVo; import com.muyu.system.domain.vo.RouterVo; import com.muyu.system.domain.vo.TreeSelect; @@ -70,6 +75,23 @@ public class SysMenuServiceImpl extends ServiceImpl impl } return menuList; } + @Override + public PageQueryModel pageQuery(SysMenuPageQueryModel sysMenuPageQueryModel, Long userId) { + Page page = null; + // 管理员显示所有菜单信息 + if (SysUser.isAdmin(userId)) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); + page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); + } else { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysMenuPageQueryModel.getMenuName()),SysMenu::getMenuName, sysMenuPageQueryModel.getMenuName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysMenuPageQueryModel.getStatus()),SysMenu::getStatus, sysMenuPageQueryModel.getStatus()); + page = this.page(sysMenuPageQueryModel.buildPage(), queryWrapper); + } + return PageQueryModel.of(page); + } /** * 根据用户ID查询权限 @@ -335,6 +357,8 @@ public class SysMenuServiceImpl extends ServiceImpl impl return UserConstants.UNIQUE; } + + /** * 获取路由名称 * @@ -440,7 +464,7 @@ public class SysMenuServiceImpl extends ServiceImpl impl public List getChildPerms (List list, int parentId) { List returnList = new ArrayList(); for (Iterator iterator = list.iterator() ; iterator.hasNext() ; ) { - SysMenu t = (SysMenu) iterator.next(); + SysMenu t = iterator.next(); // 一、根据传入的某个父节点ID,遍历该父节点的所有子节点 if (t.getParentId() == parentId) { recursionFn(list, t); diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java index 8c0c8d5..2facb8a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysNoticeServiceImpl.java @@ -1,13 +1,20 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysNotice; +import com.muyu.system.domain.model.SysNoticePageQueryModel; import com.muyu.system.mapper.SysNoticeMapper; import com.muyu.system.service.SysNoticeService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 公告 服务层实现 @@ -19,6 +26,7 @@ public class SysNoticeServiceImpl extends ServiceImpl pageQuery(SysNoticePageQueryModel sysNoticePageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeTitle()),SysNotice::getNoticeTitle, sysNoticePageQueryModel.getNoticeTitle()); + queryWrapper.eq(StringUtils.isNotEmpty(sysNoticePageQueryModel.getNoticeType()),SysNotice::getNoticeType, sysNoticePageQueryModel.getNoticeType()); + queryWrapper.like(StringUtils.isNotEmpty(sysNoticePageQueryModel.getCreateBy()),SysNotice::getCreateBy, sysNoticePageQueryModel.getCreateBy()); + Page page = this.page(sysNoticePageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java index 24e7d39..d924b22 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysOperLogServiceImpl.java @@ -1,13 +1,20 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.common.system.domain.SysOperLog; +import com.muyu.system.domain.model.SysOperlogPageQueryModel; import com.muyu.system.mapper.SysOperLogMapper; import com.muyu.system.service.SysOperLogService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 操作日志 服务层处理 @@ -74,4 +81,18 @@ public class SysOperLogServiceImpl extends ServiceImpl pageQuery(SysOperlogPageQueryModel sysOperlogPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperIp()),SysOperLog::getOperIp, sysOperlogPageQueryModel.getOperIp()); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getTitle()),SysOperLog::getTitle, sysOperlogPageQueryModel.getTitle()); + queryWrapper.like(StringUtils.isNotEmpty(sysOperlogPageQueryModel.getOperName()),SysOperLog::getOperName, sysOperlogPageQueryModel.getOperName()); + queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getBusinessType()),SysOperLog::getBusinessType, sysOperlogPageQueryModel.getBusinessType()); + queryWrapper.eq(Objects.nonNull(sysOperlogPageQueryModel.getStatus()),SysOperLog::getStatus, sysOperlogPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysOperlogPageQueryModel.getBeginTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysOperlogPageQueryModel.getEndTime()),SysOperLog::getOperTime, sysOperlogPageQueryModel.getEndTime()); + Page page = this.page(sysOperlogPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java index 457ac5a..341d45a 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysPostServiceImpl.java @@ -1,10 +1,15 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; +import com.muyu.common.system.domain.SysLogininfor; import com.muyu.system.domain.SysPost; +import com.muyu.system.domain.model.SysPostPageQueryModel; import com.muyu.system.mapper.SysPostMapper; import com.muyu.system.mapper.SysUserPostMapper; import com.muyu.system.service.SysPostService; @@ -12,6 +17,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import java.util.List; +import java.util.Objects; /** * 岗位信息 服务层处理 @@ -171,4 +177,14 @@ public class SysPostServiceImpl extends ServiceImpl impl public int updatePost (SysPost post) { return postMapper.updatePost(post); } + + @Override + public PageQueryModel pageQuery(SysPostPageQueryModel sysPostPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostCode()),SysPost::getPostCode, sysPostPageQueryModel.getPostCode()); + queryWrapper.like(StringUtils.isNotEmpty(sysPostPageQueryModel.getPostName()),SysPost::getPostName, sysPostPageQueryModel.getPostName()); + queryWrapper.eq(StringUtils.isNotEmpty(sysPostPageQueryModel.getStatus()),SysPost::getStatus, sysPostPageQueryModel.getStatus()); + Page page = this.page(sysPostPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java index fa832da..d5bf96e 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysRoleServiceImpl.java @@ -1,17 +1,23 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; +import com.muyu.common.system.domain.SysOperLog; import com.muyu.common.system.domain.SysRole; import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysRoleDept; import com.muyu.system.domain.SysRoleMenu; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysRolePageQueryModel; import com.muyu.system.mapper.SysRoleDeptMapper; import com.muyu.system.mapper.SysRoleMapper; import com.muyu.system.mapper.SysRoleMenuMapper; @@ -45,14 +51,23 @@ public class SysRoleServiceImpl extends ServiceImpl impl /** * 根据条件分页查询角色数据 * - * @param role 角色信息 + * @param params 角色信息 * * @return 角色数据集合信息 */ @Override @DataScope(deptAlias = "d") - public List selectRoleList (SysRole role) { - return roleMapper.selectRoleList(role); + public List selectRoleList (SysRole params) { + LambdaQueryWrapper wrapper = new LambdaQueryWrapper<>(); + wrapper.eq(params.getRoleId() != null && params.getRoleId() != 0, SysRole::getRoleId, params.getRoleId()); + wrapper.like(StringUtils.isNotBlank(params.getRoleName()), SysRole::getRoleName, params.getRoleName()); + wrapper.eq(StringUtils.isNotBlank(params.getStatus()), SysRole::getStatus, params.getStatus()); + + wrapper.like(StringUtils.isNotBlank(params.getRoleKey()), SysRole::getRoleKey, params.getRoleKey()); + wrapper.ge(params.getParams().get("beginTime") != null, SysRole::getCreateTime, params.getParams().get("beginTime")); + wrapper.le(params.getParams().get("endTime") != null, SysRole::getCreateTime, params.getParams().get("endTime")); + wrapper.orderBy(true, true, SysRole::getRoleSort); + return this.list(wrapper); } /** @@ -219,52 +234,80 @@ public class SysRoleServiceImpl extends ServiceImpl impl roleMapper.insertRole(role); return insertRoleMenu(role); } - /** * 修改保存角色信息 * - * @param role 角色信息 + * @param sysRole 角色信息 * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int updateRole (SysRole role) { - // 修改角色信息 - roleMapper.updateRole(role); + public int updateRole (SysRole sysRole) { + LambdaUpdateWrapper updateWrapper = new LambdaUpdateWrapper<>(); + + // 条件判断并更新字段 + updateWrapper.eq(SysRole::getRoleId, sysRole.getRoleId()); + + if (sysRole.getRoleName() != null && !sysRole.getRoleName().isEmpty()) { + updateWrapper.set(SysRole::getRoleName, sysRole.getRoleName()); + } + if (sysRole.getRoleKey() != null && !sysRole.getRoleKey().isEmpty()) { + updateWrapper.set(SysRole::getRoleKey, sysRole.getRoleKey()); + } + if (sysRole.getRoleSort() != null) { + updateWrapper.set(SysRole::getRoleSort, sysRole.getRoleSort()); + } + if (sysRole.getDataScope() != null && !sysRole.getDataScope().isEmpty()) { + updateWrapper.set(SysRole::getDataScope, sysRole.getDataScope()); + } + if (sysRole.getStatus() != null && !sysRole.getStatus().isEmpty()) { + updateWrapper.set(SysRole::getStatus, sysRole.getStatus()); + } + if (sysRole.getRemark() != null) { + updateWrapper.set(SysRole::getRemark, sysRole.getRemark()); + } + if (sysRole.getUpdateBy() != null && !sysRole.getUpdateBy().isEmpty()) { + updateWrapper.set(SysRole::getUpdateBy, sysRole.getUpdateBy()); + } + + // 更新时间 + updateWrapper.set(SysRole::getUpdateTime, new java.util.Date()); + + // 执行更新 + this.update(updateWrapper); // 删除角色与菜单关联 - roleMenuMapper.deleteRoleMenuByRoleId(role.getRoleId()); - return insertRoleMenu(role); + roleMenuMapper.deleteRoleMenuByRoleId(sysRole.getRoleId()); + return insertRoleMenu(sysRole); } /** * 修改角色状态 * * @param role 角色信息 - * * @return 结果 */ @Override - public int updateRoleStatus (SysRole role) { - return roleMapper.updateRole(role); + public boolean updateRoleStatus (SysRole role) { + boolean updateResult = updateById(role); // 通过 roleId 更新角色信息 + return updateResult; } /** * 修改数据权限信息 * * @param role 角色信息 - * * @return 结果 */ @Override @Transactional(rollbackFor = Exception.class) - public int authDataScope (SysRole role) { + public boolean authDataScope (SysRole role) { // 修改角色信息 - roleMapper.updateRole(role); + boolean updateResult = updateById(role); // 通过 roleId 更新角色信息 // 删除角色与部门关联 roleDeptMapper.deleteRoleDeptByRoleId(role.getRoleId()); // 新增角色和部门信息（数据权限） - return insertRoleDept(role); + return updateResult; } /** @@ -273,7 +316,11 @@ public class SysRoleServiceImpl extends ServiceImpl impl * @param role 角色对象 */ public int insertRoleMenu (SysRole role) { - int rows = 1; + // 假设role.getMenuIds()返回角色关联的菜单ID列表 + List menuIds = List.of(role.getMenuIds()); + if (menuIds == null || menuIds.isEmpty()){ + return 0; + } // 新增用户与角色管理 List list = new ArrayList(); for (Long menuId : role.getMenuIds()) { @@ -282,10 +329,10 @@ public class SysRoleServiceImpl extends ServiceImpl impl rm.setMenuId(menuId); list.add(rm); } - if (list.size() > 0) { - rows = roleMenuMapper.batchRoleMenu(list); - } - return rows; + // 使用MyBatis-Plus的saveBatch方法批量插入角色与菜单的关联关系 + boolean saveResult = roleMenuMapper.saveBatch(list); + + return saveResult ? list.size() : 0; // 返回成功插入的数量 } /** @@ -396,4 +443,18 @@ public class SysRoleServiceImpl extends ServiceImpl impl } return userRoleMapper.batchUserRole(list); } + + @Override + public PageQueryModel pageQuery(SysRolePageQueryModel sysRolePageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleName()),SysRole::getRoleName, sysRolePageQueryModel.getRoleName()); + queryWrapper.like(StringUtils.isNotEmpty(sysRolePageQueryModel.getRoleKey()),SysRole::getRoleKey, sysRolePageQueryModel.getRoleKey()); + queryWrapper.eq(Objects.nonNull(sysRolePageQueryModel.getStatus()),SysRole::getStatus, sysRolePageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysRolePageQueryModel.getBeginTime()),SysRole::getCreateTime, sysRolePageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysRolePageQueryModel.getEndTime()),SysRole::getCreateTime, sysRolePageQueryModel.getEndTime()); + Page page = this.page(sysRolePageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + + } diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java index c1d3f18..8e8a52d 100644 --- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java +++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/service/impl/SysUserServiceImpl.java @@ -1,11 +1,14 @@ package com.muyu.system.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; import com.muyu.common.core.constant.UserConstants; import com.muyu.common.core.exception.ServiceException; import com.muyu.common.core.utils.SpringUtils; import com.muyu.common.core.utils.StringUtils; import com.muyu.common.core.utils.bean.BeanValidators; +import com.muyu.common.core.web.page.PageQueryModel; import com.muyu.common.datascope.annotation.DataScope; import com.muyu.common.security.utils.SecurityUtils; import com.muyu.common.system.domain.SysRole; @@ -13,6 +16,7 @@ import com.muyu.common.system.domain.SysUser; import com.muyu.system.domain.SysPost; import com.muyu.system.domain.SysUserPost; import com.muyu.system.domain.SysUserRole; +import com.muyu.system.domain.model.SysUserPageQueryModel; import com.muyu.system.mapper.*; import com.muyu.system.service.SysUserService; import com.muyu.system.service.SysConfigService; @@ -26,6 +30,7 @@ import org.springframework.util.CollectionUtils; import java.util.ArrayList; import java.util.List; +import java.util.Objects; import java.util.stream.Collectors; /** @@ -500,4 +505,20 @@ public class SysUserServiceImpl extends ServiceImpl impl return successMsg.toString(); } + @Override + public PageQueryModel pageQuery(SysUserPageQueryModel sysUserPageQueryModel) { + LambdaQueryWrapper queryWrapper = new LambdaQueryWrapper<>(); + queryWrapper.like(StringUtils.isNotEmpty(sysUserPageQueryModel.getPhonenumber()),SysUser::getPhonenumber, sysUserPageQueryModel.getPhonenumber()); + queryWrapper.eq(StringUtils.isNotEmpty(sysUserPageQueryModel.getNickName()),SysUser::getNickName, sysUserPageQueryModel.getNickName()); + queryWrapper.eq(Objects.nonNull(sysUserPageQueryModel.getStatus()),SysUser::getStatus, sysUserPageQueryModel.getStatus()); + queryWrapper.gt(Objects.nonNull(sysUserPageQueryModel.getBeginTime()),SysUser::getCreateTime, sysUserPageQueryModel.getBeginTime()); + queryWrapper.lt(Objects.nonNull(sysUserPageQueryModel.getEndTime()),SysUser::getCreateTime, sysUserPageQueryModel.getEndTime()); + Page page = this.page(sysUserPageQueryModel.buildPage(), queryWrapper); + return PageQueryModel.of(page); + } + //nickName + //phonenumber + //status + //beginTime + //endTime } diff --git a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml index 9a0bba2..f23e0b2 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml +++ b/cloud-modules/cloud-modules-system/src/main/resources/bootstrap.yml @@ -57,4 +57,4 @@ spring: - application-rabbit-config-${spring.profiles.active}.${spring.cloud.nacos.config.file-extension} logging: level: - com.muyu.system.mapper: DEBUG \ No newline at end of file + com.muyu.system.mapper: DEBUG diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml index f6b56b3..156c10b 100644 --- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -39,32 +39,6 @@ left join sys_dept d on u.dept_id = d.dept_id - -